diff --git a/.github/ISSUE_TEMPLATE/lib_change.yml b/.github/ISSUE_TEMPLATE/lib_change.yml index 8d965d56722..21312c88e12 100644 --- a/.github/ISSUE_TEMPLATE/lib_change.yml +++ b/.github/ISSUE_TEMPLATE/lib_change.yml @@ -1,5 +1,5 @@ name: 'Library change' -description: 'Fix or improve issues with built-in type definitions like `lib.dom.d.ts`, `lib.es6.d.ts`, etc.' +description: 'Fix or improve issues with built-in type definitions like `lib.es6.d.ts`, etc.' body: - type: markdown attributes: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6f57ac465c6..dcb27e10c12 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 + uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 with: config-file: ./.github/codeql/codeql-configuration.yml # Override language selection by uncommenting this and choosing your languages @@ -56,7 +56,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 + uses: github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -70,4 +70,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 + uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml new file mode 100644 index 00000000000..cde1bce78ca --- /dev/null +++ b/.github/workflows/create-cherry-pick-pr.yml @@ -0,0 +1,131 @@ +name: Create cherry pick PR + +on: + repository_dispatch: + types: [create-cherry-pick-pr] + workflow_dispatch: + inputs: + pr: + description: PR number to cherry-pick + required: true + type: number + target_branch: + description: Target branch to cherry-pick to + required: true + type: string + requesting_user: + description: User who requested the cherry-pick + required: true + type: string + +permissions: + contents: read + +# Ensure scripts are run with pipefail. See: +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference +defaults: + run: + shell: bash + +jobs: + open-pr: + runs-on: ubuntu-latest + if: github.repository == 'microsoft/TypeScript' + + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/ + fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none. + token: ${{ secrets.TS_BOT_GITHUB_TOKEN }} + + - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + env: + PR: ${{ inputs.pr || github.event.client_payload.pr }} + TARGET_BRANCH: ${{ inputs.target_branch || github.event.client_payload.target_branch }} + REQUESTING_USER: ${{ inputs.requesting_user || github.event.client_payload.requesting_user }} + with: + retries: 3 + github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }} + script: | + const { PR, TARGET_BRANCH, REQUESTING_USER } = process.env; + + const pr = await github.rest.pulls.get({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: +PR, + }); + + if (!pr.data.merge_commit_sha) throw new Error("No merge commit sha found"); + + const pickBranch = `cherry-pick/${PR}/${TARGET_BRANCH}`; + + const title = `🤖 Pick PR #${PR} (${pr.data.title.substring(0, 35)}${pr.data.title.length > 35 ? "..." : ""}) into ${TARGET_BRANCH}`; + + await exec.exec("git", ["config", "user.email", "typescriptbot@microsoft.com"]); + await exec.exec("git", ["config", "user.name", "TypeScript Bot"]); + await exec.exec("git", ["switch", "--detach", `origin/${TARGET_BRANCH}`]); + await exec.exec("git", ["switch", "-c", pickBranch]); + await exec.exec("git", ["cherry-pick", "-m", "1", pr.data.merge_commit_sha]); + await exec.exec("git", ["push", "--force", "--set-upstream", "origin", pickBranch]); + + const existingPulls = await github.rest.pulls.list({ + owner: context.repo.owner, + repo: context.repo.repo, + head: `${context.repo.owner}:${pickBranch}`, + }); + + if (existingPulls.data.length === 0) { + console.log(`No existing PRs found for ${pickBranch}`); + + const body = `This cherry-pick was triggered by a request on #${PR}.\n\nPlease review the diff and merge if no changes are unexpected.`; + + const newPr = await github.rest.pulls.create({ + owner: context.repo.owner, + repo: context.repo.repo, + base: TARGET_BRANCH, + head: pickBranch, + title, + body, + assignees: ["DanielRosenwasser"], + reviewers: ["DanielRosenwasser", REQUESTING_USER], + }); + + await github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: +PR, + body: `Hey @${REQUESTING_USER}, I've created #${newPr.data.number} for you.`, + }); + } + else { + const existing = existingPulls.data[0]; + console.log(`Found existing PR #${existing.number} for ${pickBranch}`); + + await github.rest.pulls.update({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: existing.number, + title, + }); + + await github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: +PR, + body: `Hey @${REQUESTING_USER}, I've updated #${existing.number} for you.`, + }); + } + + - run: | + MESSAGE="Hey @$REQUESTING_USER, I was unable to cherry-pick this PR." + MESSAGE+=$'\n\n' + MESSAGE+="Check the logs at: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" + + gh pr comment "$PR" --repo ${{ github.repository }} --body "$MESSAGE" + if: ${{ failure() }} + env: + PR: ${{ inputs.pr || github.event.client_payload.pr }} + TARGET_BRANCH: ${{ inputs.target_branch || github.event.client_payload.target_branch }} + REQUESTING_USER: ${{ inputs.requesting_user || github.event.client_payload.requesting_user }} + GH_TOKEN: ${{ secrets.TS_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/new-release-branch.yaml b/.github/workflows/new-release-branch.yaml index d2c17b9d46f..fd38d8bf1d2 100644 --- a/.github/workflows/new-release-branch.yaml +++ b/.github/workflows/new-release-branch.yaml @@ -2,7 +2,7 @@ name: New Release Branch on: repository_dispatch: - types: new-release-branch + types: [new-release-branch] permissions: contents: read diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 6cc20f13323..00664d82cbb 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -6,7 +6,7 @@ on: # enable users to manually trigger with workflow_dispatch workflow_dispatch: {} repository_dispatch: - types: publish-nightly + types: [publish-nightly] permissions: contents: read diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 605e855cd37..6367f8fcd7b 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -55,6 +55,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: 'Upload to code-scanning' - uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 + uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 with: sarif_file: results.sarif diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml index 7e1c8bf673f..11d57994f3d 100644 --- a/.github/workflows/set-version.yaml +++ b/.github/workflows/set-version.yaml @@ -2,7 +2,7 @@ name: Set branch version on: repository_dispatch: - types: set-version + types: [set-version] permissions: contents: read diff --git a/.github/workflows/sync-branch.yaml b/.github/workflows/sync-branch.yaml index ab2ad9b94a8..3a40e9b9a97 100644 --- a/.github/workflows/sync-branch.yaml +++ b/.github/workflows/sync-branch.yaml @@ -2,7 +2,7 @@ name: Sync branch with master on: repository_dispatch: - types: sync-branch + types: [sync-branch] workflow_dispatch: inputs: branch_name: diff --git a/.github/workflows/twoslash-repros.yaml b/.github/workflows/twoslash-repros.yaml index 589fb16847b..bafe8950f34 100644 --- a/.github/workflows/twoslash-repros.yaml +++ b/.github/workflows/twoslash-repros.yaml @@ -7,7 +7,7 @@ on: schedule: - cron: '0 8 * * *' repository_dispatch: - types: run-twoslash-repros + types: [run-twoslash-repros] workflow_dispatch: inputs: issue: diff --git a/package-lock.json b/package-lock.json index c4ace9d4075..e75652b51b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "playwright": "^1.38.0", "source-map-support": "^0.5.21", "tslib": "^2.5.0", - "typescript": "^5.0.2", + "typescript": "^5.3.2", "which": "^2.0.2" }, "engines": { @@ -166,9 +166,9 @@ ] }, "node_modules/@esbuild/android-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.6.tgz", - "integrity": "sha512-muPzBqXJKCbMYoNbb1JpZh/ynl0xS6/+pLjrofcR3Nad82SbsCogYzUE6Aq9QT3cLP0jR/IVK/NHC9b90mSHtg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz", + "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==", "cpu": [ "arm" ], @@ -182,9 +182,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.6.tgz", - "integrity": "sha512-KQ/hbe9SJvIJ4sR+2PcZ41IBV+LPJyYp6V1K1P1xcMRup9iYsBoQn4MzE3mhMLOld27Au2eDcLlIREeKGUXpHQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz", + "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==", "cpu": [ "arm64" ], @@ -198,9 +198,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.6.tgz", - "integrity": "sha512-VVJVZQ7p5BBOKoNxd0Ly3xUM78Y4DyOoFKdkdAe2m11jbh0LEU4bPles4e/72EMl4tapko8o915UalN/5zhspg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz", + "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==", "cpu": [ "x64" ], @@ -214,9 +214,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.6.tgz", - "integrity": "sha512-91LoRp/uZAKx6ESNspL3I46ypwzdqyDLXZH7x2QYCLgtnaU08+AXEbabY2yExIz03/am0DivsTtbdxzGejfXpA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz", + "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==", "cpu": [ "arm64" ], @@ -230,9 +230,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.6.tgz", - "integrity": "sha512-QCGHw770ubjBU1J3ZkFJh671MFajGTYMZumPs9E/rqU52md6lIil97BR0CbPq6U+vTh3xnTNDHKRdR8ggHnmxQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz", + "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==", "cpu": [ "x64" ], @@ -246,9 +246,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.6.tgz", - "integrity": "sha512-J53d0jGsDcLzWk9d9SPmlyF+wzVxjXpOH7jVW5ae7PvrDst4kiAz6sX+E8btz0GB6oH12zC+aHRD945jdjF2Vg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz", + "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==", "cpu": [ "arm64" ], @@ -262,9 +262,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.6.tgz", - "integrity": "sha512-hn9qvkjHSIB5Z9JgCCjED6YYVGCNpqB7dEGavBdG6EjBD8S/UcNUIlGcB35NCkMETkdYwfZSvD9VoDJX6VeUVA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz", + "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==", "cpu": [ "x64" ], @@ -278,9 +278,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.6.tgz", - "integrity": "sha512-G8IR5zFgpXad/Zp7gr7ZyTKyqZuThU6z1JjmRyN1vSF8j0bOlGzUwFSMTbctLAdd7QHpeyu0cRiuKrqK1ZTwvQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz", + "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==", "cpu": [ "arm" ], @@ -294,9 +294,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.6.tgz", - "integrity": "sha512-HQCOrk9XlH3KngASLaBfHpcoYEGUt829A9MyxaI8RMkfRA8SakG6YQEITAuwmtzFdEu5GU4eyhKcpv27dFaOBg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz", + "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==", "cpu": [ "arm64" ], @@ -310,9 +310,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.6.tgz", - "integrity": "sha512-22eOR08zL/OXkmEhxOfshfOGo8P69k8oKHkwkDrUlcB12S/sw/+COM4PhAPT0cAYW/gpqY2uXp3TpjQVJitz7w==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz", + "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==", "cpu": [ "ia32" ], @@ -326,9 +326,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.6.tgz", - "integrity": "sha512-82RvaYAh/SUJyjWA8jDpyZCHQjmEggL//sC7F3VKYcBMumQjUL3C5WDl/tJpEiKtt7XrWmgjaLkrk205zfvwTA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz", + "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==", "cpu": [ "loong64" ], @@ -342,9 +342,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.6.tgz", - "integrity": "sha512-8tvnwyYJpR618vboIv2l8tK2SuK/RqUIGMfMENkeDGo3hsEIrpGldMGYFcWxWeEILe5Fi72zoXLmhZ7PR23oQA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz", + "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==", "cpu": [ "mips64el" ], @@ -358,9 +358,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.6.tgz", - "integrity": "sha512-Qt+D7xiPajxVNk5tQiEJwhmarNnLPdjXAoA5uWMpbfStZB0+YU6a3CtbWYSy+sgAsnyx4IGZjWsTzBzrvg/fMA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz", + "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==", "cpu": [ "ppc64" ], @@ -374,9 +374,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.6.tgz", - "integrity": "sha512-lxRdk0iJ9CWYDH1Wpnnnc640ajF4RmQ+w6oHFZmAIYu577meE9Ka/DCtpOrwr9McMY11ocbp4jirgGgCi7Ls/g==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz", + "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==", "cpu": [ "riscv64" ], @@ -390,9 +390,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.6.tgz", - "integrity": "sha512-MopyYV39vnfuykHanRWHGRcRC3AwU7b0QY4TI8ISLfAGfK+tMkXyFuyT1epw/lM0pflQlS53JoD22yN83DHZgA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz", + "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==", "cpu": [ "s390x" ], @@ -406,9 +406,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.6.tgz", - "integrity": "sha512-UWcieaBzsN8WYbzFF5Jq7QULETPcQvlX7KL4xWGIB54OknXJjBO37sPqk7N82WU13JGWvmDzFBi1weVBajPovg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz", + "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==", "cpu": [ "x64" ], @@ -422,9 +422,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.6.tgz", - "integrity": "sha512-EpWiLX0fzvZn1wxtLxZrEW+oQED9Pwpnh+w4Ffv8ZLuMhUoqR9q9rL4+qHW8F4Mg5oQEKxAoT0G+8JYNqCiR6g==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz", + "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==", "cpu": [ "x64" ], @@ -438,9 +438,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.6.tgz", - "integrity": "sha512-fFqTVEktM1PGs2sLKH4M5mhAVEzGpeZJuasAMRnvDZNCV0Cjvm1Hu35moL2vC0DOrAQjNTvj4zWrol/lwQ8Deg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz", + "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==", "cpu": [ "x64" ], @@ -454,9 +454,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.6.tgz", - "integrity": "sha512-M+XIAnBpaNvaVAhbe3uBXtgWyWynSdlww/JNZws0FlMPSBy+EpatPXNIlKAdtbFVII9OpX91ZfMb17TU3JKTBA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz", + "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==", "cpu": [ "x64" ], @@ -470,9 +470,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.6.tgz", - "integrity": "sha512-2DchFXn7vp/B6Tc2eKdTsLzE0ygqKkNUhUBCNtMx2Llk4POIVMUq5rUYjdcedFlGLeRe1uLCpVvCmE+G8XYybA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz", + "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==", "cpu": [ "arm64" ], @@ -486,9 +486,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.6.tgz", - "integrity": "sha512-PBo/HPDQllyWdjwAVX+Gl2hH0dfBydL97BAH/grHKC8fubqp02aL4S63otZ25q3sBdINtOBbz1qTZQfXbP4VBg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz", + "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==", "cpu": [ "ia32" ], @@ -502,9 +502,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.6.tgz", - "integrity": "sha512-OE7yIdbDif2kKfrGa+V0vx/B3FJv2L4KnIiLlvtibPyO9UkgO3rzYE0HhpREo2vmJ1Ixq1zwm9/0er+3VOSZJA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz", + "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==", "cpu": [ "x64" ], @@ -568,9 +568,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -591,9 +591,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -893,9 +893,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", "dev": true }, "node_modules/@types/glob": { @@ -939,9 +939,9 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.4.tgz", - "integrity": "sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", + "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "node_modules/@types/ms": { @@ -951,18 +951,18 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz", - "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==", + "version": "20.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.3.tgz", + "integrity": "sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==", "dev": true, "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "node_modules/@types/source-map-support": { @@ -981,16 +981,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz", - "integrity": "sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", + "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.11.0", - "@typescript-eslint/type-utils": "6.11.0", - "@typescript-eslint/utils": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/type-utils": "6.13.2", + "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -1016,15 +1016,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz", - "integrity": "sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", + "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.11.0", - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/typescript-estree": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4" }, "engines": { @@ -1044,13 +1044,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz", - "integrity": "sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", + "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0" + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1061,13 +1061,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz", - "integrity": "sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", + "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.11.0", - "@typescript-eslint/utils": "6.11.0", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/utils": "6.13.2", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1088,9 +1088,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.11.0.tgz", - "integrity": "sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", + "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1101,13 +1101,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz", - "integrity": "sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", + "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1128,17 +1128,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz", - "integrity": "sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", + "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", "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.11.0", - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/typescript-estree": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", "semver": "^7.5.4" }, "engines": { @@ -1153,12 +1153,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz", - "integrity": "sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", + "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/types": "6.13.2", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -1781,9 +1781,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.6.tgz", - "integrity": "sha512-Xl7dntjA2OEIvpr9j0DVxxnog2fyTGnyVoQXAMQI6eR3mf9zCQds7VIKUDCotDgE/p4ncTgeRqgX8t5d6oP4Gw==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz", + "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==", "dev": true, "hasInstallScript": true, "bin": { @@ -1793,28 +1793,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.19.6", - "@esbuild/android-arm64": "0.19.6", - "@esbuild/android-x64": "0.19.6", - "@esbuild/darwin-arm64": "0.19.6", - "@esbuild/darwin-x64": "0.19.6", - "@esbuild/freebsd-arm64": "0.19.6", - "@esbuild/freebsd-x64": "0.19.6", - "@esbuild/linux-arm": "0.19.6", - "@esbuild/linux-arm64": "0.19.6", - "@esbuild/linux-ia32": "0.19.6", - "@esbuild/linux-loong64": "0.19.6", - "@esbuild/linux-mips64el": "0.19.6", - "@esbuild/linux-ppc64": "0.19.6", - "@esbuild/linux-riscv64": "0.19.6", - "@esbuild/linux-s390x": "0.19.6", - "@esbuild/linux-x64": "0.19.6", - "@esbuild/netbsd-x64": "0.19.6", - "@esbuild/openbsd-x64": "0.19.6", - "@esbuild/sunos-x64": "0.19.6", - "@esbuild/win32-arm64": "0.19.6", - "@esbuild/win32-ia32": "0.19.6", - "@esbuild/win32-x64": "0.19.6" + "@esbuild/android-arm": "0.19.8", + "@esbuild/android-arm64": "0.19.8", + "@esbuild/android-x64": "0.19.8", + "@esbuild/darwin-arm64": "0.19.8", + "@esbuild/darwin-x64": "0.19.8", + "@esbuild/freebsd-arm64": "0.19.8", + "@esbuild/freebsd-x64": "0.19.8", + "@esbuild/linux-arm": "0.19.8", + "@esbuild/linux-arm64": "0.19.8", + "@esbuild/linux-ia32": "0.19.8", + "@esbuild/linux-loong64": "0.19.8", + "@esbuild/linux-mips64el": "0.19.8", + "@esbuild/linux-ppc64": "0.19.8", + "@esbuild/linux-riscv64": "0.19.8", + "@esbuild/linux-s390x": "0.19.8", + "@esbuild/linux-x64": "0.19.8", + "@esbuild/netbsd-x64": "0.19.8", + "@esbuild/openbsd-x64": "0.19.8", + "@esbuild/sunos-x64": "0.19.8", + "@esbuild/win32-arm64": "0.19.8", + "@esbuild/win32-ia32": "0.19.8", + "@esbuild/win32-x64": "0.19.8" } }, "node_modules/escalade": { @@ -1839,15 +1839,15 @@ } }, "node_modules/eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -3215,12 +3215,12 @@ } }, "node_modules/playwright": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz", - "integrity": "sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw==", + "version": "1.40.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.1.tgz", + "integrity": "sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw==", "dev": true, "dependencies": { - "playwright-core": "1.40.0" + "playwright-core": "1.40.1" }, "bin": { "playwright": "cli.js" @@ -3233,9 +3233,9 @@ } }, "node_modules/playwright-core": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz", - "integrity": "sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q==", + "version": "1.40.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz", + "integrity": "sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==", "dev": true, "bin": { "playwright-core": "cli.js" @@ -3786,9 +3786,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -3835,9 +3835,9 @@ } }, "node_modules/v8-to-istanbul": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", - "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", + "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", @@ -4063,156 +4063,156 @@ "optional": true }, "@esbuild/android-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.6.tgz", - "integrity": "sha512-muPzBqXJKCbMYoNbb1JpZh/ynl0xS6/+pLjrofcR3Nad82SbsCogYzUE6Aq9QT3cLP0jR/IVK/NHC9b90mSHtg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz", + "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.6.tgz", - "integrity": "sha512-KQ/hbe9SJvIJ4sR+2PcZ41IBV+LPJyYp6V1K1P1xcMRup9iYsBoQn4MzE3mhMLOld27Au2eDcLlIREeKGUXpHQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz", + "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.6.tgz", - "integrity": "sha512-VVJVZQ7p5BBOKoNxd0Ly3xUM78Y4DyOoFKdkdAe2m11jbh0LEU4bPles4e/72EMl4tapko8o915UalN/5zhspg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz", + "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.6.tgz", - "integrity": "sha512-91LoRp/uZAKx6ESNspL3I46ypwzdqyDLXZH7x2QYCLgtnaU08+AXEbabY2yExIz03/am0DivsTtbdxzGejfXpA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz", + "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.6.tgz", - "integrity": "sha512-QCGHw770ubjBU1J3ZkFJh671MFajGTYMZumPs9E/rqU52md6lIil97BR0CbPq6U+vTh3xnTNDHKRdR8ggHnmxQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz", + "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.6.tgz", - "integrity": "sha512-J53d0jGsDcLzWk9d9SPmlyF+wzVxjXpOH7jVW5ae7PvrDst4kiAz6sX+E8btz0GB6oH12zC+aHRD945jdjF2Vg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz", + "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.6.tgz", - "integrity": "sha512-hn9qvkjHSIB5Z9JgCCjED6YYVGCNpqB7dEGavBdG6EjBD8S/UcNUIlGcB35NCkMETkdYwfZSvD9VoDJX6VeUVA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz", + "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.6.tgz", - "integrity": "sha512-G8IR5zFgpXad/Zp7gr7ZyTKyqZuThU6z1JjmRyN1vSF8j0bOlGzUwFSMTbctLAdd7QHpeyu0cRiuKrqK1ZTwvQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz", + "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.6.tgz", - "integrity": "sha512-HQCOrk9XlH3KngASLaBfHpcoYEGUt829A9MyxaI8RMkfRA8SakG6YQEITAuwmtzFdEu5GU4eyhKcpv27dFaOBg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz", + "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.6.tgz", - "integrity": "sha512-22eOR08zL/OXkmEhxOfshfOGo8P69k8oKHkwkDrUlcB12S/sw/+COM4PhAPT0cAYW/gpqY2uXp3TpjQVJitz7w==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz", + "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.6.tgz", - "integrity": "sha512-82RvaYAh/SUJyjWA8jDpyZCHQjmEggL//sC7F3VKYcBMumQjUL3C5WDl/tJpEiKtt7XrWmgjaLkrk205zfvwTA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz", + "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.6.tgz", - "integrity": "sha512-8tvnwyYJpR618vboIv2l8tK2SuK/RqUIGMfMENkeDGo3hsEIrpGldMGYFcWxWeEILe5Fi72zoXLmhZ7PR23oQA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz", + "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.6.tgz", - "integrity": "sha512-Qt+D7xiPajxVNk5tQiEJwhmarNnLPdjXAoA5uWMpbfStZB0+YU6a3CtbWYSy+sgAsnyx4IGZjWsTzBzrvg/fMA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz", + "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.6.tgz", - "integrity": "sha512-lxRdk0iJ9CWYDH1Wpnnnc640ajF4RmQ+w6oHFZmAIYu577meE9Ka/DCtpOrwr9McMY11ocbp4jirgGgCi7Ls/g==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz", + "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.6.tgz", - "integrity": "sha512-MopyYV39vnfuykHanRWHGRcRC3AwU7b0QY4TI8ISLfAGfK+tMkXyFuyT1epw/lM0pflQlS53JoD22yN83DHZgA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz", + "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.6.tgz", - "integrity": "sha512-UWcieaBzsN8WYbzFF5Jq7QULETPcQvlX7KL4xWGIB54OknXJjBO37sPqk7N82WU13JGWvmDzFBi1weVBajPovg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz", + "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.6.tgz", - "integrity": "sha512-EpWiLX0fzvZn1wxtLxZrEW+oQED9Pwpnh+w4Ffv8ZLuMhUoqR9q9rL4+qHW8F4Mg5oQEKxAoT0G+8JYNqCiR6g==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz", + "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.6.tgz", - "integrity": "sha512-fFqTVEktM1PGs2sLKH4M5mhAVEzGpeZJuasAMRnvDZNCV0Cjvm1Hu35moL2vC0DOrAQjNTvj4zWrol/lwQ8Deg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz", + "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.6.tgz", - "integrity": "sha512-M+XIAnBpaNvaVAhbe3uBXtgWyWynSdlww/JNZws0FlMPSBy+EpatPXNIlKAdtbFVII9OpX91ZfMb17TU3JKTBA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz", + "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.6.tgz", - "integrity": "sha512-2DchFXn7vp/B6Tc2eKdTsLzE0ygqKkNUhUBCNtMx2Llk4POIVMUq5rUYjdcedFlGLeRe1uLCpVvCmE+G8XYybA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz", + "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.6.tgz", - "integrity": "sha512-PBo/HPDQllyWdjwAVX+Gl2hH0dfBydL97BAH/grHKC8fubqp02aL4S63otZ25q3sBdINtOBbz1qTZQfXbP4VBg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz", + "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.6.tgz", - "integrity": "sha512-OE7yIdbDif2kKfrGa+V0vx/B3FJv2L4KnIiLlvtibPyO9UkgO3rzYE0HhpREo2vmJ1Ixq1zwm9/0er+3VOSZJA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz", + "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==", "dev": true, "optional": true }, @@ -4258,9 +4258,9 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -4275,9 +4275,9 @@ } }, "@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true }, "@humanwhocodes/config-array": { @@ -4507,9 +4507,9 @@ } }, "@types/chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", "dev": true }, "@types/glob": { @@ -4553,9 +4553,9 @@ "dev": true }, "@types/mocha": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.4.tgz", - "integrity": "sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", + "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "@types/ms": { @@ -4565,18 +4565,18 @@ "dev": true }, "@types/node": { - "version": "20.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz", - "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==", + "version": "20.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.3.tgz", + "integrity": "sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==", "dev": true, "requires": { "undici-types": "~5.26.4" } }, "@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "@types/source-map-support": { @@ -4595,16 +4595,16 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz", - "integrity": "sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", + "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.11.0", - "@typescript-eslint/type-utils": "6.11.0", - "@typescript-eslint/utils": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/type-utils": "6.13.2", + "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -4614,54 +4614,54 @@ } }, "@typescript-eslint/parser": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz", - "integrity": "sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", + "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "6.11.0", - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/typescript-estree": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz", - "integrity": "sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", + "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "dev": true, "requires": { - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0" + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2" } }, "@typescript-eslint/type-utils": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz", - "integrity": "sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", + "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.11.0", - "@typescript-eslint/utils": "6.11.0", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/utils": "6.13.2", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" } }, "@typescript-eslint/types": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.11.0.tgz", - "integrity": "sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", + "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz", - "integrity": "sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", + "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "dev": true, "requires": { - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/visitor-keys": "6.11.0", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4670,27 +4670,27 @@ } }, "@typescript-eslint/utils": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz", - "integrity": "sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", + "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.11.0", - "@typescript-eslint/types": "6.11.0", - "@typescript-eslint/typescript-estree": "6.11.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", "semver": "^7.5.4" } }, "@typescript-eslint/visitor-keys": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz", - "integrity": "sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", + "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "dev": true, "requires": { - "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/types": "6.13.2", "eslint-visitor-keys": "^3.4.1" } }, @@ -5164,33 +5164,33 @@ "dev": true }, "esbuild": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.6.tgz", - "integrity": "sha512-Xl7dntjA2OEIvpr9j0DVxxnog2fyTGnyVoQXAMQI6eR3mf9zCQds7VIKUDCotDgE/p4ncTgeRqgX8t5d6oP4Gw==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz", + "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==", "dev": true, "requires": { - "@esbuild/android-arm": "0.19.6", - "@esbuild/android-arm64": "0.19.6", - "@esbuild/android-x64": "0.19.6", - "@esbuild/darwin-arm64": "0.19.6", - "@esbuild/darwin-x64": "0.19.6", - "@esbuild/freebsd-arm64": "0.19.6", - "@esbuild/freebsd-x64": "0.19.6", - "@esbuild/linux-arm": "0.19.6", - "@esbuild/linux-arm64": "0.19.6", - "@esbuild/linux-ia32": "0.19.6", - "@esbuild/linux-loong64": "0.19.6", - "@esbuild/linux-mips64el": "0.19.6", - "@esbuild/linux-ppc64": "0.19.6", - "@esbuild/linux-riscv64": "0.19.6", - "@esbuild/linux-s390x": "0.19.6", - "@esbuild/linux-x64": "0.19.6", - "@esbuild/netbsd-x64": "0.19.6", - "@esbuild/openbsd-x64": "0.19.6", - "@esbuild/sunos-x64": "0.19.6", - "@esbuild/win32-arm64": "0.19.6", - "@esbuild/win32-ia32": "0.19.6", - "@esbuild/win32-x64": "0.19.6" + "@esbuild/android-arm": "0.19.8", + "@esbuild/android-arm64": "0.19.8", + "@esbuild/android-x64": "0.19.8", + "@esbuild/darwin-arm64": "0.19.8", + "@esbuild/darwin-x64": "0.19.8", + "@esbuild/freebsd-arm64": "0.19.8", + "@esbuild/freebsd-x64": "0.19.8", + "@esbuild/linux-arm": "0.19.8", + "@esbuild/linux-arm64": "0.19.8", + "@esbuild/linux-ia32": "0.19.8", + "@esbuild/linux-loong64": "0.19.8", + "@esbuild/linux-mips64el": "0.19.8", + "@esbuild/linux-ppc64": "0.19.8", + "@esbuild/linux-riscv64": "0.19.8", + "@esbuild/linux-s390x": "0.19.8", + "@esbuild/linux-x64": "0.19.8", + "@esbuild/netbsd-x64": "0.19.8", + "@esbuild/openbsd-x64": "0.19.8", + "@esbuild/sunos-x64": "0.19.8", + "@esbuild/win32-arm64": "0.19.8", + "@esbuild/win32-ia32": "0.19.8", + "@esbuild/win32-x64": "0.19.8" } }, "escalade": { @@ -5206,15 +5206,15 @@ "dev": true }, "eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -6196,13 +6196,13 @@ "dev": true }, "playwright": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz", - "integrity": "sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw==", + "version": "1.40.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.1.tgz", + "integrity": "sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw==", "dev": true, "requires": { "fsevents": "2.3.2", - "playwright-core": "1.40.0" + "playwright-core": "1.40.1" }, "dependencies": { "fsevents": { @@ -6215,9 +6215,9 @@ } }, "playwright-core": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz", - "integrity": "sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q==", + "version": "1.40.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz", + "integrity": "sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==", "dev": true }, "plur": { @@ -6584,9 +6584,9 @@ } }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true }, "typical": { @@ -6623,9 +6623,9 @@ } }, "v8-to-istanbul": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", - "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", + "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", "dev": true, "requires": { "@jridgewell/trace-mapping": "^0.3.12", diff --git a/package.json b/package.json index 7d77358cb65..bea908972e9 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "playwright": "^1.38.0", "source-map-support": "^0.5.21", "tslib": "^2.5.0", - "typescript": "^5.0.2", + "typescript": "^5.3.2", "which": "^2.0.2" }, "overrides": { diff --git a/scripts/dtsBundler.mjs b/scripts/dtsBundler.mjs index 7edbc635e71..0593545aa4b 100644 --- a/scripts/dtsBundler.mjs +++ b/scripts/dtsBundler.mjs @@ -89,7 +89,31 @@ assert(sourceFile, "Failed to load source file"); const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile); assert(moduleSymbol, "Failed to get module's symbol"); -const printer = ts.createPrinter({ newLine: newLineKind }); +/** @type {{ writeNode(hint: ts.EmitHint, node: ts.Node, sourceFile: ts.SourceFile | undefined, writer: any): void }} */ +const printer = /** @type {any} */ (ts.createPrinter({ newLine: newLineKind })); +/** @type {{ writeComment(s: string): void; getText(): string; clear(): void }} */ +const writer = /** @type {any} */ (ts).createTextWriter("\n"); +const originalWriteComment = writer.writeComment.bind(writer); +writer.writeComment = s => { + // Hack; undo https://github.com/microsoft/TypeScript/pull/50097 + // We printNode directly, so we get all of the original source comments. + // If we were using actual declaration emit instead, this wouldn't be needed. + if (s.startsWith("//")) { + return; + } + originalWriteComment(s); +}; + +/** + * @param {ts.Node} node + * @param {ts.SourceFile} sourceFile + */ +function printNode(node, sourceFile) { + printer.writeNode(ts.EmitHint.Unspecified, node, sourceFile, writer); + const text = writer.getText(); + writer.clear(); + return text; +} /** @type {string[]} */ const publicLines = []; @@ -141,7 +165,7 @@ function write(s, target) { * @param {WriteTarget} target */ function writeNode(node, sourceFile, target) { - write(printer.printNode(ts.EmitHint.Unspecified, node, sourceFile), target); + write(printNode(node, sourceFile), target); } /** @type {Map} */ diff --git a/scripts/open-cherry-pick-pr.mjs b/scripts/open-cherry-pick-pr.mjs deleted file mode 100644 index 46c166c9c5f..00000000000 --- a/scripts/open-cherry-pick-pr.mjs +++ /dev/null @@ -1,127 +0,0 @@ -import { - Octokit, -} from "@octokit/rest"; -import fs from "fs"; -import path from "path"; -import url from "url"; - -import { - runSequence, -} from "./run-sequence.mjs"; - -const __filename = url.fileURLToPath(new URL(import.meta.url)); -const __dirname = path.dirname(__filename); - -const userName = process.env.GH_USERNAME; -const reviewers = process.env.REQUESTING_USER ? [process.env.REQUESTING_USER] : ["weswigham", "RyanCavanaugh"]; -const branchName = `pick/${process.env.SOURCE_ISSUE}/${process.env.TARGET_BRANCH}`; -const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`; -const produceLKG = !!process.env.PRODUCE_LKG; - -async function main() { - if (!process.env.TARGET_BRANCH) { - throw new Error("Target branch not specified"); - } - if (!process.env.SOURCE_ISSUE) { - throw new Error("Source issue not specified"); - } - const currentSha = runSequence([ - ["git", ["rev-parse", "HEAD"]], - ]); - const currentAuthor = runSequence([ - ["git", ["log", "-1", `--pretty="%aN <%aE>"`]], - ]); - - const gh = new Octokit({ - auth: process.argv[2], - }); - - const inputPR = (await gh.pulls.get({ pull_number: +process.env.SOURCE_ISSUE, owner: "microsoft", repo: "TypeScript" })).data; - let remoteName = "origin"; - if (inputPR.base.repo.git_url !== `git:github.com/microsoft/TypeScript` && inputPR.base.repo.git_url !== `git://github.com/microsoft/TypeScript`) { - runSequence([ - ["git", ["remote", "add", "nonlocal", inputPR.base.repo.git_url.replace(/^git:(?:\/\/)?/, "https://")]], - ]); - remoteName = "nonlocal"; - } - const baseBranchName = inputPR.base.ref; - runSequence([ - ["git", ["fetch", remoteName, baseBranchName]], - ]); - let logText = runSequence([ - ["git", ["log", `${remoteName}/${baseBranchName}..${currentSha.trim()}`, `--pretty="%h %s%n%b"`, "--reverse"]], - ]); - logText = `Cherry-pick PR #${process.env.SOURCE_ISSUE} into ${process.env.TARGET_BRANCH} - -Component commits: -${logText.trim()}`; - const logpath = path.join(__dirname, "../", "logmessage.txt"); - const mergebase = runSequence([["git", ["merge-base", `${remoteName}/${baseBranchName}`, currentSha]]]).trim(); - runSequence([ - ["git", ["checkout", "-b", "temp-branch"]], - ["git", ["reset", mergebase, "--soft"]], - ]); - fs.writeFileSync(logpath, logText); - runSequence([ - ["git", ["commit", "-F", logpath, `--author="${currentAuthor.trim()}"`]], - ]); - fs.unlinkSync(logpath); - const squashSha = runSequence([ - ["git", ["rev-parse", "HEAD"]], - ]); - runSequence([ - ["git", ["checkout", process.env.TARGET_BRANCH]], // checkout the target branch - ["git", ["checkout", "-b", branchName]], // create a new branch - ["git", ["cherry-pick", squashSha.trim()]], - ]); - if (produceLKG) { - runSequence([ - ["node", ["./node_modules/hereby/dist/cli.js", "LKG"]], - ["git", ["add", "lib"]], - ["git", ["commit", "-m", `"Update LKG"`]], - ]); - } - runSequence([ - ["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork - ["git", ["push", "--set-upstream", "fork", branchName, "-f"]], // push the branch - ]); - - const r = await gh.pulls.create({ - owner: "Microsoft", - repo: "TypeScript", - maintainer_can_modify: true, - title: `🤖 Pick PR #${process.env.SOURCE_ISSUE} (${inputPR.title.substring(0, 35)}${inputPR.title.length > 35 ? "..." : ""}) into ${process.env.TARGET_BRANCH}`, - head: `${userName}:${branchName}`, - base: process.env.TARGET_BRANCH, - body: `This cherry-pick was triggered by a request on https://github.com/Microsoft/TypeScript/pull/${process.env.SOURCE_ISSUE} -Please review the diff and merge if no changes are unexpected.${produceLKG ? ` An LKG update commit is included separately from the base change.` : ""} -You can view the cherry-pick log [here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary). - -cc ${reviewers.map(r => "@" + r).join(" ")}`, - }); - const num = r.data.number; - console.log(`Pull request ${num} created.`); - - await gh.issues.createComment({ - issue_number: +process.env.SOURCE_ISSUE, - owner: "Microsoft", - repo: "TypeScript", - body: `Hey @${process.env.REQUESTING_USER}, I've opened #${num} for you.`, - }); -} - -main().catch(async e => { - console.error(e); - process.exitCode = 1; - if (process.env.SOURCE_ISSUE) { - const gh = new Octokit({ - auth: process.argv[2], - }); - await gh.issues.createComment({ - issue_number: +process.env.SOURCE_ISSUE, - owner: "Microsoft", - repo: "TypeScript", - body: `Hey @${process.env.REQUESTING_USER}, I couldn't open a PR with the cherry-pick. ([You can check the log here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary)). You may need to squash and pick this PR into ${process.env.TARGET_BRANCH} manually.`, - }); - } -}); diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index b26af72dcc4..6ea9b826954 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -3309,7 +3309,7 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void { function bindSpecialPropertyAssignment(node: BindablePropertyAssignmentExpression) { // Class declarations in Typescript do not allow property declarations - const parentSymbol = lookupSymbolForPropertyAccess(node.left.expression, container) || lookupSymbolForPropertyAccess(node.left.expression, blockScopeContainer); + const parentSymbol = lookupSymbolForPropertyAccess(node.left.expression, blockScopeContainer) || lookupSymbolForPropertyAccess(node.left.expression, container); if (!isInJSFile(node) && !isFunctionSymbol(parentSymbol)) { return; } @@ -3428,7 +3428,7 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void { } function bindPropertyAssignment(name: BindableStaticNameExpression, propertyAccess: BindableStaticAccessExpression, isPrototypeProperty: boolean, containerIsClass: boolean) { - let namespaceSymbol = lookupSymbolForPropertyAccess(name, container) || lookupSymbolForPropertyAccess(name, blockScopeContainer); + let namespaceSymbol = lookupSymbolForPropertyAccess(name, blockScopeContainer) || lookupSymbolForPropertyAccess(name, container); const isToplevel = isTopLevelNamespaceAssignment(propertyAccess); namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty, containerIsClass); bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 970d33acea8..521c921e37e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -598,6 +598,7 @@ import { isJSDocSatisfiesTag, isJSDocSignature, isJSDocTemplateTag, + isJSDocThisTag, isJSDocTypeAlias, isJSDocTypeAssertion, isJSDocTypedefTag, @@ -1306,6 +1307,12 @@ const enum MappedTypeModifiers { ExcludeOptional = 1 << 3, } +const enum MappedTypeNameTypeKind { + None, + Filtering, + Remapping, +} + const enum ExpandingFlags { None = 0, Source = 1, @@ -2833,7 +2840,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a) return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration as VariableDeclaration, usage); } - else if (isClassDeclaration(declaration)) { + else if (isClassLike(declaration)) { // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} }) return !findAncestor(usage, n => isComputedPropertyName(n) && n.parent.parent === declaration); } @@ -3149,7 +3156,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { else if (location.kind === SyntaxKind.ConditionalType) { // A type parameter declared using 'infer T' in a conditional type is visible only in // the true branch of the conditional type. - useResult = lastLocation === (location as ConditionalTypeNode).trueType; + useResult = lastLocation === location.trueType; } if (useResult) { @@ -5526,6 +5533,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent)); } + function getFunctionExpressionParentSymbolOrSymbol(symbol: Symbol) { + return symbol.valueDeclaration?.kind === SyntaxKind.ArrowFunction || symbol.valueDeclaration?.kind === SyntaxKind.FunctionExpression + ? getSymbolOfNode(symbol.valueDeclaration.parent) || symbol + : symbol; + } + function getAlternativeContainingModules(symbol: Symbol, enclosingDeclaration: Node): Symbol[] { const containingFile = getSourceFileOfNode(enclosingDeclaration); const id = getNodeId(containingFile); @@ -11236,11 +11249,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } if (symbol.parent?.valueDeclaration) { - const typeNode = getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration); - if (typeNode) { - const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode), symbol.escapedName); - if (annotationSymbol) { - return getNonMissingTypeOfSymbol(annotationSymbol); + const possiblyAnnotatedSymbol = getFunctionExpressionParentSymbolOrSymbol(symbol.parent); + if (possiblyAnnotatedSymbol.valueDeclaration) { + const typeNode = getEffectiveTypeAnnotationNode(possiblyAnnotatedSymbol.valueDeclaration); + if (typeNode) { + const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode), symbol.escapedName); + if (annotationSymbol) { + return getNonMissingTypeOfSymbol(annotationSymbol); + } } } } @@ -12932,9 +12948,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } } - const assignments = (symbol.valueDeclaration?.kind === SyntaxKind.ArrowFunction || symbol.valueDeclaration?.kind === SyntaxKind.FunctionExpression) && - getSymbolOfNode(symbol.valueDeclaration.parent)?.assignmentDeclarationMembers || - symbol.assignmentDeclarationMembers; + const assignments = getFunctionExpressionParentSymbolOrSymbol(symbol).assignmentDeclarationMembers; if (assignments) { const decls = arrayFrom(assignments.values()); @@ -13242,9 +13256,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } let result: Signature[] | undefined; for (let i = 0; i < signatureLists.length; i++) { - // Allow matching non-generic signatures to have excess parameters and different return types. + // Allow matching non-generic signatures to have excess parameters (as a fallback if exact parameter match is not found) and different return types. // Prefer matching this types if possible. - const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ true); + const match = i === listIndex + ? signature + : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ true) + || findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ true); if (!match) { return undefined; } @@ -13631,6 +13648,23 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])])); } + // If the original mapped type had an intersection constraint we extract its components, + // and we make an attempt to do so even if the intersection has been reduced to a union. + // This entire process allows us to possibly retrieve the filtering type literals. + // e.g. { [K in keyof U & ("a" | "b") ] } -> "a" | "b" + function getLimitedConstraint(type: ReverseMappedType) { + const constraint = getConstraintTypeFromMappedType(type.mappedType); + if (!(constraint.flags & TypeFlags.Union || constraint.flags & TypeFlags.Intersection)) { + return; + } + const origin = (constraint.flags & TypeFlags.Union) ? (constraint as UnionType).origin : (constraint as IntersectionType); + if (!origin || !(origin.flags & TypeFlags.Intersection)) { + return; + } + const limitedConstraint = getIntersectionType((origin as IntersectionType).types.filter(t => t !== type.constraintType)); + return limitedConstraint !== neverType ? limitedConstraint : undefined; + } + function resolveReverseMappedTypeMembers(type: ReverseMappedType) { const indexInfo = getIndexInfoOfType(type.source, stringType); const modifiers = getMappedTypeModifiers(type.mappedType); @@ -13638,7 +13672,17 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const optionalMask = modifiers & MappedTypeModifiers.IncludeOptional ? 0 : SymbolFlags.Optional; const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray; const members = createSymbolTable(); + const limitedConstraint = getLimitedConstraint(type); for (const prop of getPropertiesOfType(type.source)) { + // In case of a reverse mapped type with an intersection constraint, if we were able to + // extract the filtering type literals we skip those properties that are not assignable to them, + // because the extra properties wouldn't get through the application of the mapped type anyway + if (limitedConstraint) { + const propertyNameType = getLiteralTypeFromProperty(prop, TypeFlags.StringOrNumberLiteralOrUnique); + if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) { + continue; + } + } const checkFlags = CheckFlags.ReverseMapped | (readonlyMask && isReadonlySymbol(prop) ? CheckFlags.Readonly : 0); const inferredProp = createSymbol(SymbolFlags.Property | prop.flags & optionalMask, prop.escapedName, checkFlags) as ReverseMappedSymbol; inferredProp.declarations = prop.declarations; @@ -13679,7 +13723,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const checkType = (type as ConditionalType).checkType; const constraint = getLowerBoundOfKeyType(checkType); if (constraint !== checkType) { - return getConditionalTypeInstantiation(type as ConditionalType, prependTypeMapping((type as ConditionalType).root.checkType, constraint, (type as ConditionalType).mapper)); + return getConditionalTypeInstantiation(type as ConditionalType, prependTypeMapping((type as ConditionalType).root.checkType, constraint, (type as ConditionalType).mapper), /*forConstraint*/ false); } } return type; @@ -13731,7 +13775,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const constraintType = getConstraintTypeFromMappedType(type); const mappedType = (type.target as MappedType) || type; const nameType = getNameTypeFromMappedType(mappedType); - const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType); + const shouldLinkPropDeclarations = getMappedTypeNameTypeKind(mappedType) !== MappedTypeNameTypeKind.Remapping; const templateType = getTemplateTypeFromMappedType(mappedType); const modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T' const templateModifiers = getMappedTypeModifiers(type); @@ -13913,9 +13957,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return false; } - function isFilteringMappedType(type: MappedType): boolean { + function getMappedTypeNameTypeKind(type: MappedType): MappedTypeNameTypeKind { const nameType = getNameTypeFromMappedType(type); - return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type)); + if (!nameType) { + return MappedTypeNameTypeKind.None; + } + return isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type)) ? MappedTypeNameTypeKind.Filtering : MappedTypeNameTypeKind.Remapping; } function resolveStructuredTypeMembers(type: StructuredType): ResolvedType { @@ -13980,7 +14027,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { for (const current of type.types) { for (const prop of getPropertiesOfType(current)) { if (!members.has(prop.escapedName)) { - const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName); + const combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName, /*skipObjectFunctionPropertyAugment*/ !!(type.flags & TypeFlags.Intersection)); if (combinedProp) { members.set(prop.escapedName, combinedProp); } @@ -14055,6 +14102,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined; } + function isConstMappedType(type: MappedType, depth: number): boolean { + const typeVariable = getHomomorphicTypeVariable(type); + return !!typeVariable && isConstTypeVariable(typeVariable, depth); + } + function isConstTypeVariable(type: Type | undefined, depth = 0): boolean { return depth < 5 && !!(type && ( type.flags & TypeFlags.TypeParameter && some((type as TypeParameter).symbol?.declarations, d => hasSyntacticModifier(d, ModifierFlags.Const)) || @@ -14062,6 +14114,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { type.flags & TypeFlags.IndexedAccess && isConstTypeVariable((type as IndexedAccessType).objectType, depth + 1) || type.flags & TypeFlags.Conditional && isConstTypeVariable(getConstraintOfConditionalType(type as ConditionalType), depth + 1) || type.flags & TypeFlags.Substitution && isConstTypeVariable((type as SubstitutionType).baseType, depth) || + getObjectFlags(type) & ObjectFlags.Mapped && isConstMappedType(type as MappedType, depth) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & ElementFlags.Variadic) && isConstTypeVariable(t, depth)) >= 0 )); } @@ -14128,7 +14181,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const simplified = getSimplifiedType(type.checkType, /*writing*/ false); const constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified; if (constraint && constraint !== type.checkType) { - const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper)); + const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper), /*forConstraint*/ true); if (!(instantiated.flags & TypeFlags.Never)) { type.resolvedConstraintOfDistributive = instantiated; return instantiated; @@ -14623,6 +14676,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { type.propertyCacheWithoutObjectFunctionPropertyAugment ||= createSymbolTable() : type.propertyCache ||= createSymbolTable(); properties.set(name, property); + if (skipObjectFunctionPropertyAugment && !type.propertyCache?.get(name)) { + const properties = type.propertyCache ||= createSymbolTable(); + properties.set(name, property); + } } } return property; @@ -14765,7 +14822,17 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } return getPropertyOfObjectType(globalObjectType, name); } - if (type.flags & TypeFlags.UnionOrIntersection) { + if (type.flags & TypeFlags.Intersection) { + const prop = getPropertyOfUnionOrIntersectionType(type as UnionOrIntersectionType, name, /*skipObjectFunctionPropertyAugment*/ true); + if (prop) { + return prop; + } + if (!skipObjectFunctionPropertyAugment) { + return getPropertyOfUnionOrIntersectionType(type as UnionOrIntersectionType, name, skipObjectFunctionPropertyAugment); + } + return undefined; + } + if (type.flags & TypeFlags.Union) { return getPropertyOfUnionOrIntersectionType(type as UnionOrIntersectionType, name, skipObjectFunctionPropertyAugment); } return undefined; @@ -15013,6 +15080,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { let flags = SignatureFlags.None; let minArgumentCount = 0; let thisParameter: Symbol | undefined; + let thisTag: JSDocThisTag | undefined = isInJSFile(declaration) ? getJSDocThisTag(declaration) : undefined; let hasThisParameter = false; const iife = getImmediatelyInvokedFunctionExpression(declaration); const isJSConstructSignature = isJSDocConstructSignature(declaration); @@ -15030,6 +15098,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // signature. for (let i = isJSConstructSignature ? 1 : 0; i < declaration.parameters.length; i++) { const param = declaration.parameters[i]; + if (isInJSFile(param) && isJSDocThisTag(param)) { + thisTag = param; + continue; + } let paramSymbol = param.symbol; const type = isJSDocParameterTag(param) ? (param.typeExpression && param.typeExpression.type) : param.type; @@ -15073,11 +15145,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } - if (isInJSFile(declaration)) { - const thisTag = getJSDocThisTag(declaration); - if (thisTag && thisTag.typeExpression) { - thisParameter = createSymbolWithType(createSymbol(SymbolFlags.FunctionScopedVariable, InternalSymbolName.This), getTypeFromTypeNode(thisTag.typeExpression)); - } + if (thisTag && thisTag.typeExpression) { + thisParameter = createSymbolWithType(createSymbol(SymbolFlags.FunctionScopedVariable, InternalSymbolName.This), getTypeFromTypeNode(thisTag.typeExpression)); } const hostDeclaration = isJSDocSignature(declaration) ? getEffectiveJSDocHost(declaration) : declaration; @@ -16794,6 +16863,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (!(flags & TypeFlags.Never)) { includes |= flags & TypeFlags.IncludesMask; if (flags & TypeFlags.Instantiable) includes |= TypeFlags.IncludesInstantiable; + if (flags & TypeFlags.Intersection && getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) includes |= TypeFlags.IncludesConstrainedTypeVariable; if (type === wildcardType) includes |= TypeFlags.IncludesWildcard; if (!strictNullChecks && flags & TypeFlags.Nullable) { if (!(getObjectFlags(type) & ObjectFlags.ContainsWideningType)) includes |= TypeFlags.IncludesNonWideningType; @@ -16925,10 +16995,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function removeStringLiteralsMatchedByTemplateLiterals(types: Type[]) { - const templates = filter(types, t => - !!(t.flags & TypeFlags.TemplateLiteral) && - isPatternLiteralType(t) && - (t as TemplateLiteralType).types.every(t => !(t.flags & TypeFlags.Intersection) || !areIntersectedTypesAvoidingPrimitiveReduction((t as IntersectionType).types))) as TemplateLiteralType[]; + const templates = filter(types, t => !!(t.flags & TypeFlags.TemplateLiteral) && isPatternLiteralType(t)) as TemplateLiteralType[]; if (templates.length) { let i = types.length; while (i > 0) { @@ -16941,6 +17008,49 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } + function removeConstrainedTypeVariables(types: Type[]) { + const typeVariables: TypeVariable[] = []; + // First collect a list of the type variables occurring in constraining intersections. + for (const type of types) { + if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) { + const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1; + pushIfUnique(typeVariables, (type as IntersectionType).types[index]); + } + } + // For each type variable, check if the constraining intersections for that type variable fully + // cover the constraint of the type variable; if so, remove the constraining intersections and + // substitute the type variable. + for (const typeVariable of typeVariables) { + const primitives: Type[] = []; + // First collect the primitive types from the constraining intersections. + for (const type of types) { + if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) { + const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1; + if ((type as IntersectionType).types[index] === typeVariable) { + insertType(primitives, (type as IntersectionType).types[1 - index]); + } + } + } + // If every constituent in the type variable's constraint is covered by an intersection of the type + // variable and that constituent, remove those intersections and substitute the type variable. + const constraint = getBaseConstraintOfType(typeVariable)!; + if (everyType(constraint, t => containsType(primitives, t))) { + let i = types.length; + while (i > 0) { + i--; + const type = types[i]; + if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) { + const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1; + if ((type as IntersectionType).types[index] === typeVariable && containsType(primitives, (type as IntersectionType).types[1 - index])) { + orderedRemoveItemAt(types, i); + } + } + } + insertType(types, typeVariable); + } + } + } + function isNamedUnionType(type: Type) { return !!(type.flags & TypeFlags.Union && (type.aliasSymbol || (type as UnionType).origin)); } @@ -17015,6 +17125,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (includes & TypeFlags.StringLiteral && includes & TypeFlags.TemplateLiteral) { removeStringLiteralsMatchedByTemplateLiterals(typeSet); } + if (includes & TypeFlags.IncludesConstrainedTypeVariable) { + removeConstrainedTypeVariables(typeSet); + } if (unionReduction === UnionReduction.Subtype) { typeSet = removeSubtypes(typeSet, !!(includes & TypeFlags.Object)); if (!typeSet) { @@ -17279,9 +17392,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return true; } - function createIntersectionType(types: Type[], aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]) { + function createIntersectionType(types: Type[], objectFlags: ObjectFlags, aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]) { const result = createType(TypeFlags.Intersection) as IntersectionType; - result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ TypeFlags.Nullable); + result.objectFlags = objectFlags | getPropagatingFlagsOfTypes(types, /*excludeKinds*/ TypeFlags.Nullable); result.types = types; result.aliasSymbol = aliasSymbol; result.aliasTypeArguments = aliasTypeArguments; @@ -17302,6 +17415,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const typeMembershipMap = new Map(); const includes = addTypesToIntersection(typeMembershipMap, 0 as TypeFlags, types); const typeSet: Type[] = arrayFrom(typeMembershipMap.values()); + let objectFlags = ObjectFlags.None; // An intersection type is considered empty if it contains // the type never, or // more than one unit type or, @@ -17353,6 +17467,36 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (typeSet.length === 1) { return typeSet[0]; } + if (typeSet.length === 2) { + const typeVarIndex = typeSet[0].flags & TypeFlags.TypeVariable ? 0 : 1; + const typeVariable = typeSet[typeVarIndex]; + const primitiveType = typeSet[1 - typeVarIndex]; + if (typeVariable.flags & TypeFlags.TypeVariable && (primitiveType.flags & (TypeFlags.Primitive | TypeFlags.NonPrimitive) || includes & TypeFlags.IncludesEmptyObject)) { + // We have an intersection T & P or P & T, where T is a type variable and P is a primitive type, the object type, or {}. + const constraint = getBaseConstraintOfType(typeVariable); + // Check that T's constraint is similarly composed of primitive types, the object type, or {}. + if (constraint && everyType(constraint, t => !!(t.flags & (TypeFlags.Primitive | TypeFlags.NonPrimitive)) || isEmptyAnonymousObjectType(t))) { + // If T's constraint is a subtype of P, simply return T. For example, given `T extends "a" | "b"`, + // the intersection `T & string` reduces to just T. + if (isTypeStrictSubtypeOf(constraint, primitiveType)) { + return typeVariable; + } + if (!(constraint.flags & TypeFlags.Union && someType(constraint, c => isTypeStrictSubtypeOf(c, primitiveType)))) { + // No constituent of T's constraint is a subtype of P. If P is also not a subtype of T's constraint, + // then the constraint and P are unrelated, and the intersection reduces to never. For example, given + // `T extends "a" | "b"`, the intersection `T & number` reduces to never. + if (!isTypeStrictSubtypeOf(primitiveType, constraint)) { + return neverType; + } + } + // Some constituent of T's constraint is a subtype of P, or P is a subtype of T's constraint. Thus, + // the intersection further constrains the type variable. For example, given `T extends string | number`, + // the intersection `T & "a"` is marked as a constrained type variable. Likewise, given `T extends "a" | 1`, + // the intersection `T & number` is marked as a constrained type variable. + objectFlags = ObjectFlags.IsConstrainedTypeVariable; + } + } + } const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments); let result = intersectionTypes.get(id); if (!result) { @@ -17388,7 +17532,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } else { - result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments); + result = createIntersectionType(typeSet, objectFlags, aliasSymbol, aliasTypeArguments); } intersectionTypes.set(id, result); } @@ -17439,20 +17583,17 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0); } - function areIntersectedTypesAvoidingPrimitiveReduction(types: Type[], primitiveFlags = TypeFlags.String | TypeFlags.Number | TypeFlags.BigInt): boolean { - if (types.length !== 2) { - return false; - } - const [t1, t2] = types; - return !!(t1.flags & primitiveFlags) && t2 === emptyTypeLiteralType || !!(t2.flags & primitiveFlags) && t1 === emptyTypeLiteralType; - } - function getTypeFromIntersectionTypeNode(node: IntersectionTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { const aliasSymbol = getAliasSymbolForTypeNode(node); const types = map(node.types, getTypeFromTypeNode); - const noSupertypeReduction = areIntersectedTypesAvoidingPrimitiveReduction(types); + // We perform no supertype reduction for X & {} or {} & X, where X is one of string, number, bigint, + // or a pattern literal template type. This enables union types like "a" | "b" | string & {} or + // "aa" | "ab" | `a${string}` which preserve the literal types for purposes of statement completion. + const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1; + const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType; + const noSupertypeReduction = !!(t.flags & (TypeFlags.String | TypeFlags.Number | TypeFlags.BigInt) || t.flags & TypeFlags.TemplateLiteral && isPatternLiteralType(t)); links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction); } return links.resolvedType; @@ -17493,30 +17634,27 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return constraintType; } const keyTypes: Type[] = []; - if (isMappedTypeWithKeyofConstraintDeclaration(type)) { - // We have a { [P in keyof T]: X } - - // `getApparentType` on the T in a generic mapped type can trigger a circularity - // (conditionals and `infer` types create a circular dependency in the constraint resolution) - // so we only eagerly manifest the keys if the constraint is nongeneric - if (!isGenericIndexType(constraintType)) { - const modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T' - forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, TypeFlags.StringOrNumberLiteralOrUnique, !!(indexFlags & IndexFlags.StringsOnly), addMemberForKeyType); - } - else { - // we have a generic index and a homomorphic mapping (but a distributive key remapping) - we need to defer the whole `keyof whatever` for later - // since it's not safe to resolve the shape of modifier type + // Calling getApparentType on the `T` of a `keyof T` in the constraint type of a generic mapped type can + // trigger a circularity. For example, `T extends { [P in keyof T & string as Captitalize

]: any }` is + // a circular definition. For this reason, we only eagerly manifest the keys if the constraint is non-generic. + if (isGenericIndexType(constraintType)) { + if (isMappedTypeWithKeyofConstraintDeclaration(type)) { + // We have a generic index and a homomorphic mapping (but a distributive key remapping) - we need to defer + // the whole `keyof whatever` for later since it's not safe to resolve the shape of modifier type. return getIndexTypeForGenericType(type, indexFlags); } + // Include the generic component in the resulting type. + forEachType(constraintType, addMemberForKeyType); + } + else if (isMappedTypeWithKeyofConstraintDeclaration(type)) { + const modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T' + forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, TypeFlags.StringOrNumberLiteralOrUnique, !!(indexFlags & IndexFlags.StringsOnly), addMemberForKeyType); } else { forEachType(getLowerBoundOfKeyType(constraintType), addMemberForKeyType); } - if (isGenericIndexType(constraintType)) { // include the generic component in the resulting type - forEachType(constraintType, addMemberForKeyType); - } - // we had to pick apart the constraintType to potentially map/filter it - compare the final resulting list with the original constraintType, - // so we can return the union that preserves aliases/origin data if possible + // We had to pick apart the constraintType to potentially map/filter it - compare the final resulting list with the + // original constraintType, so we can return the union that preserves aliases/origin data if possible. const result = indexFlags & IndexFlags.NoIndexSignatures ? filterType(getUnionType(keyTypes), t => !(t.flags & (TypeFlags.Any | TypeFlags.String))) : getUnionType(keyTypes); if (result.flags & TypeFlags.Union && constraintType.flags & TypeFlags.Union && getTypeListId((result as UnionType).types) === getTypeListId((constraintType as UnionType).types)) { return constraintType; @@ -17601,7 +17739,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { function shouldDeferIndexType(type: Type, indexFlags = IndexFlags.None) { return !!(type.flags & TypeFlags.InstantiableNonPrimitive || isGenericTupleType(type) || - isGenericMappedType(type) && !hasDistributiveNameType(type) || + isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === MappedTypeNameTypeKind.Remapping) || type.flags & TypeFlags.Union && !(indexFlags & IndexFlags.NoReducibleCheck) && isGenericReducibleType(type) || type.flags & TypeFlags.Intersection && maybeTypeOfKind(type, TypeFlags.Instantiable) && some((type as IntersectionType).types, isEmptyAnonymousObjectType)); } @@ -17735,7 +17873,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { function createTemplateLiteralType(texts: readonly string[], types: readonly Type[]) { const type = createType(TypeFlags.TemplateLiteral) as TemplateLiteralType; - type.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ TypeFlags.Nullable); type.texts = texts; type.types = types; return type; @@ -18060,12 +18197,25 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { function isPatternLiteralPlaceholderType(type: Type): boolean { if (type.flags & TypeFlags.Intersection) { - return !isGenericType(type) && some((type as IntersectionType).types, t => !!(t.flags & (TypeFlags.Literal | TypeFlags.Nullable)) || isPatternLiteralPlaceholderType(t)); + // Return true if the intersection consists of one or more placeholders and zero or + // more object type tags. + let seenPlaceholder = false; + for (const t of (type as IntersectionType).types) { + if (t.flags & (TypeFlags.Literal | TypeFlags.Nullable) || isPatternLiteralPlaceholderType(t)) { + seenPlaceholder = true; + } + else if (!(t.flags & TypeFlags.Object)) { + return false; + } + } + return seenPlaceholder; } return !!(type.flags & (TypeFlags.Any | TypeFlags.String | TypeFlags.Number | TypeFlags.BigInt)) || isPatternLiteralType(type); } function isPatternLiteralType(type: Type) { + // A pattern literal type is a template literal or a string mapping type that contains only + // non-generic pattern literal placeholders. return !!(type.flags & TypeFlags.TemplateLiteral) && every((type as TemplateLiteralType).types, isPatternLiteralPlaceholderType) || !!(type.flags & TypeFlags.StringMapping) && isPatternLiteralPlaceholderType((type as StringMappingType).type); } @@ -18083,12 +18233,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function getGenericObjectFlags(type: Type): ObjectFlags { - if (type.flags & (TypeFlags.UnionOrIntersection | TypeFlags.TemplateLiteral)) { - if (!((type as UnionOrIntersectionType | TemplateLiteralType).objectFlags & ObjectFlags.IsGenericTypeComputed)) { - (type as UnionOrIntersectionType | TemplateLiteralType).objectFlags |= ObjectFlags.IsGenericTypeComputed | - reduceLeft((type as UnionOrIntersectionType | TemplateLiteralType).types, (flags, t) => flags | getGenericObjectFlags(t), 0); + if (type.flags & (TypeFlags.UnionOrIntersection)) { + if (!((type as UnionOrIntersectionType).objectFlags & ObjectFlags.IsGenericTypeComputed)) { + (type as UnionOrIntersectionType).objectFlags |= ObjectFlags.IsGenericTypeComputed | + reduceLeft((type as UnionOrIntersectionType).types, (flags, t) => flags | getGenericObjectFlags(t), 0); } - return (type as UnionOrIntersectionType | TemplateLiteralType).objectFlags & ObjectFlags.IsGenericType; + return (type as UnionOrIntersectionType).objectFlags & ObjectFlags.IsGenericType; } if (type.flags & TypeFlags.Substitution) { if (!((type as SubstitutionType).objectFlags & ObjectFlags.IsGenericTypeComputed)) { @@ -18098,7 +18248,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return (type as SubstitutionType).objectFlags & ObjectFlags.IsGenericType; } return (type.flags & TypeFlags.InstantiableNonPrimitive || isGenericMappedType(type) || isGenericTupleType(type) ? ObjectFlags.IsGenericObjectType : 0) | - (type.flags & (TypeFlags.InstantiableNonPrimitive | TypeFlags.Index | TypeFlags.StringMapping) && !isPatternLiteralType(type) ? ObjectFlags.IsGenericIndexType : 0); + (type.flags & (TypeFlags.InstantiableNonPrimitive | TypeFlags.Index | TypeFlags.TemplateLiteral | TypeFlags.StringMapping) && !isPatternLiteralType(type) ? ObjectFlags.IsGenericIndexType : 0); } function getSimplifiedType(type: Type, writing: boolean): Type { @@ -18171,7 +18321,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // K is generic and N is assignable to P, instantiate E using a mapper that substitutes the index type for P. // For example, for an index access { [P in K]: Box }[X], we construct the type Box. if (isGenericMappedType(objectType)) { - if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) { + if (getMappedTypeNameTypeKind(objectType) !== MappedTypeNameTypeKind.Remapping) { return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), t => getSimplifiedType(t, writing)); } } @@ -18356,7 +18506,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return isGenericType(type) || checkTuples && isTupleType(type) && some(getElementTypes(type), isGenericType); } - function getConditionalType(root: ConditionalRoot, mapper: TypeMapper | undefined, aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]): Type { + function getConditionalType(root: ConditionalRoot, mapper: TypeMapper | undefined, forConstraint: boolean, aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]): Type { let result; let extraTypes: Type[] | undefined; let tailCount = 0; @@ -18435,8 +18585,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // possible (the wildcard type is assignable to and from all types). If those are not related, // then no instantiations will be and we can just return the false branch type. if (!(inferredExtendsType.flags & TypeFlags.AnyOrUnknown) && (checkType.flags & TypeFlags.Any || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) { - // Return union of trueType and falseType for 'any' since it matches anything - if (checkType.flags & TypeFlags.Any) { + // Return union of trueType and falseType for 'any' since it matches anything. Furthermore, for a + // distributive conditional type applied to the constraint of a type variable, include trueType if + // there are possible values of the check type that are also possible values of the extends type. + // We use a reverse assignability check as it is less expensive than the comparable relationship + // and avoids false positives of a non-empty intersection check. + if (checkType.flags & TypeFlags.Any || forConstraint && !(inferredExtendsType.flags & TypeFlags.Never) && someType(getPermissiveInstantiation(inferredExtendsType), t => isTypeAssignableTo(t, getPermissiveInstantiation(checkType)))) { (extraTypes || (extraTypes = [])).push(instantiateType(getTypeFromTypeNode(root.node.trueType), combinedMapper || mapper)); } // If falseType is an immediately nested conditional type that isn't distributive or has an @@ -18560,7 +18714,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { aliasSymbol, aliasTypeArguments, }; - links.resolvedType = getConditionalType(root, /*mapper*/ undefined); + links.resolvedType = getConditionalType(root, /*mapper*/ undefined, /*forConstraint*/ false); if (outerTypeParameters) { root.instantiations = new Map(); root.instantiations.set(getTypeListId(outerTypeParameters), links.resolvedType); @@ -19568,14 +19722,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return result; } - function getConditionalTypeInstantiation(type: ConditionalType, mapper: TypeMapper, aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]): Type { + function getConditionalTypeInstantiation(type: ConditionalType, mapper: TypeMapper, forConstraint: boolean, aliasSymbol?: Symbol, aliasTypeArguments?: readonly Type[]): Type { const root = type.root; if (root.outerTypeParameters) { // We are instantiating a conditional type that has one or more type parameters in scope. Apply the // mapper to the type parameters to produce the effective list of type arguments, and compute the // instantiation cache key from the type IDs of the type arguments. const typeArguments = map(root.outerTypeParameters, t => getMappedType(t, mapper)); - const id = getTypeListId(typeArguments) + getAliasId(aliasSymbol, aliasTypeArguments); + const id = (forConstraint ? "C" : "") + getTypeListId(typeArguments) + getAliasId(aliasSymbol, aliasTypeArguments); let result = root.instantiations!.get(id); if (!result) { const newMapper = createTypeMapper(root.outerTypeParameters, typeArguments); @@ -19585,8 +19739,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the // result is (A extends U ? X : Y) | (B extends U ? X : Y). result = distributionType && checkType !== distributionType && distributionType.flags & (TypeFlags.Union | TypeFlags.Never) ? - mapTypeWithAlias(getReducedType(distributionType), t => getConditionalType(root, prependTypeMapping(checkType, t, newMapper)), aliasSymbol, aliasTypeArguments) : - getConditionalType(root, newMapper, aliasSymbol, aliasTypeArguments); + mapTypeWithAlias(getReducedType(distributionType), t => getConditionalType(root, prependTypeMapping(checkType, t, newMapper), forConstraint), aliasSymbol, aliasTypeArguments) : + getConditionalType(root, newMapper, forConstraint, aliasSymbol, aliasTypeArguments); root.instantiations!.set(id, result); } return result; @@ -19668,7 +19822,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return getIndexedAccessType(instantiateType((type as IndexedAccessType).objectType, mapper), instantiateType((type as IndexedAccessType).indexType, mapper), (type as IndexedAccessType).accessFlags, /*accessNode*/ undefined, newAliasSymbol, newAliasTypeArguments); } if (flags & TypeFlags.Conditional) { - return getConditionalTypeInstantiation(type as ConditionalType, combineTypeMappers((type as ConditionalType).mapper, mapper), aliasSymbol, aliasTypeArguments); + return getConditionalTypeInstantiation(type as ConditionalType, combineTypeMappers((type as ConditionalType).mapper, mapper), /*forConstraint*/ false, aliasSymbol, aliasTypeArguments); } if (flags & TypeFlags.Substitution) { const newBaseType = instantiateType((type as SubstitutionType).baseType, mapper); @@ -20540,8 +20694,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // similar to return values, callback parameters are output positions. This means that a Promise, // where T is used only in callback parameter positions, will be co-variant (as opposed to bi-variant) // with respect to T. - const sourceSig = checkMode & SignatureCheckMode.Callback ? undefined : getSingleCallSignature(getNonNullableType(sourceType)); - const targetSig = checkMode & SignatureCheckMode.Callback ? undefined : getSingleCallSignature(getNonNullableType(targetType)); + const sourceSig = checkMode & SignatureCheckMode.Callback || isInstantiatedGenericParameter(source, i) ? undefined : getSingleCallSignature(getNonNullableType(sourceType)); + const targetSig = checkMode & SignatureCheckMode.Callback || isInstantiatedGenericParameter(target, i) ? undefined : getSingleCallSignature(getNonNullableType(targetType)); const callbacks = sourceSig && targetSig && !getTypePredicateOfSignature(sourceSig) && !getTypePredicateOfSignature(targetSig) && getTypeFacts(sourceType, TypeFacts.IsUndefinedOrNull) === getTypeFacts(targetType, TypeFacts.IsUndefinedOrNull); let related = callbacks ? @@ -21565,7 +21719,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { eachTypeRelatedToType(source as UnionType, target, reportErrors && !(source.flags & TypeFlags.Primitive), intersectionState); } if (target.flags & TypeFlags.Union) { - return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target as UnionType, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive)); + return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target as UnionType, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive), intersectionState); } if (target.flags & TypeFlags.Intersection) { return typeRelatedToEachType(source, target as IntersectionType, reportErrors, IntersectionState.Target); @@ -21599,7 +21753,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { let result = Ternary.True; const sourceTypes = source.types; for (const sourceType of sourceTypes) { - const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false); + const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false, IntersectionState.None); if (!related) { return Ternary.False; } @@ -21608,7 +21762,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return result; } - function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary { + function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean, intersectionState: IntersectionState): Ternary { const targetTypes = target.types; if (target.flags & TypeFlags.Union) { if (containsType(targetTypes, source)) { @@ -21635,14 +21789,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } const match = getMatchingUnionConstituentForType(target as UnionType, source); if (match) { - const related = isRelatedTo(source, match, RecursionFlags.Target, /*reportErrors*/ false); + const related = isRelatedTo(source, match, RecursionFlags.Target, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState); if (related) { return related; } } } for (const type of targetTypes) { - const related = isRelatedTo(source, type, RecursionFlags.Target, /*reportErrors*/ false); + const related = isRelatedTo(source, type, RecursionFlags.Target, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState); if (related) { return related; } @@ -21651,7 +21805,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // Elaborate only if we can find a best matching type in the target union const bestMatchingType = getBestMatchingType(source, target, isRelatedTo); if (bestMatchingType) { - isRelatedTo(source, bestMatchingType, RecursionFlags.Target, /*reportErrors*/ true); + isRelatedTo(source, bestMatchingType, RecursionFlags.Target, /*reportErrors*/ true, /*headMessage*/ undefined, intersectionState); } } return Ternary.False; @@ -22417,18 +22571,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } } - else { - // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way - // more assignments than are desirable (since it maps the source check type to its constraint, it loses information) - const distributiveConstraint = hasNonCircularBaseConstraint(source) ? getConstraintOfDistributiveConditionalType(source as ConditionalType) : undefined; - if (distributiveConstraint) { - if (result = isRelatedTo(distributiveConstraint, target, RecursionFlags.Source, reportErrors)) { - return result; - } - } - } - - // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O` + // conditionals can be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O` // when `O` is a conditional (`never` is trivially assignable to `O`, as is `O`!). const defaultConstraint = getDefaultConstraintOfConditionalType(source as ConditionalType); if (defaultConstraint) { @@ -22436,6 +22579,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return result; } } + // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way + // more assignments than are desirable (since it maps the source check type to its constraint, it loses information). + const distributiveConstraint = !(targetFlags & TypeFlags.Conditional) && hasNonCircularBaseConstraint(source) ? getConstraintOfDistributiveConditionalType(source as ConditionalType) : undefined; + if (distributiveConstraint) { + resetErrorInfo(saveErrorInfo); + if (result = isRelatedTo(distributiveConstraint, target, RecursionFlags.Source, reportErrors)) { + return result; + } + } } else { // An empty object type is related to any mapped type that includes a '?' modifier. @@ -24768,7 +24920,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && type.symbol.declarations || objectFlags & (ObjectFlags.Mapped | ObjectFlags.ReverseMapped | ObjectFlags.ObjectRestType | ObjectFlags.InstantiationExpressionType) ) || - type.flags & (TypeFlags.UnionOrIntersection | TypeFlags.TemplateLiteral) && !(type.flags & TypeFlags.EnumLiteral) && !isNonGenericTopLevelType(type) && some((type as UnionOrIntersectionType | TemplateLiteralType).types, couldContainTypeVariables)); + type.flags & TypeFlags.UnionOrIntersection && !(type.flags & TypeFlags.EnumLiteral) && !isNonGenericTopLevelType(type) && some((type as UnionOrIntersectionType).types, couldContainTypeVariables)); if (type.flags & TypeFlags.ObjectFlagsType) { (type as ObjectFlagsType).objectFlags |= ObjectFlags.CouldContainTypeVariablesComputed | (result ? ObjectFlags.CouldContainTypeVariables : 0); } @@ -25006,12 +25158,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function isValidTypeForTemplateLiteralPlaceholder(source: Type, target: Type): boolean { - if (source === target || target.flags & (TypeFlags.Any | TypeFlags.String)) { - return true; - } if (target.flags & TypeFlags.Intersection) { return every((target as IntersectionType).types, t => t === emptyTypeLiteralType || isValidTypeForTemplateLiteralPlaceholder(source, t)); } + if (target.flags & TypeFlags.String || isTypeAssignableTo(source, target)) { + return true; + } if (source.flags & TypeFlags.StringLiteral) { const value = (source as StringLiteralType).value; return !!(target.flags & TypeFlags.Number && isValidNumberString(value, /*roundTripOnly*/ false) || @@ -25024,7 +25176,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const texts = (source as TemplateLiteralType).texts; return texts.length === 2 && texts[0] === "" && texts[1] === "" && isTypeAssignableTo((source as TemplateLiteralType).types[0], target); } - return isTypeAssignableTo(source, target); + return false; } function inferTypesFromTemplateLiteralType(source: Type, target: TemplateLiteralType): Type[] | undefined { @@ -25205,7 +25357,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { target = getIntersectionType(targets); } } - else if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) { + if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) { target = getActualTypeVariable(target); } if (target.flags & TypeFlags.TypeVariable) { @@ -25543,9 +25695,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function inferToMappedType(source: Type, target: MappedType, constraintType: Type): boolean { - if (constraintType.flags & TypeFlags.Union) { + if ((constraintType.flags & TypeFlags.Union) || (constraintType.flags & TypeFlags.Intersection)) { let result = false; - for (const type of (constraintType as UnionType).types) { + for (const type of (constraintType as (UnionType | IntersectionType)).types) { result = inferToMappedType(source, target, type) || result; } return result; @@ -26209,7 +26361,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node)) { const initializer = getEffectiveInitializer(declaration); if (initializer) { - return tryGetNameFromType(getTypeOfExpression(initializer)); + const initializerType = isBindingPattern(declaration.parent) ? getTypeForBindingElement(declaration as BindingElement) : getTypeOfExpression(initializer); + return initializerType && tryGetNameFromType(initializerType); } if (isEnumMember(declaration)) { return getTextOfPropertyName(declaration.name); @@ -27924,10 +28077,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (isMatchingConstructorReference(right)) { return narrowTypeByConstructor(type, operator, left, assumeTrue); } - if (isBooleanLiteral(right)) { + if (isBooleanLiteral(right) && !isAccessExpression(left)) { return narrowTypeByBooleanComparison(type, left, right, operator, assumeTrue); } - if (isBooleanLiteral(left)) { + if (isBooleanLiteral(left) && !isAccessExpression(right)) { return narrowTypeByBooleanComparison(type, right, left, operator, assumeTrue); } break; @@ -28706,14 +28859,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // destructuring from the narrowed parent type. if (isBindingElement(declaration) && !declaration.initializer && !declaration.dotDotDotToken && declaration.parent.elements.length >= 2) { const parent = declaration.parent.parent; - if (parent.kind === SyntaxKind.VariableDeclaration && getCombinedNodeFlagsCached(declaration) & NodeFlags.Constant || parent.kind === SyntaxKind.Parameter) { + const rootDeclaration = getRootDeclaration(parent); + if (rootDeclaration.kind === SyntaxKind.VariableDeclaration && getCombinedNodeFlagsCached(rootDeclaration) & NodeFlags.Constant || rootDeclaration.kind === SyntaxKind.Parameter) { const links = getNodeLinks(parent); if (!(links.flags & NodeCheckFlags.InCheckIdentifier)) { links.flags |= NodeCheckFlags.InCheckIdentifier; const parentType = getTypeForBindingElementParent(parent, CheckMode.Normal); const parentTypeConstraint = parentType && mapType(parentType, getBaseConstraintOrType); links.flags &= ~NodeCheckFlags.InCheckIdentifier; - if (parentTypeConstraint && parentTypeConstraint.flags & TypeFlags.Union && !(parent.kind === SyntaxKind.Parameter && isSymbolAssigned(symbol))) { + if (parentTypeConstraint && parentTypeConstraint.flags & TypeFlags.Union && !(rootDeclaration.kind === SyntaxKind.Parameter && isSymbolAssigned(symbol))) { const pattern = declaration.parent; const narrowedType = getFlowTypeOfReference(pattern, parentTypeConstraint, parentTypeConstraint, /*flowContainer*/ undefined, location.flowNode); if (narrowedType.flags & TypeFlags.Never) { @@ -33335,6 +33489,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { (typeArguments.length >= minTypeArgumentCount && typeArguments.length <= numTypeParameters); } + function isInstantiatedGenericParameter(signature: Signature, pos: number) { + let type; + return !!(signature.target && (type = tryGetTypeAtPosition(signature.target, pos)) && isGenericType(type)); + } + // If type has a single call signature and no other members, return that signature. Otherwise, return undefined. function getSingleCallSignature(type: Type): Signature | undefined { return getSingleSignature(type, SignatureKind.Call, /*allowMembers*/ false); @@ -33909,21 +34068,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } - function getDiagnosticSpanForCallNode(node: CallExpression, doNotIncludeArguments?: boolean) { - let start: number; - let length: number; + function getDiagnosticSpanForCallNode(node: CallExpression) { const sourceFile = getSourceFileOfNode(node); - - if (isPropertyAccessExpression(node.expression)) { - const nameSpan = getErrorSpanForNode(sourceFile, node.expression.name); - start = nameSpan.start; - length = doNotIncludeArguments ? nameSpan.length : node.end - start; - } - else { - const expressionSpan = getErrorSpanForNode(sourceFile, node.expression); - start = expressionSpan.start; - length = doNotIncludeArguments ? expressionSpan.length : node.end - start; - } + const { start, length } = getErrorSpanForNode(sourceFile, isPropertyAccessExpression(node.expression) ? node.expression.name : node.expression); return { start, length, sourceFile }; } @@ -33943,6 +34090,19 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } + function getErrorNodeForCallNode(callLike: CallLikeExpression): Node { + if (isCallOrNewExpression(callLike)) { + return isPropertyAccessExpression(callLike.expression) ? callLike.expression.name : callLike.expression; + } + if (isTaggedTemplateExpression(callLike)) { + return isPropertyAccessExpression(callLike.tag) ? callLike.tag.name : callLike.tag; + } + if (isJsxOpeningLikeElement(callLike)) { + return callLike.tagName; + } + return callLike; + } + function isPromiseResolveArityError(node: CallLikeExpression) { if (!isCallExpression(node) || !isIdentifier(node.expression)) return false; @@ -34266,7 +34426,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { diag = { file, start, length, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related }; } else { - diag = createDiagnosticForNodeFromMessageChain(getSourceFileOfNode(node), node, chain, related); + diag = createDiagnosticForNodeFromMessageChain(getSourceFileOfNode(node), getErrorNodeForCallNode(node), chain, related); } addImplementationSuccessElaboration(candidatesForArgumentError[0], diag); diagnostics.add(diag); @@ -34624,7 +34784,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // use the resolvingSignature singleton to indicate that we deferred processing. This result will be // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and // from which we never make inferences). - if (checkMode & CheckMode.SkipGenericFunctions && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) { + if (checkMode & CheckMode.SkipGenericFunctions && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunctionOrConstructor)) { skippedGenericFunction(node, checkMode); return resolvingSignature; } @@ -34637,8 +34797,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return resolveCall(node, callSignatures, candidatesOutArray, checkMode, callChainFlags); } - function isGenericFunctionReturningFunction(signature: Signature) { - return !!(signature.typeParameters && isFunctionType(getReturnTypeOfSignature(signature))); + function isGenericFunctionReturningFunctionOrConstructor(signature: Signature) { + if (!signature.typeParameters) { + return false; + } + const returnType = getReturnTypeOfSignature(signature); + return isFunctionType(returnType) || isConstructorType(returnType); } /** @@ -34902,7 +35066,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { addRelatedInfo(diagnostic, createDiagnosticForNode(errorTarget, relatedInfo)); } if (isCallExpression(errorTarget.parent)) { - const { start, length } = getDiagnosticSpanForCallNode(errorTarget.parent, /*doNotIncludeArguments*/ true); + const { start, length } = getDiagnosticSpanForCallNode(errorTarget.parent); diagnostic.start = start; diagnostic.length = length; } @@ -36057,9 +36221,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const len = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0); for (let i = 0; i < len; i++) { const parameter = signature.parameters[i]; - if (!getEffectiveTypeAnnotationNode(parameter.valueDeclaration as ParameterDeclaration)) { - const contextualParameterType = tryGetTypeAtPosition(context, i); - assignParameterType(parameter, contextualParameterType); + const declaration = parameter.valueDeclaration as ParameterDeclaration; + if (!getEffectiveTypeAnnotationNode(declaration)) { + let type = tryGetTypeAtPosition(context, i); + if (type && declaration.initializer) { + let initializerType = checkDeclarationInitializer(declaration, CheckMode.Normal); + if (!isTypeAssignableTo(initializerType, type) && isTypeAssignableTo(type, initializerType = widenTypeInferredFromInitializer(declaration, initializerType))) { + type = initializerType; + } + } + assignParameterType(parameter, type); } } if (signatureHasRestParameter(signature)) { @@ -38842,17 +39013,20 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } - function getReturnTypeOfSingleNonGenericCallSignature(funcType: Type) { + function getNonGenericReturnTypeOfSingleCallSignature(funcType: Type) { const signature = getSingleCallSignature(funcType); - if (signature && !signature.typeParameters) { - return getReturnTypeOfSignature(signature); + if (signature) { + const returnType = getReturnTypeOfSignature(signature); + if (!signature.typeParameters || !couldContainTypeVariables(returnType)) { + return returnType; + } } } function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr: CallChain) { const funcType = checkExpression(expr.expression); const nonOptionalType = getOptionalExpressionType(funcType, expr.expression); - const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType); + const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType); return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType); } @@ -38901,7 +39075,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // signature where we can just fetch the return type without checking the arguments. if (isCallExpression(expr) && expr.expression.kind !== SyntaxKind.SuperKeyword && !isRequireCall(expr, /*requireStringLiteralLikeArgument*/ true) && !isSymbolOrSymbolForCall(expr)) { return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : - getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression)); + getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression)); } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) { return getTypeFromTypeNode((expr as TypeAssertion).type); @@ -39989,7 +40163,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // Check if the index type is assignable to 'keyof T' for the object type. const objectType = (type as IndexedAccessType).objectType; const indexType = (type as IndexedAccessType).indexType; - if (isTypeAssignableTo(indexType, getIndexType(objectType, IndexFlags.None))) { + // skip index type deferral on remapping mapped types + const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === MappedTypeNameTypeKind.Remapping + ? getIndexTypeForMappedType(objectType, IndexFlags.None) + : getIndexType(objectType, IndexFlags.None); + if (isTypeAssignableTo(indexType, objectIndexType)) { if ( accessNode.kind === SyntaxKind.ElementAccessExpression && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & ObjectFlags.Mapped && getMappedTypeModifiers(objectType as MappedType) & MappedTypeModifiers.IncludeReadonly diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index e543b6bfe04..e451b6b9e70 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -227,7 +227,7 @@ const libEntries: [string, string][] = [ ["esnext.disposable", "lib.esnext.disposable.d.ts"], ["esnext.bigint", "lib.es2020.bigint.d.ts"], ["esnext.string", "lib.es2022.string.d.ts"], - ["esnext.promise", "lib.es2021.promise.d.ts"], + ["esnext.promise", "lib.esnext.promise.d.ts"], ["esnext.weakref", "lib.es2021.weakref.d.ts"], ["esnext.decorators", "lib.esnext.decorators.d.ts"], ["decorators", "lib.decorators.d.ts"], @@ -3892,7 +3892,7 @@ function specToDiagnostic(spec: CompilerOptionsValue, disallowTrailingRecursion? /** * Gets directories in a set of include patterns that should be watched for changes. */ -function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }: ConfigFileSpecs, path: string, useCaseSensitiveFileNames: boolean): MapLike { +function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }: ConfigFileSpecs, basePath: string, useCaseSensitiveFileNames: boolean): MapLike { // We watch a directory recursively if it contains a wildcard anywhere in a directory segment // of the pattern: // @@ -3905,23 +3905,26 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu // // /a/b/* - Watch /a/b directly to catch any new file // /a/b/a?z - Watch /a/b directly to catch any new file matching a?z - const rawExcludeRegex = getRegularExpressionForWildcard(exclude, path, "exclude"); + const rawExcludeRegex = getRegularExpressionForWildcard(exclude, basePath, "exclude"); const excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i"); const wildcardDirectories: MapLike = {}; + const wildCardKeyToPath = new Map(); if (include !== undefined) { - const recursiveKeys: string[] = []; + const recursiveKeys: CanonicalKey[] = []; for (const file of include) { - const spec = normalizePath(combinePaths(path, file)); + const spec = normalizePath(combinePaths(basePath, file)); if (excludeRegex && excludeRegex.test(spec)) { continue; } const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames); if (match) { - const { key, flags } = match; - const existingFlags = wildcardDirectories[key]; + const { key, path, flags } = match; + const existingPath = wildCardKeyToPath.get(key); + const existingFlags = existingPath !== undefined ? wildcardDirectories[existingPath] : undefined; if (existingFlags === undefined || existingFlags < flags) { - wildcardDirectories[key] = flags; + wildcardDirectories[existingPath !== undefined ? existingPath : path] = flags; + if (existingPath === undefined) wildCardKeyToPath.set(key, path); if (flags === WatchDirectoryFlags.Recursive) { recursiveKeys.push(key); } @@ -3930,11 +3933,12 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu } // Remove any subpaths under an existing recursively watched directory. - for (const key in wildcardDirectories) { - if (hasProperty(wildcardDirectories, key)) { + for (const path in wildcardDirectories) { + if (hasProperty(wildcardDirectories, path)) { for (const recursiveKey of recursiveKeys) { - if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) { - delete wildcardDirectories[key]; + const key = toCanonicalKey(path, useCaseSensitiveFileNames); + if (key !== recursiveKey && containsPath(recursiveKey, key, basePath, !useCaseSensitiveFileNames)) { + delete wildcardDirectories[path]; } } } @@ -3944,7 +3948,12 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu return wildcardDirectories; } -function getWildcardDirectoryFromSpec(spec: string, useCaseSensitiveFileNames: boolean): { key: string; flags: WatchDirectoryFlags; } | undefined { +type CanonicalKey = string & { __canonicalKey: never; }; +function toCanonicalKey(path: string, useCaseSensitiveFileNames: boolean): CanonicalKey { + return (useCaseSensitiveFileNames ? path : toFileNameLowerCase(path)) as CanonicalKey; +} + +function getWildcardDirectoryFromSpec(spec: string, useCaseSensitiveFileNames: boolean): { key: CanonicalKey; path: string; flags: WatchDirectoryFlags; } | undefined { const match = wildcardDirectoryPattern.exec(spec); if (match) { // We check this with a few `indexOf` calls because 3 `indexOf`/`lastIndexOf` calls is @@ -3955,15 +3964,18 @@ function getWildcardDirectoryFromSpec(spec: string, useCaseSensitiveFileNames: b const starWildcardIndex = spec.indexOf("*"); const lastDirectorySeperatorIndex = spec.lastIndexOf(directorySeparator); return { - key: useCaseSensitiveFileNames ? match[0] : toFileNameLowerCase(match[0]), + key: toCanonicalKey(match[0], useCaseSensitiveFileNames), + path: match[0], flags: (questionWildcardIndex !== -1 && questionWildcardIndex < lastDirectorySeperatorIndex) || (starWildcardIndex !== -1 && starWildcardIndex < lastDirectorySeperatorIndex) ? WatchDirectoryFlags.Recursive : WatchDirectoryFlags.None, }; } if (isImplicitGlob(spec.substring(spec.lastIndexOf(directorySeparator) + 1))) { + const path = removeTrailingDirectorySeparator(spec); return { - key: removeTrailingDirectorySeparator(useCaseSensitiveFileNames ? spec : toFileNameLowerCase(spec)), + key: toCanonicalKey(path, useCaseSensitiveFileNames), + path, flags: WatchDirectoryFlags.Recursive, }; } diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts index ff605441234..0de2b201803 100644 --- a/src/compiler/factory/nodeFactory.ts +++ b/src/compiler/factory/nodeFactory.ts @@ -133,6 +133,7 @@ import { hasSyntacticModifier, HeritageClause, Identifier, + identity, idText, IfStatement, ImmediatelyInvokedArrowFunction, @@ -509,7 +510,7 @@ export function addNodeFactoryPatcher(fn: (factory: NodeFactory) => void) { * @internal */ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNodeFactory): NodeFactory { - const update = flags & NodeFactoryFlags.NoOriginalNode ? updateWithoutOriginal : updateWithOriginal; + const setOriginal = flags & NodeFactoryFlags.NoOriginalNode ? identity : setOriginalNode; // Lazily load the parenthesizer, node converters, and some factory methods until they are used. const parenthesizerRules = memoize(() => flags & NodeFactoryFlags.NoParenthesizerRules ? nullParenthesizerRules : createParenthesizerRules(factory)); @@ -6135,7 +6136,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode function cloneSourceFile(source: SourceFile) { const node = source.redirectInfo ? cloneRedirectedSourceFile(source) : cloneSourceFileWorker(source); - setOriginalNode(node, source); + setOriginal(node, source); return node; } @@ -6365,7 +6366,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode const clone = createBaseIdentifier(node.escapedText) as Mutable; clone.flags |= node.flags & ~NodeFlags.Synthesized; clone.transformFlags = node.transformFlags; - setOriginalNode(clone, node); + setOriginal(clone, node); setIdentifierAutoGenerate(clone, { ...node.emitNode.autoGenerate }); return clone; } @@ -6377,7 +6378,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode clone.flowNode = node.flowNode; clone.symbol = node.symbol; clone.transformFlags = node.transformFlags; - setOriginalNode(clone, node); + setOriginal(clone, node); // clone type arguments for emitter/typeWriter const typeArguments = getIdentifierTypeArguments(node); @@ -6389,7 +6390,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode const clone = createBasePrivateIdentifier(node.escapedText) as Mutable; clone.flags |= node.flags & ~NodeFlags.Synthesized; clone.transformFlags = node.transformFlags; - setOriginalNode(clone, node); + setOriginal(clone, node); setIdentifierAutoGenerate(clone, { ...node.emitNode.autoGenerate }); return clone; } @@ -6398,7 +6399,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode const clone = createBasePrivateIdentifier(node.escapedText); clone.flags |= node.flags & ~NodeFlags.Synthesized; clone.transformFlags = node.transformFlags; - setOriginalNode(clone, node); + setOriginal(clone, node); return clone; } @@ -6432,7 +6433,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode (clone as Mutable).flags |= node.flags & ~NodeFlags.Synthesized; (clone as Mutable).transformFlags = node.transformFlags; - setOriginalNode(clone, node); + setOriginal(clone, node); for (const key in node) { if (hasProperty(clone, key) || !hasProperty(node, key)) { @@ -7197,7 +7198,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode function asEmbeddedStatement(statement: T): T | EmptyStatement; function asEmbeddedStatement(statement: T | undefined): T | EmptyStatement | undefined; function asEmbeddedStatement(statement: T | undefined): T | EmptyStatement | undefined { - return statement && isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement; + return statement && isNotEmittedStatement(statement) ? setTextRange(setOriginal(createEmptyStatement(), statement), statement) : statement; } function asVariableDeclaration(variableDeclaration: string | BindingName | VariableDeclaration | undefined) { @@ -7211,21 +7212,14 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode } return variableDeclaration; } -} -function updateWithoutOriginal(updated: Mutable, original: T): T { - if (updated !== original) { - setTextRange(updated, original); + function update(updated: Mutable, original: T): T { + if (updated !== original) { + setOriginal(updated, original); + setTextRange(updated, original); + } + return updated; } - return updated; -} - -function updateWithOriginal(updated: Mutable, original: T): T { - if (updated !== original) { - setOriginalNode(updated, original); - setTextRange(updated, original); - } - return updated; } function getDefaultTagNameForKind(kind: JSDocTag["kind"]): string { diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 9dfb79bda1e..6b30c540c42 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -1,7 +1,6 @@ import { append, appendIfUnique, - arrayFrom, arrayIsEqualTo, changeAnyExtension, CharacterCodes, @@ -901,11 +900,24 @@ export interface NonRelativeModuleNameResolutionCache extends NonRelativeNameRes getOrCreateCacheForModuleName(nonRelativeModuleName: string, mode: ResolutionMode, redirectedReference?: ResolvedProjectReference): PerModuleNameCache; } +/** @internal */ +export interface MissingPackageJsonInfo { + packageDirectory: string; + directoryExists: boolean; +} + +/** @internal */ +export type PackageJsonInfoCacheEntry = PackageJsonInfo | MissingPackageJsonInfo; + +/** @internal */ +export function isPackageJsonInfo(entry: PackageJsonInfoCacheEntry | undefined): entry is PackageJsonInfo { + return !!(entry as PackageJsonInfo | undefined)?.contents; +} + export interface PackageJsonInfoCache { - /** @internal */ getPackageJsonInfo(packageJsonPath: string): PackageJsonInfo | boolean | undefined; - /** @internal */ setPackageJsonInfo(packageJsonPath: string, info: PackageJsonInfo | boolean): void; - /** @internal */ entries(): [Path, PackageJsonInfo | boolean][]; - /** @internal */ getInternalMap(): Map | undefined; + /** @internal */ getPackageJsonInfo(packageJsonPath: string): PackageJsonInfoCacheEntry | undefined; + /** @internal */ setPackageJsonInfo(packageJsonPath: string, info: PackageJsonInfoCacheEntry): void; + /** @internal */ getInternalMap(): Map | undefined; clear(): void; /** @internal */ isReadonly?: boolean; } @@ -1021,21 +1033,17 @@ export function createCacheWithRedirects(ownOptions: CompilerOptions | und } function createPackageJsonInfoCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): PackageJsonInfoCache { - let cache: Map | undefined; - return { getPackageJsonInfo, setPackageJsonInfo, clear, entries, getInternalMap }; + let cache: Map | undefined; + return { getPackageJsonInfo, setPackageJsonInfo, clear, getInternalMap }; function getPackageJsonInfo(packageJsonPath: string) { return cache?.get(toPath(packageJsonPath, currentDirectory, getCanonicalFileName)); } - function setPackageJsonInfo(packageJsonPath: string, info: PackageJsonInfo | boolean) { + function setPackageJsonInfo(packageJsonPath: string, info: PackageJsonInfoCacheEntry) { (cache ||= new Map()).set(toPath(packageJsonPath, currentDirectory, getCanonicalFileName), info); } function clear() { cache = undefined; } - function entries() { - const iter = cache?.entries(); - return iter ? arrayFrom(iter) : []; - } function getInternalMap() { return cache; } @@ -2391,7 +2399,7 @@ export function getPackageJsonInfo(packageDirectory: string, onlyRecordFailures: const existing = state.packageJsonInfoCache?.getPackageJsonInfo(packageJsonPath); if (existing !== undefined) { - if (typeof existing !== "boolean") { + if (isPackageJsonInfo(existing)) { if (traceEnabled) trace(host, Diagnostics.File_0_exists_according_to_earlier_cached_lookups, packageJsonPath); state.affectingLocations?.push(packageJsonPath); return existing.packageDirectory === packageDirectory ? @@ -2399,7 +2407,7 @@ export function getPackageJsonInfo(packageDirectory: string, onlyRecordFailures: { packageDirectory, contents: existing.contents }; } else { - if (existing && traceEnabled) trace(host, Diagnostics.File_0_does_not_exist_according_to_earlier_cached_lookups, packageJsonPath); + if (existing.directoryExists && traceEnabled) trace(host, Diagnostics.File_0_does_not_exist_according_to_earlier_cached_lookups, packageJsonPath); state.failedLookupLocations?.push(packageJsonPath); return undefined; } @@ -2419,7 +2427,7 @@ export function getPackageJsonInfo(packageDirectory: string, onlyRecordFailures: if (directoryExists && traceEnabled) { trace(host, Diagnostics.File_0_does_not_exist, packageJsonPath); } - if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly) state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, directoryExists); + if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly) state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, { packageDirectory, directoryExists }); // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results state.failedLookupLocations?.push(packageJsonPath); } diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts index a59fc09a674..ab1d4397255 100644 --- a/src/compiler/moduleSpecifiers.ts +++ b/src/compiler/moduleSpecifiers.ts @@ -64,6 +64,7 @@ import { isModuleBlock, isModuleDeclaration, isNonGlobalAmbientModule, + isPackageJsonInfo, isRootedDiskPath, isSourceFile, isString, @@ -84,7 +85,6 @@ import { NodeFlags, NodeModulePathParts, normalizePath, - Path, pathContainsNodeModules, pathIsBareSpecifier, pathIsRelative, @@ -200,7 +200,7 @@ function getPreferences( export function updateModuleSpecifier( compilerOptions: CompilerOptions, importingSourceFile: SourceFile, - importingSourceFileName: Path, + importingSourceFileName: string, toFileName: string, host: ModuleSpecifierResolutionHost, oldImportSpecifier: string, @@ -221,7 +221,7 @@ export function updateModuleSpecifier( export function getModuleSpecifier( compilerOptions: CompilerOptions, importingSourceFile: SourceFile, - importingSourceFileName: Path, + importingSourceFileName: string, toFileName: string, host: ModuleSpecifierResolutionHost, options: ModuleSpecifierOptions = {}, @@ -238,15 +238,15 @@ export function getNodeModulesPackageName( preferences: UserPreferences, options: ModuleSpecifierOptions = {}, ): string | undefined { - const info = getInfo(importingSourceFile.path, host); - const modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options); + const info = getInfo(importingSourceFile.fileName, host); + const modulePaths = getAllModulePaths(info, nodeModulesFileName, host, preferences, options); return firstDefined(modulePaths, modulePath => tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode)); } function getModuleSpecifierWorker( compilerOptions: CompilerOptions, importingSourceFile: SourceFile, - importingSourceFileName: Path, + importingSourceFileName: string, toFileName: string, host: ModuleSpecifierResolutionHost, preferences: Preferences, @@ -254,7 +254,7 @@ function getModuleSpecifierWorker( options: ModuleSpecifierOptions = {}, ): string { const info = getInfo(importingSourceFileName, host); - const modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options); + const modulePaths = getAllModulePaths(info, toFileName, host, userPreferences, options); return firstDefined(modulePaths, modulePath => tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode)) || getLocalModuleSpecifier(toFileName, info, compilerOptions, host, options.overrideImportMode || importingSourceFile.impliedNodeFormat, preferences); } @@ -346,7 +346,7 @@ export function getModuleSpecifiersWithCacheInfo( if (!moduleSourceFile) return { moduleSpecifiers: emptyArray, computedWithoutCache }; computedWithoutCache = true; - modulePaths ||= getAllModulePathsWorker(importingSourceFile.path, moduleSourceFile.originalFileName, host); + modulePaths ||= getAllModulePathsWorker(getInfo(importingSourceFile.fileName, host), moduleSourceFile.originalFileName, host); const result = computeModuleSpecifiers( modulePaths, compilerOptions, @@ -369,7 +369,7 @@ function computeModuleSpecifiers( options: ModuleSpecifierOptions = {}, forAutoImport: boolean, ): readonly string[] { - const info = getInfo(importingSourceFile.path, host); + const info = getInfo(importingSourceFile.fileName, host); const preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile); const existingSpecifier = forEach(modulePaths, modulePath => forEach( @@ -455,14 +455,21 @@ function computeModuleSpecifiers( interface Info { readonly getCanonicalFileName: GetCanonicalFileName; - readonly importingSourceFileName: Path; - readonly sourceDirectory: Path; + readonly importingSourceFileName: string; + readonly sourceDirectory: string; + readonly canonicalSourceDirectory: string; } // importingSourceFileName is separate because getEditsForFileRename may need to specify an updated path -function getInfo(importingSourceFileName: Path, host: ModuleSpecifierResolutionHost): Info { +function getInfo(importingSourceFileName: string, host: ModuleSpecifierResolutionHost): Info { + importingSourceFileName = getNormalizedAbsolutePath(importingSourceFileName, host.getCurrentDirectory()); const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : true); const sourceDirectory = getDirectoryPath(importingSourceFileName); - return { getCanonicalFileName, importingSourceFileName, sourceDirectory }; + return { + getCanonicalFileName, + importingSourceFileName, + sourceDirectory, + canonicalSourceDirectory: getCanonicalFileName(sourceDirectory), + }; } function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOptions: CompilerOptions, host: ModuleSpecifierResolutionHost, importMode: ResolutionMode, preferences: Preferences): string; @@ -473,7 +480,7 @@ function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOpt return undefined; } - const { sourceDirectory, getCanonicalFileName } = info; + const { sourceDirectory, canonicalSourceDirectory, getCanonicalFileName } = info; const allowedEndings = getAllowedEndingsInPrefererredOrder(importMode); const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) || processEnding(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), allowedEndings, compilerOptions); @@ -506,7 +513,7 @@ function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOpt toPath(getDirectoryPath(compilerOptions.configFilePath), host.getCurrentDirectory(), info.getCanonicalFileName) : info.getCanonicalFileName(host.getCurrentDirectory()); const modulePath = toPath(moduleFileName, projectDirectory, getCanonicalFileName); - const sourceIsInternal = startsWith(sourceDirectory, projectDirectory); + const sourceIsInternal = startsWith(canonicalSourceDirectory, projectDirectory); const targetIsInternal = startsWith(modulePath, projectDirectory); if (sourceIsInternal && !targetIsInternal || !sourceIsInternal && targetIsInternal) { // 1. The import path crosses the boundary of the tsconfig.json-containing directory. @@ -623,37 +630,37 @@ export function forEachFileNameOfModule( * Symlinks will be returned first so they are preferred over the real path. */ function getAllModulePaths( - importingFilePath: Path, + info: Info, importedFileName: string, host: ModuleSpecifierResolutionHost, preferences: UserPreferences, options: ModuleSpecifierOptions = {}, ) { + const importingFilePath = toPath(info.importingSourceFileName, host.getCurrentDirectory(), hostGetCanonicalFileName(host)); const importedFilePath = toPath(importedFileName, host.getCurrentDirectory(), hostGetCanonicalFileName(host)); const cache = host.getModuleSpecifierCache?.(); if (cache) { const cached = cache.get(importingFilePath, importedFilePath, preferences, options); if (cached?.modulePaths) return cached.modulePaths; } - const modulePaths = getAllModulePathsWorker(importingFilePath, importedFileName, host); + const modulePaths = getAllModulePathsWorker(info, importedFileName, host); if (cache) { cache.setModulePaths(importingFilePath, importedFilePath, preferences, options, modulePaths); } return modulePaths; } -function getAllModulePathsWorker(importingFileName: Path, importedFileName: string, host: ModuleSpecifierResolutionHost): readonly ModulePath[] { - const getCanonicalFileName = hostGetCanonicalFileName(host); +function getAllModulePathsWorker(info: Info, importedFileName: string, host: ModuleSpecifierResolutionHost): readonly ModulePath[] { const allFileNames = new Map(); let importedFileFromNodeModules = false; forEachFileNameOfModule( - importingFileName, + info.importingSourceFileName, importedFileName, host, /*preferSymlinks*/ true, (path, isRedirect) => { const isInNodeModules = pathContainsNodeModules(path); - allFileNames.set(path, { path: getCanonicalFileName(path), isRedirect, isInNodeModules }); + allFileNames.set(path, { path: info.getCanonicalFileName(path), isRedirect, isInNodeModules }); importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules; // don't return value, so we collect everything }, @@ -662,7 +669,7 @@ function getAllModulePathsWorker(importingFileName: Path, importedFileName: stri // Sort by paths closest to importing file Name directory const sortedPaths: ModulePath[] = []; for ( - let directory = getDirectoryPath(importingFileName); + let directory = info.canonicalSourceDirectory; allFileNames.size !== 0; ) { const directoryStart = ensureTrailingDirectorySeparator(directory); @@ -684,7 +691,10 @@ function getAllModulePathsWorker(importingFileName: Path, importedFileName: stri directory = newDirectory; } if (allFileNames.size) { - const remainingPaths = arrayFrom(allFileNames.values()); + const remainingPaths = arrayFrom( + allFileNames.entries(), + ([fileName, { isRedirect, isInNodeModules }]): ModulePath => ({ path: fileName, isRedirect, isInNodeModules }), + ); if (remainingPaths.length > 1) remainingPaths.sort(comparePathsByRedirectAndNumberOfDirectorySeparators); sortedPaths.push(...remainingPaths); } @@ -914,7 +924,7 @@ function tryGetModuleNameFromRootDirs(rootDirs: readonly string[], moduleFileNam return processEnding(shortest, allowedEndings, compilerOptions); } -function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCanonicalFileName, sourceDirectory }: Info, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, options: CompilerOptions, userPreferences: UserPreferences, packageNameOnly?: boolean, overrideMode?: ResolutionMode): string | undefined { +function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCanonicalFileName, canonicalSourceDirectory }: Info, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, options: CompilerOptions, userPreferences: UserPreferences, packageNameOnly?: boolean, overrideMode?: ResolutionMode): string | undefined { if (!host.fileExists || !host.readFile) { return undefined; } @@ -967,7 +977,7 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCan // Get a path that's relative to node_modules or the importing file's path // if node_modules folder is in this folder or any of its parent folders, no need to keep it. const pathToTopLevelNodeModules = getCanonicalFileName(moduleSpecifier.substring(0, parts.topLevelNodeModulesIndex)); - if (!(startsWith(sourceDirectory, pathToTopLevelNodeModules) || globalTypingsCacheLocation && startsWith(getCanonicalFileName(globalTypingsCacheLocation), pathToTopLevelNodeModules))) { + if (!(startsWith(canonicalSourceDirectory, pathToTopLevelNodeModules) || globalTypingsCacheLocation && startsWith(getCanonicalFileName(globalTypingsCacheLocation), pathToTopLevelNodeModules))) { return undefined; } @@ -983,7 +993,7 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCan let moduleFileToTry = path; let maybeBlockedByTypesVersions = false; const cachedPackageJson = host.getPackageJsonInfoCache?.()?.getPackageJsonInfo(packageJsonPath); - if (typeof cachedPackageJson === "object" || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) { + if (isPackageJsonInfo(cachedPackageJson) || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) { const packageJsonContent = cachedPackageJson?.contents.packageJsonContent || JSON.parse(host.readFile!(packageJsonPath)!); const importMode = overrideMode || importingSourceFile.impliedNodeFormat; if (getResolvePackageJsonExports(options)) { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index c80400d1557..9da128e705a 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1971,8 +1971,9 @@ namespace Parser { // If we parsed this as an external module, it may contain top-level await if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & TransformFlags.ContainsPossibleTopLevelAwait) { + const oldSourceFile = sourceFile; sourceFile = reparseTopLevelAwait(sourceFile); - setFields(sourceFile); + if (oldSourceFile !== sourceFile) setFields(sourceFile); } return sourceFile; @@ -7497,8 +7498,9 @@ namespace Parser { return nextToken() === SyntaxKind.StringLiteral; } - function nextTokenIsFromKeyword() { - return nextToken() === SyntaxKind.FromKeyword; + function nextTokenIsFromKeywordOrEqualsToken() { + nextToken(); + return token() === SyntaxKind.FromKeyword || token() === SyntaxKind.EqualsToken; } function nextTokenIsIdentifierOrStringLiteralOnSameLine() { @@ -8334,7 +8336,7 @@ namespace Parser { let isTypeOnly = false; if ( identifier?.escapedText === "type" && - (token() !== SyntaxKind.FromKeyword || isIdentifier() && lookAhead(nextTokenIsFromKeyword)) && + (token() !== SyntaxKind.FromKeyword || isIdentifier() && lookAhead(nextTokenIsFromKeywordOrEqualsToken)) && (isIdentifier() || tokenAfterImportDefinitelyProducesImportDeclaration()) ) { isTypeOnly = true; @@ -9208,18 +9210,7 @@ namespace Parser { } nextTokenJSDoc(); // start at token after link, then skip any whitespace skipWhitespace(); - // parseEntityName logs an error for non-identifier, so create a MissingNode ourselves to avoid the error - const p2 = getNodePos(); - let name: EntityName | JSDocMemberName | undefined = tokenIsIdentifierOrKeyword(token()) - ? parseEntityName(/*allowReservedWords*/ true) - : undefined; - if (name) { - while (token() === SyntaxKind.PrivateIdentifier) { - reScanHashToken(); // rescan #id as # id - nextTokenJSDoc(); // then skip the # - name = finishNode(factory.createJSDocMemberName(name, parseIdentifier()), p2); - } - } + const name = parseJSDocLinkName(); const text = []; while (token() !== SyntaxKind.CloseBraceToken && token() !== SyntaxKind.NewLineTrivia && token() !== SyntaxKind.EndOfFileToken) { text.push(scanner.getTokenText()); @@ -9231,6 +9222,24 @@ namespace Parser { return finishNode(create(name, text.join("")), start, scanner.getTokenEnd()); } + function parseJSDocLinkName() { + if (tokenIsIdentifierOrKeyword(token())) { + const pos = getNodePos(); + + let name: EntityName | JSDocMemberName = parseIdentifierName(); + while (parseOptional(SyntaxKind.DotToken)) { + name = finishNode(factory.createQualifiedName(name, token() === SyntaxKind.PrivateIdentifier ? createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ false) : parseIdentifier()), pos); + } + while (token() === SyntaxKind.PrivateIdentifier) { + reScanHashToken(); + nextTokenJSDoc(); + name = finishNode(factory.createJSDocMemberName(name, parseIdentifier()), pos); + } + return name; + } + return undefined; + } + function parseJSDocLinkPrefix() { skipWhitespaceOrAsterisk(); if ( @@ -9334,7 +9343,7 @@ namespace Parser { function parseNestedTypeLiteral(typeExpression: JSDocTypeExpression | undefined, name: EntityName, target: PropertyLikeParse, indent: number) { if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) { const pos = getNodePos(); - let child: JSDocPropertyLikeTag | JSDocTypeTag | JSDocTemplateTag | false; + let child: JSDocPropertyLikeTag | JSDocTypeTag | JSDocTemplateTag | JSDocThisTag | false; let children: JSDocPropertyLikeTag[] | undefined; while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent, name))) { if (child.kind === SyntaxKind.JSDocParameterTag || child.kind === SyntaxKind.JSDocPropertyTag) { @@ -9626,7 +9635,7 @@ namespace Parser { return parseChildParameterOrPropertyTag(PropertyLikeParse.Property, indent) as JSDocTypeTag | JSDocPropertyTag | JSDocTemplateTag | false; } - function parseChildParameterOrPropertyTag(target: PropertyLikeParse, indent: number, name?: EntityName): JSDocTypeTag | JSDocPropertyTag | JSDocParameterTag | JSDocTemplateTag | false { + function parseChildParameterOrPropertyTag(target: PropertyLikeParse, indent: number, name?: EntityName): JSDocTypeTag | JSDocPropertyTag | JSDocParameterTag | JSDocTemplateTag | JSDocThisTag | false { let canParseTag = true; let seenAsterisk = false; while (true) { @@ -9663,7 +9672,7 @@ namespace Parser { } } - function tryParseChildTag(target: PropertyLikeParse, indent: number): JSDocTypeTag | JSDocPropertyTag | JSDocParameterTag | JSDocTemplateTag | false { + function tryParseChildTag(target: PropertyLikeParse, indent: number): JSDocTypeTag | JSDocPropertyTag | JSDocParameterTag | JSDocTemplateTag | JSDocThisTag | false { Debug.assert(token() === SyntaxKind.AtToken); const start = scanner.getTokenFullStart(); nextTokenJSDoc(); @@ -9685,6 +9694,8 @@ namespace Parser { break; case "template": return parseTemplateTag(start, tagName, indent, indentText); + case "this": + return parseThisTag(start, tagName, indent, indentText); default: return false; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 802a7b47180..539e8feec51 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -4,7 +4,6 @@ import { addRange, addRelatedInfo, append, - arrayFrom, arrayIsEqualTo, AsExpression, BuilderProgram, @@ -216,7 +215,6 @@ import { LibResolution, libs, mapDefined, - mapDefinedIterator, maybeBind, memoize, MethodDeclaration, @@ -1240,7 +1238,8 @@ export function isProgramUptoDate( if (program.getSourceFiles().some(sourceFileNotUptoDate)) return false; // If any of the missing file paths are now created - if (program.getMissingFilePaths().some(fileExists)) return false; + const missingPaths = program.getMissingFilePaths(); + if (missingPaths && forEachEntry(missingPaths, fileExists)) return false; const currentOptions = program.getCompilerOptions(); // If the compilation settings do no match, then the program is not up-to-date @@ -1694,8 +1693,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg * - false if sourceFile missing for source of project reference redirect * - undefined otherwise */ - const filesByName = new Map(); - let missingFilePaths: readonly Path[] | undefined; + const filesByName = new Map(); + let missingFileNames = new Map(); // stores 'filename -> file association' ignoring case // used to track cases when two file names differ only in casing const filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? new Map() : undefined; @@ -1812,14 +1811,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg } } - missingFilePaths = arrayFrom(mapDefinedIterator(filesByName.entries(), ([path, file]) => file === undefined ? path as Path : undefined)); files = stableSort(processingDefaultLibFiles, compareDefaultLibFiles).concat(processingOtherFiles); processingDefaultLibFiles = undefined; processingOtherFiles = undefined; } - Debug.assert(!!missingFilePaths); - // Release any files we have acquired in the old program but are // not part of the new program. if (oldProgram && host.onReleaseOldSourceFile) { @@ -1869,7 +1865,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg getSourceFile, getSourceFileByPath, getSourceFiles: () => files, - getMissingFilePaths: () => missingFilePaths!, // TODO: GH#18217 + getMissingFilePaths: () => missingFileNames, getModuleResolutionCache: () => moduleResolutionCache, getFilesByNameMap: () => filesByName, getCompilerOptions: () => options, @@ -2398,7 +2394,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // If the missing file paths are now present, it can change the progam structure, // and hence cant reuse the structure. // This is same as how we dont reuse the structure if one of the file from old program is now missing - if (oldProgram.getMissingFilePaths().some(missingFilePath => host.fileExists(missingFilePath))) { + if (forEachEntry(oldProgram.getMissingFilePaths(), missingFileName => host.fileExists(missingFileName))) { return StructureIsReused.Not; } @@ -2579,7 +2575,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg automaticTypeDirectiveNames = getAutomaticTypeDirectiveNames(options, host); if (!arrayIsEqualTo(oldProgram.getAutomaticTypeDirectiveNames(), automaticTypeDirectiveNames)) return StructureIsReused.SafeModules; } - missingFilePaths = oldProgram.getMissingFilePaths(); + missingFileNames = oldProgram.getMissingFilePaths(); // update fileName -> file mapping Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length); @@ -2643,7 +2639,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // Use local caches const path = toPath(f); if (getSourceFileByPath(path)) return true; - if (contains(missingFilePaths, path)) return false; + if (missingFileNames.has(path)) return false; // Before falling back to the host return host.fileExists(f); }, @@ -3602,7 +3598,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg const file = isString(source) ? findSourceFile(source, isDefaultLib, ignoreNoDefaultLib, reason, packageId) : undefined; - if (file) addFileToFilesByName(file, path, /*redirectedPath*/ undefined); + if (file) addFileToFilesByName(file, path, fileName, /*redirectedPath*/ undefined); return file; } } @@ -3688,7 +3684,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // Instead of creating a duplicate, just redirect to the existing one. const dupFile = createRedirectedSourceFile(fileFromPackageId, file!, fileName, path, toPath(fileName), originalFileName, sourceFileOptions); redirectTargetsMap.add(fileFromPackageId.path, fileName); - addFileToFilesByName(dupFile, path, redirectedPath); + addFileToFilesByName(dupFile, path, fileName, redirectedPath); addFileIncludeReason(dupFile, reason); sourceFileToPackageName.set(path, packageIdToPackageName(packageId)); processingOtherFiles!.push(dupFile); @@ -3700,7 +3696,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg sourceFileToPackageName.set(path, packageIdToPackageName(packageId)); } } - addFileToFilesByName(file, path, redirectedPath); + addFileToFilesByName(file, path, fileName, redirectedPath); if (file) { sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0); @@ -3751,15 +3747,20 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg if (file) fileReasons.add(file.path, reason); } - function addFileToFilesByName(file: SourceFile | undefined, path: Path, redirectedPath: Path | undefined) { + function addFileToFilesByName(file: SourceFile | undefined, path: Path, fileName: string, redirectedPath: Path | undefined) { if (redirectedPath) { - filesByName.set(redirectedPath, file); - filesByName.set(path, file || false); + updateFilesByNameMap(fileName, redirectedPath, file); + updateFilesByNameMap(fileName, path, file || false); } else { - filesByName.set(path, file); + updateFilesByNameMap(fileName, path, file); } } + function updateFilesByNameMap(fileName: string, path: Path, file: SourceFile | false | undefined) { + filesByName.set(path, file); + if (file !== undefined) missingFileNames.delete(path); + else missingFileNames.set(path, fileName); + } function getProjectReferenceRedirect(fileName: string): string | undefined { const referencedProject = getProjectReferenceRedirectProject(fileName); @@ -4130,19 +4131,19 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg if (host.getParsedCommandLine) { commandLine = host.getParsedCommandLine(refPath); if (!commandLine) { - addFileToFilesByName(/*file*/ undefined, sourceFilePath, /*redirectedPath*/ undefined); + addFileToFilesByName(/*file*/ undefined, sourceFilePath, refPath, /*redirectedPath*/ undefined); projectReferenceRedirects.set(sourceFilePath, false); return undefined; } sourceFile = Debug.checkDefined(commandLine.options.configFile); Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath); - addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined); + addFileToFilesByName(sourceFile, sourceFilePath, refPath, /*redirectedPath*/ undefined); } else { // An absolute path pointing to the containing directory of the config file const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), currentDirectory); sourceFile = host.getSourceFile(refPath, ScriptTarget.JSON) as JsonSourceFile | undefined; - addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined); + addFileToFilesByName(sourceFile, sourceFilePath, refPath, /*redirectedPath*/ undefined); if (sourceFile === undefined) { projectReferenceRedirects.set(sourceFilePath, false); return undefined; diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts index 6c150cb66ae..9ad219eee2c 100644 --- a/src/compiler/resolutionCache.ts +++ b/src/compiler/resolutionCache.ts @@ -1,5 +1,4 @@ import { - arrayToMap, CachedDirectoryStructureHost, clearMap, closeFileWatcher, @@ -54,7 +53,7 @@ import { normalizePath, PackageId, packageIdToString, - PackageJsonInfo, + PackageJsonInfoCacheEntry, parseNodeModuleFromPath, Path, PathPathComponents, @@ -1179,7 +1178,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD } } - function invalidateAffectingFileWatcher(path: string, packageJsonMap: Map | undefined) { + function invalidateAffectingFileWatcher(path: string, packageJsonMap: Map | undefined) { const watcher = fileWatchesOfAffectingLocations.get(path); if (watcher?.resolutions) (affectingPathChecks ??= new Set()).add(path); if (watcher?.files) (affectingPathChecksForFile ??= new Set()).add(path); @@ -1482,9 +1481,9 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD clearMap(typeRootsWatches, closeFileWatcher); } - function createTypeRootsWatch(typeRootPath: Path, typeRoot: string): FileWatcher { + function createTypeRootsWatch(typeRoot: string): FileWatcher { // Create new watch and recursive info - return canWatchTypeRootPath(typeRootPath) ? + return canWatchTypeRootPath(typeRoot) ? resolutionHost.watchTypeRootsDirectory(typeRoot, fileOrDirectory => { const fileOrDirectoryPath = resolutionHost.toPath(fileOrDirectory); if (cachedDirectoryStructureHost) { @@ -1502,7 +1501,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD // So handle to failed lookup locations here as well to ensure we are invalidating resolutions const dirPath = getDirectoryToWatchFailedLookupLocationFromTypeRoot( typeRoot, - typeRootPath, + resolutionHost.toPath(typeRoot), rootPath, rootPathComponents, getCurrentDirectory, @@ -1534,7 +1533,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD if (typeRoots) { mutateMap( typeRootsWatches, - arrayToMap(typeRoots, tr => resolutionHost.toPath(tr)), + new Set(typeRoots), { createNewValue: createTypeRootsWatch, onDeleteValue: closeFileWatcher, diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 71799008471..45a5df4f0b9 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -65,6 +65,7 @@ import { getLeadingCommentRangesOfNode, getLineAndCharacterOfPosition, getNameOfDeclaration, + getNormalizedAbsolutePath, getOriginalNodeId, getOutputPathsFor, getParseTreeNode, @@ -208,7 +209,6 @@ import { SymbolTracker, SyntaxKind, toFileNameLowerCase, - toPath, TransformationContext, transformNodes, tryCast, @@ -631,8 +631,8 @@ export function transformDeclarations(context: TransformationContext) { const specifier = moduleSpecifiers.getModuleSpecifier( options, currentSourceFile, - toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), - toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), + getNormalizedAbsolutePath(outputFilePath, host.getCurrentDirectory()), + getNormalizedAbsolutePath(declFileName, host.getCurrentDirectory()), host, ); if (!pathIsRelative(specifier)) { diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts index 54838d62b7b..902e57184fa 100644 --- a/src/compiler/tsbuildPublic.ts +++ b/src/compiler/tsbuildPublic.ts @@ -1,6 +1,6 @@ import { AffectedFileResult, - arrayToMap, + arrayFrom, assertType, BuilderProgram, BuildInfo, @@ -10,6 +10,7 @@ import { clearMap, closeFileWatcher, closeFileWatcherOf, + combinePaths, commonOptionsWithBuild, CompilerHost, CompilerOptions, @@ -48,6 +49,7 @@ import { findIndex, flattenDiagnosticMessageText, forEach, + forEachKey, ForegroundColorEscapeSequences, formatColorAndReset, getAllProjectOutputs, @@ -72,10 +74,10 @@ import { isArray, isIgnoredFileFromWildCardWatching, isIncrementalCompilation, + isPackageJsonInfo, isString, listFiles, loadWithModeAwareCache, - map, maybeBind, missingFileModifiedTime, ModuleResolutionCache, @@ -409,14 +411,14 @@ interface SolutionBuilderState extends WatchFactory>; - readonly allWatchedInputFiles: Map>; + readonly allWatchedInputFiles: Map>; readonly allWatchedConfigFiles: Map; readonly allWatchedExtendedConfigFiles: Map>; readonly allWatchedPackageJsonFiles: Map>; readonly filesWatched: Map; readonly outputTimeStamps: Map>; - readonly lastCachedPackageJsonLookups: Map; + readonly lastCachedPackageJsonLookups: Map | undefined>; timerToBuildInvalidatedProject: any; reportFileChangeDetected: boolean; @@ -660,9 +662,9 @@ function createStateBuildOrder(state: SolutionBuilderS state.resolvedConfigFilePaths.clear(); // TODO(rbuckton): Should be a `Set`, but that requires changing the code below that uses `mutateMapSkippingNewValues` - const currentProjects = new Map( + const currentProjects = new Set( getBuildOrderFromAnyBuildOrder(buildOrder).map( - resolved => [toResolvedConfigFilePath(state, resolved), true as const], + resolved => toResolvedConfigFilePath(state, resolved), ), ); @@ -676,6 +678,7 @@ function createStateBuildOrder(state: SolutionBuilderS mutateMapSkippingNewValues(state.projectErrorsReported, currentProjects, noopOnDelete); mutateMapSkippingNewValues(state.buildInfoCache, currentProjects, noopOnDelete); mutateMapSkippingNewValues(state.outputTimeStamps, currentProjects, noopOnDelete); + mutateMapSkippingNewValues(state.lastCachedPackageJsonLookups, currentProjects, noopOnDelete); // Remove watches for the program no longer in the solution if (state.watch) { @@ -1083,14 +1086,17 @@ function createBuildOrUpdateInvalidedProject( config.projectReferences, ); if (state.watch) { + const internalMap = state.moduleResolutionCache?.getPackageJsonInfoCache().getInternalMap(); state.lastCachedPackageJsonLookups.set( projectPath, - state.moduleResolutionCache && map( - state.moduleResolutionCache.getPackageJsonInfoCache().entries(), - ([path, data]) => ([state.host.realpath && data ? toPath(state, state.host.realpath(path)) : path, data] as const), - ), + internalMap && new Set(arrayFrom( + internalMap.values(), + data => + state.host.realpath && (isPackageJsonInfo(data) || data.directoryExists) ? + state.host.realpath(combinePaths(data.packageDirectory, "package.json")) : + combinePaths(data.packageDirectory, "package.json"), + )), ); - state.builderPrograms.set(projectPath, program); } step++; @@ -1983,9 +1989,10 @@ function getUpToDateStatusWorker(state: SolutionBuilde if (extendedConfigStatus) return extendedConfigStatus; // Check package file time - const dependentPackageFileStatus = forEach( - state.lastCachedPackageJsonLookups.get(resolvedPath) || emptyArray, - ([path]) => checkConfigFileUpToDateStatus(state, path, oldestOutputFileTime, oldestOutputFileName!), + const packageJsonLookups = state.lastCachedPackageJsonLookups.get(resolvedPath); + const dependentPackageFileStatus = packageJsonLookups && forEachKey( + packageJsonLookups, + path => checkConfigFileUpToDateStatus(state, path, oldestOutputFileTime, oldestOutputFileName!), ); if (dependentPackageFileStatus) return dependentPackageFileStatus; @@ -2376,7 +2383,7 @@ function watchWildCardDirectories(state: SolutionBuild if (!state.watch) return; updateWatchingWildcardDirectories( getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), - new Map(Object.entries(parsed.wildcardDirectories!)), + parsed.wildcardDirectories, (dir, flags) => state.watchDirectory( dir, @@ -2410,9 +2417,9 @@ function watchInputFiles(state: SolutionBuilderState toPath(state, fileName)), + new Set(parsed.fileNames), { - createNewValue: (_path, input) => + createNewValue: input => watchFile( state, input, @@ -2431,12 +2438,12 @@ function watchPackageJsonFiles(state: SolutionBuilderS if (!state.watch || !state.lastCachedPackageJsonLookups) return; mutateMap( getOrCreateValueMapFromConfigFileMap(state.allWatchedPackageJsonFiles, resolvedPath), - new Map(state.lastCachedPackageJsonLookups.get(resolvedPath)), + state.lastCachedPackageJsonLookups.get(resolvedPath), { - createNewValue: (path, _input) => + createNewValue: input => watchFile( state, - path, + input, () => invalidateProjectAndScheduleBuilds(state, resolvedPath, ProgramUpdateLevel.Update), PollingInterval.High, parsed?.watchOptions, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 2411fe3dff6..a636899b09b 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3663,10 +3663,10 @@ export interface ImportClause extends NamedDeclaration { export type AssertionKey = ImportAttributeName; /** @deprecated */ -export type AssertEntry = ImportAttribute; +export interface AssertEntry extends ImportAttribute {} /** @deprecated */ -export type AssertClause = ImportAttributes; +export interface AssertClause extends ImportAttributes {} export type ImportAttributeName = Identifier | StringLiteral; @@ -4684,11 +4684,11 @@ export interface Program extends ScriptReferenceHost { * * @internal */ - getMissingFilePaths(): readonly Path[]; + getMissingFilePaths(): Map; /** @internal */ getModuleResolutionCache(): ModuleResolutionCache | undefined; /** @internal */ - getFilesByNameMap(): Map; + getFilesByNameMap(): Map; /** @internal */ resolvedModules: Map> | undefined; @@ -6130,7 +6130,7 @@ export const enum TypeFlags { Instantiable = InstantiableNonPrimitive | InstantiablePrimitive, StructuredOrInstantiable = StructuredType | Instantiable, /** @internal */ - ObjectFlagsType = Any | Nullable | Never | Object | Union | Intersection | TemplateLiteral, + ObjectFlagsType = Any | Nullable | Never | Object | Union | Intersection, /** @internal */ Simplifiable = IndexedAccess | Conditional, /** @internal */ @@ -6153,6 +6153,8 @@ export const enum TypeFlags { /** @internal */ IncludesInstantiable = Substitution, /** @internal */ + IncludesConstrainedTypeVariable = StringMapping, + /** @internal */ NotPrimitiveUnion = Any | Unknown | Void | Never | Object | Intersection | IncludesInstantiable, } @@ -6289,7 +6291,7 @@ export const enum ObjectFlags { /** @internal */ IdenticalBaseTypeExists = 1 << 26, // has a defined cachedEquivalentBaseType member - // Flags that require TypeFlags.UnionOrIntersection, TypeFlags.Substitution, or TypeFlags.TemplateLiteral + // Flags that require TypeFlags.UnionOrIntersection or TypeFlags.Substitution /** @internal */ IsGenericTypeComputed = 1 << 21, // IsGenericObjectType flag has been computed /** @internal */ @@ -6313,10 +6315,12 @@ export const enum ObjectFlags { IsNeverIntersectionComputed = 1 << 24, // IsNeverLike flag has been computed /** @internal */ IsNeverIntersection = 1 << 25, // Intersection reduces to never + /** @internal */ + IsConstrainedTypeVariable = 1 << 26, // T & C, where T's constraint and C are primitives, object, or {} } /** @internal */ -export type ObjectFlagsType = NullableType | ObjectType | UnionType | IntersectionType | TemplateLiteralType; +export type ObjectFlagsType = NullableType | ObjectType | UnionType | IntersectionType; // Object types (TypeFlags.ObjectType) // dprint-ignore @@ -6675,8 +6679,6 @@ export interface ConditionalType extends InstantiableType { } export interface TemplateLiteralType extends InstantiableType { - /** @internal */ - objectFlags: ObjectFlags; texts: readonly string[]; // Always one element longer than types types: readonly Type[]; // Always at least one element } @@ -7431,7 +7433,7 @@ export interface CommandLineOptionBase { isFilePath?: boolean; // True if option value is a path or fileName shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help' description?: DiagnosticMessage; // The message describing what the command line switch does. - defaultValueDescription?: string | number | boolean | DiagnosticMessage; // The message describing what the dafault value is. string type is prepared for fixed chosen like "false" which do not need I18n. + defaultValueDescription?: string | number | boolean | DiagnosticMessage | undefined; // The message describing what the dafault value is. string type is prepared for fixed chosen like "false" which do not need I18n. paramType?: DiagnosticMessage; // The name to be used for a non-boolean option's parameter isTSConfigOnly?: boolean; // True if option can only be specified via tsconfig.json file isCommandLineOnly?: boolean; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 964db9543c5..88e5358b310 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -5825,7 +5825,8 @@ export function createDiagnosticCollection(): DiagnosticCollection { } const templateSubstitutionRegExp = /\$\{/g; -function escapeTemplateSubstitution(str: string): string { +/** @internal */ +export function escapeTemplateSubstitution(str: string): string { return str.replace(templateSubstitutionRegExp, "\\${"); } @@ -7831,9 +7832,12 @@ export function clearMap(map: { forEach: Map["forEach"]; clear: Map< } /** @internal */ -export interface MutateMapSkippingNewValuesOptions { +export interface MutateMapSkippingNewValuesDelete { onDeleteValue(existingValue: T, key: K): void; +} +/** @internal */ +export interface MutateMapSkippingNewValuesOptions extends MutateMapSkippingNewValuesDelete { /** * If present this is called with the key when there is value for that key both in new map as well as existing map provided * Caller can then decide to update or remove this key. @@ -7848,47 +7852,68 @@ export interface MutateMapSkippingNewValuesOptions { * * @internal */ +export function mutateMapSkippingNewValues( + map: Map, + newMap: ReadonlySet | undefined, + options: MutateMapSkippingNewValuesDelete, +): void; +/** @internal */ export function mutateMapSkippingNewValues( map: Map, - newMap: ReadonlyMap, + newMap: ReadonlyMap | undefined, + options: MutateMapSkippingNewValuesOptions, +): void; +export function mutateMapSkippingNewValues( + map: Map, + newMap: ReadonlyMap | ReadonlySet | undefined, options: MutateMapSkippingNewValuesOptions, ) { const { onDeleteValue, onExistingValue } = options; // Needs update map.forEach((existingValue, key) => { - const valueInNewMap = newMap.get(key); // Not present any more in new map, remove it - if (valueInNewMap === undefined) { + if (!newMap?.has(key)) { map.delete(key); onDeleteValue(existingValue, key); } // If present notify about existing values else if (onExistingValue) { - onExistingValue(existingValue, valueInNewMap, key); + onExistingValue(existingValue, (newMap as Map).get?.(key)!, key); } }); } /** @internal */ -export interface MutateMapOptions extends MutateMapSkippingNewValuesOptions { +export interface MutateMapOptionsCreate { createNewValue(key: K, valueInNewMap: U): T; } +/** @internal */ +export interface MutateMapWithNewSetOptions extends MutateMapSkippingNewValuesDelete, MutateMapOptionsCreate { +} + +/** @internal */ +export interface MutateMapOptions extends MutateMapSkippingNewValuesOptions, MutateMapOptionsCreate { +} + /** * Mutates the map with newMap such that keys in map will be same as newMap. * * @internal */ -export function mutateMap(map: Map, newMap: ReadonlyMap, options: MutateMapOptions) { +export function mutateMap(map: Map, newMap: ReadonlySet | undefined, options: MutateMapWithNewSetOptions): void; +/** @internal */ +export function mutateMap(map: Map, newMap: ReadonlyMap | undefined, options: MutateMapOptions): void; +export function mutateMap(map: Map, newMap: ReadonlyMap | ReadonlySet | undefined, options: MutateMapOptions) { // Needs update - mutateMapSkippingNewValues(map, newMap, options); + mutateMapSkippingNewValues(map, newMap as ReadonlyMap, options); const { createNewValue } = options; // Add new values that are not already present - newMap.forEach((valueInNewMap, key) => { + newMap?.forEach((valueInNewMap, key) => { if (!map.has(key)) { // New values - map.set(key, createNewValue(key, valueInNewMap)); + map.set(key, createNewValue(key, valueInNewMap as U & K)); } }); } diff --git a/src/compiler/watchPublic.ts b/src/compiler/watchPublic.ts index ac2c666ea89..420b5907126 100644 --- a/src/compiler/watchPublic.ts +++ b/src/compiler/watchPublic.ts @@ -682,7 +682,11 @@ export function createWatchProgram(host: WatchCompiler resolutionCache.finishCachingPerDirectoryResolution(builderProgram.getProgram(), oldProgram); // Update watches - updateMissingFilePathsWatch(builderProgram.getProgram(), missingFilesMap || (missingFilesMap = new Map()), watchMissingFilePath); + updateMissingFilePathsWatch( + builderProgram.getProgram(), + missingFilesMap || (missingFilesMap = new Map()), + watchMissingFilePath, + ); if (needsUpdateInTypeRootWatch) { resolutionCache.updateTypeRootsWatch(); } @@ -1053,11 +1057,18 @@ export function createWatchProgram(host: WatchCompiler } } - function watchMissingFilePath(missingFilePath: Path) { + function watchMissingFilePath(missingFilePath: Path, missingFileName: string) { // If watching missing referenced config file, we are already watching it so no need for separate watcher return parsedConfigs?.has(missingFilePath) ? noopFileWatcher : - watchFilePath(missingFilePath, missingFilePath, onMissingFileChange, PollingInterval.Medium, watchOptions, WatchType.MissingFile); + watchFilePath( + missingFilePath, + missingFileName, + onMissingFileChange, + PollingInterval.Medium, + watchOptions, + WatchType.MissingFile, + ); } function onMissingFileChange(fileName: string, eventKind: FileWatcherEventKind, missingFilePath: Path) { @@ -1076,16 +1087,11 @@ export function createWatchProgram(host: WatchCompiler } function watchConfigFileWildCardDirectories() { - if (wildcardDirectories) { - updateWatchingWildcardDirectories( - watchedWildcardDirectories || (watchedWildcardDirectories = new Map()), - new Map(Object.entries(wildcardDirectories)), - watchWildcardDirectory, - ); - } - else if (watchedWildcardDirectories) { - clearMap(watchedWildcardDirectories, closeFileWatcherOf); - } + updateWatchingWildcardDirectories( + watchedWildcardDirectories || (watchedWildcardDirectories = new Map()), + wildcardDirectories, + watchWildcardDirectory, + ); } function watchWildcardDirectory(directory: string, flags: WatchDirectoryFlags) { @@ -1187,56 +1193,50 @@ export function createWatchProgram(host: WatchCompiler WatchType.ConfigFileOfReferencedProject, ); // Watch Wild card - if (commandLine.parsedCommandLine?.wildcardDirectories) { - updateWatchingWildcardDirectories( - commandLine.watchedDirectories ||= new Map(), - new Map(Object.entries(commandLine.parsedCommandLine?.wildcardDirectories)), - (directory, flags) => - watchDirectory( - directory, - fileOrDirectory => { - const fileOrDirectoryPath = toPath(fileOrDirectory); - // Since the file existence changed, update the sourceFiles cache - if (cachedDirectoryStructureHost) { - cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath); - } - nextSourceFileVersion(fileOrDirectoryPath); + updateWatchingWildcardDirectories( + commandLine.watchedDirectories ||= new Map(), + commandLine.parsedCommandLine?.wildcardDirectories, + (directory, flags) => + watchDirectory( + directory, + fileOrDirectory => { + const fileOrDirectoryPath = toPath(fileOrDirectory); + // Since the file existence changed, update the sourceFiles cache + if (cachedDirectoryStructureHost) { + cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath); + } + nextSourceFileVersion(fileOrDirectoryPath); - const config = parsedConfigs?.get(configPath); - if (!config?.parsedCommandLine) return; - if ( - isIgnoredFileFromWildCardWatching({ - watchedDirPath: toPath(directory), - fileOrDirectory, - fileOrDirectoryPath, - configFileName, - options: config.parsedCommandLine.options, - program: config.parsedCommandLine.fileNames, - currentDirectory, - useCaseSensitiveFileNames, - writeLog, - toPath, - }) - ) return; + const config = parsedConfigs?.get(configPath); + if (!config?.parsedCommandLine) return; + if ( + isIgnoredFileFromWildCardWatching({ + watchedDirPath: toPath(directory), + fileOrDirectory, + fileOrDirectoryPath, + configFileName, + options: config.parsedCommandLine.options, + program: config.parsedCommandLine.fileNames, + currentDirectory, + useCaseSensitiveFileNames, + writeLog, + toPath, + }) + ) return; - // Reload is pending, do the reload - if (config.updateLevel !== ProgramUpdateLevel.Full) { - config.updateLevel = ProgramUpdateLevel.RootNamesAndUpdate; + // Reload is pending, do the reload + if (config.updateLevel !== ProgramUpdateLevel.Full) { + config.updateLevel = ProgramUpdateLevel.RootNamesAndUpdate; - // Schedule Update the program - scheduleProgramUpdate(); - } - }, - flags, - commandLine.parsedCommandLine?.watchOptions || watchOptions, - WatchType.WildcardDirectoryOfReferencedProject, - ), - ); - } - else if (commandLine.watchedDirectories) { - clearMap(commandLine.watchedDirectories, closeFileWatcherOf); - commandLine.watchedDirectories = undefined; - } + // Schedule Update the program + scheduleProgramUpdate(); + } + }, + flags, + commandLine.parsedCommandLine?.watchOptions || watchOptions, + WatchType.WildcardDirectoryOfReferencedProject, + ), + ); // Watch extended config files updateExtendedConfigFilesWatches( configPath, diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts index c259f2ac9db..a617a134daf 100644 --- a/src/compiler/watchUtilities.ts +++ b/src/compiler/watchUtilities.ts @@ -2,6 +2,7 @@ import { arrayToMap, binarySearch, BuilderProgram, + clearMap, closeFileWatcher, compareStringsCaseSensitive, CompilerOptions, @@ -33,6 +34,7 @@ import { isExcludedFile, isSupportedSourceFileName, map, + MapLike, matchesExclude, matchFiles, mutateMap, @@ -45,7 +47,6 @@ import { removeFileExtension, removeIgnoredPath, returnNoopFileWatcher, - returnTrue, ScriptKind, setSysLog, SortedArray, @@ -315,8 +316,8 @@ export function createCachedDirectoryStructureHost(host: DirectoryStructureHost, const baseName = getBaseNameOfFileName(fileOrDirectory); const fsQueryResult: FileAndDirectoryExistence = { - fileExists: host.fileExists(fileOrDirectoryPath), - directoryExists: host.directoryExists(fileOrDirectoryPath), + fileExists: host.fileExists(fileOrDirectory), + directoryExists: host.directoryExists(fileOrDirectory), }; if (fsQueryResult.directoryExists || hasEntry(parentResult.sortedAndCanonicalizedDirectories, getCanonicalFileName(baseName))) { // Folder added or removed, clear the cache instead of updating the folder and its structure @@ -460,27 +461,6 @@ export function cleanExtendedConfigCache( }); } -/** - * Updates watchers based on the package json files used in module resolution - * - * @internal - */ -export function updatePackageJsonWatch( - lookups: readonly (readonly [Path, object | boolean])[], - packageJsonWatches: Map, - createPackageJsonWatch: (packageJsonPath: Path, data: object | boolean) => FileWatcher, -) { - const newMap = new Map(lookups); - mutateMap( - packageJsonWatches, - newMap, - { - createNewValue: createPackageJsonWatch, - onDeleteValue: closeFileWatcher, - }, - ); -} - /** * Updates the existing missing file watches with the new set of missing files after new program is created * @@ -489,15 +469,12 @@ export function updatePackageJsonWatch( export function updateMissingFilePathsWatch( program: Program, missingFileWatches: Map, - createMissingFileWatch: (missingFilePath: Path) => FileWatcher, + createMissingFileWatch: (missingFilePath: Path, missingFileName: string) => FileWatcher, ) { - const missingFilePaths = program.getMissingFilePaths(); - // TODO(rbuckton): Should be a `Set` but that requires changing the below code that uses `mutateMap` - const newMissingFilePathMap = arrayToMap(missingFilePaths, identity, returnTrue); // Update the missing file paths watcher mutateMap( missingFileWatches, - newMissingFilePathMap, + program.getMissingFilePaths(), { // Watch the missing files createNewValue: createMissingFileWatch, @@ -524,21 +501,26 @@ export interface WildcardDirectoryWatcher { */ export function updateWatchingWildcardDirectories( existingWatchedForWildcards: Map, - wildcardDirectories: Map, + wildcardDirectories: MapLike | undefined, watchDirectory: (directory: string, flags: WatchDirectoryFlags) => FileWatcher, ) { - mutateMap( - existingWatchedForWildcards, - wildcardDirectories, - { - // Create new watch and recursive info - createNewValue: createWildcardDirectoryWatcher, - // Close existing watch thats not needed any more - onDeleteValue: closeFileWatcherOf, - // Close existing watch that doesnt match in the flags - onExistingValue: updateWildcardDirectoryWatcher, - }, - ); + if (wildcardDirectories) { + mutateMap( + existingWatchedForWildcards, + new Map(Object.entries(wildcardDirectories)), + { + // Create new watch and recursive info + createNewValue: createWildcardDirectoryWatcher, + // Close existing watch thats not needed any more + onDeleteValue: closeFileWatcherOf, + // Close existing watch that doesnt match in the flags + onExistingValue: updateWildcardDirectoryWatcher, + }, + ); + } + else { + clearMap(existingWatchedForWildcards, closeFileWatcherOf); + } function createWildcardDirectoryWatcher(directory: string, flags: WatchDirectoryFlags): WildcardDirectoryWatcher { // Create new watch and recursive info diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts index 54c7d954ecb..5763b24c6bd 100644 --- a/src/harness/fourslashImpl.ts +++ b/src/harness/fourslashImpl.ts @@ -1569,7 +1569,7 @@ export class TestState { details.push({ location: contextSpanEnd, locationMarker: "|>", span, type: "contextEnd" }); } - if (additionalSpan && ts.documentSpansEqual(additionalSpan, span)) { + if (additionalSpan && ts.documentSpansEqual(additionalSpan, span, this.languageServiceAdapterHost.useCaseSensitiveFileNames())) { // This span is same as text span groupedSpanForAdditionalSpan = span; } diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 80ea1e5e87a..343fa7e45f8 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -391,7 +391,11 @@ class SessionServerHost implements ts.server.ServerHost { args: string[] = []; newLine: string; useCaseSensitiveFileNames = false; - watchUtils = createWatchUtils("watchedFiles", "watchedDirectories"); + watchUtils = createWatchUtils( + "watchedFiles", + "watchedDirectories", + ts.createGetCanonicalFileName(this.useCaseSensitiveFileNames), + ); constructor(private host: NativeLanguageServiceHost) { this.newLine = this.host.getNewLine(); diff --git a/src/harness/incrementalUtils.ts b/src/harness/incrementalUtils.ts index 090bc66c15f..58b157b3054 100644 --- a/src/harness/incrementalUtils.ts +++ b/src/harness/incrementalUtils.ts @@ -514,7 +514,7 @@ function verifyProgram(service: ts.server.ProjectService, project: ts.server.Pro interface ResolveSingleModuleNameWithoutWatchingData { resolutionToData: Map>; - packageJsonMap: Map | undefined; + packageJsonMap: Map | undefined; } function beforeResolveSingleModuleNameWithoutWatching( diff --git a/src/harness/watchUtils.ts b/src/harness/watchUtils.ts index f05c81ae2ae..8e9a1bc552d 100644 --- a/src/harness/watchUtils.ts +++ b/src/harness/watchUtils.ts @@ -1,4 +1,5 @@ import { + addRange, arrayFrom, compareStringsCaseSensitive, contains, @@ -6,6 +7,7 @@ import { Debug, FileWatcher, FileWatcherCallback, + GetCanonicalFileName, MultiMap, PollingInterval, } from "./_namespaces/ts"; @@ -20,31 +22,33 @@ export interface TestFsWatcher { inode: number | undefined; } -export interface WatchUtils { - pollingWatches: MultiMap; - fsWatches: MultiMap; - fsWatchesRecursive: MultiMap; - pollingWatch(path: Path, data: PollingWatcherData): FileWatcher; - fsWatch(path: Path, recursive: boolean, data: FsWatcherData): FileWatcher; +export interface Watches { + add(path: string, data: Data): void; + remove(path: string, data: Data): void; + forEach(path: string, cb: (data: Data) => void): void; + serialize(baseline: string[]): void; +} + +export interface WatchUtils { + pollingWatches: Watches; + fsWatches: Watches; + fsWatchesRecursive: Watches; + pollingWatch(path: string, data: PollingWatcherData): FileWatcher; + fsWatch(path: string, recursive: boolean, data: FsWatcherData): FileWatcher; serializeWatches(baseline?: string[]): string[]; getHasWatchChanges(): boolean; setHasWatchChanges(): void; } -export function createWatchUtils( +export function createWatchUtils( pollingWatchesName: string, fsWatchesName: string, -): WatchUtils { - const pollingWatches = createMultiMap(); - const fsWatches = createMultiMap(); - const fsWatchesRecursive = createMultiMap(); - + getCanonicalFileName: GetCanonicalFileName, +): WatchUtils { + const pollingWatches = initializeWatches(pollingWatchesName); + const fsWatches = initializeWatches(fsWatchesName); + const fsWatchesRecursive = initializeWatches(`${fsWatchesName}Recursive`); let hasWatchChanges = false; - - let serializedPollingWatches: Map | undefined; - let serializedFsWatches: Map | undefined; - let serializedFsWatchesRecursive: Map | undefined; - return { pollingWatches, fsWatches, @@ -56,21 +60,75 @@ export function createWatchUtils hasWatchChanges = true, }; - function createWatcher(map: MultiMap, path: Path, callback: T): FileWatcher { + function initializeWatches(name: string): Watches { + const actuals = createMultiMap(); + let serialized: Map | undefined; + let canonicalPathsToStrings: Map> | undefined; + return { + add, + remove, + forEach, + serialize, + }; + + function add(path: string, data: Data) { + actuals.add(path, data); + if (actuals.get(path)!.length === 1) { + const canonicalPath = getCanonicalFileName(path); + if (canonicalPath !== path) { + (canonicalPathsToStrings ??= new Map()).set( + canonicalPath, + (canonicalPathsToStrings?.get(canonicalPath) ?? new Set()).add(path), + ); + } + } + } + + function remove(path: string, data: Data) { + actuals.remove(path, data); + if (!actuals.has(path)) { + const canonicalPath = getCanonicalFileName(path); + if (canonicalPath !== path) { + const existing = canonicalPathsToStrings!.get(canonicalPath); + if (existing!.size === 1) canonicalPathsToStrings!.delete(canonicalPath); + else existing!.delete(path); + } + } + } + + function forEach(path: string, cb: (data: Data) => void) { + let allData: Data[] | undefined; + allData = addRange(allData, actuals.get(path)); + const canonicalPath = getCanonicalFileName(path); + if (canonicalPath !== path) allData = addRange(allData, actuals.get(canonicalPath)); + canonicalPathsToStrings?.get(canonicalPath)?.forEach(canonicalSamePath => { + if (canonicalSamePath !== path && canonicalSamePath !== canonicalPath) { + allData = addRange(allData, actuals.get(canonicalSamePath)); + } + }); + allData?.forEach(cb); + } + + function serialize(baseline: string[]) { + serialized = serializeMultiMap(baseline, name, actuals, serialized); + } + } + + function createWatcher(watches: Watches, path: string, callback: T): FileWatcher { hasWatchChanges = true; - map.add(path, callback); + watches.add(path, callback); let closed = false; return { close: () => { Debug.assert(!closed); - map.remove(path, callback); + watches.remove(path, callback); hasWatchChanges = true; closed = true; }, }; } - function pollingWatch(path: Path, data: PollingWatcherData) { + function pollingWatch(path: string, data: PollingWatcherData) { return createWatcher( pollingWatches, path, @@ -78,7 +136,7 @@ export function createWatchUtils declare namespace Intl { /** - * [Unicode BCP 47 Locale Identifiers](https://unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers) definition. + * A string that is a valid [Unicode BCP 47 Locale Identifier](https://unicode.org/reports/tr35/#Unicode_locale_identifier). * - * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). + * For example: "fa", "es-MX", "zh-Hant-TW". + * + * See [MDN - Intl - locales argument](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). */ type UnicodeBCP47LocaleIdentifier = string; @@ -71,16 +73,9 @@ declare namespace Intl { type RelativeTimeFormatStyle = "long" | "short" | "narrow"; /** - * [BCP 47 language tag](http://tools.ietf.org/html/rfc5646) definition. + * The locale or locales to use * - * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). - */ - type BCP47LanguageTag = string; - - /** - * The locale(s) to use - * - * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). + * See [MDN - Intl - locales argument](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). */ type LocalesArgument = UnicodeBCP47LocaleIdentifier | Locale | readonly (UnicodeBCP47LocaleIdentifier | Locale)[] | undefined; @@ -200,7 +195,7 @@ declare namespace Intl { * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat). */ new ( - locales?: UnicodeBCP47LocaleIdentifier | UnicodeBCP47LocaleIdentifier[], + locales?: LocalesArgument, options?: RelativeTimeFormatOptions, ): RelativeTimeFormat; @@ -223,7 +218,7 @@ declare namespace Intl { * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/supportedLocalesOf). */ supportedLocalesOf( - locales?: UnicodeBCP47LocaleIdentifier | UnicodeBCP47LocaleIdentifier[], + locales?: LocalesArgument, options?: RelativeTimeFormatOptions, ): UnicodeBCP47LocaleIdentifier[]; }; @@ -294,7 +289,7 @@ declare namespace Intl { /** Attempts to remove information about the locale that would be added by calling `Locale.maximize()`. */ minimize(): Locale; /** Returns the locale's full locale identifier string. */ - toString(): BCP47LanguageTag; + toString(): UnicodeBCP47LocaleIdentifier; } /** @@ -312,7 +307,7 @@ declare namespace Intl { * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale). */ const Locale: { - new (tag: BCP47LanguageTag | Locale, options?: LocaleOptions): Locale; + new (tag: UnicodeBCP47LocaleIdentifier | Locale, options?: LocaleOptions): Locale; }; type DisplayNamesFallback = @@ -406,6 +401,31 @@ declare namespace Intl { * * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/supportedLocalesOf). */ - supportedLocalesOf(locales?: LocalesArgument, options?: { localeMatcher?: RelativeTimeFormatLocaleMatcher; }): BCP47LanguageTag[]; + supportedLocalesOf(locales?: LocalesArgument, options?: { localeMatcher?: RelativeTimeFormatLocaleMatcher; }): UnicodeBCP47LocaleIdentifier[]; }; + + interface CollatorConstructor { + new (locales?: LocalesArgument, options?: CollatorOptions): Collator; + (locales?: LocalesArgument, options?: CollatorOptions): Collator; + supportedLocalesOf(locales: LocalesArgument, options?: CollatorOptions): string[]; + } + + interface DateTimeFormatConstructor { + new (locales?: LocalesArgument, options?: DateTimeFormatOptions): DateTimeFormat; + (locales?: LocalesArgument, options?: DateTimeFormatOptions): DateTimeFormat; + supportedLocalesOf(locales: LocalesArgument, options?: DateTimeFormatOptions): string[]; + } + + interface NumberFormatConstructor { + new (locales?: LocalesArgument, options?: NumberFormatOptions): NumberFormat; + (locales?: LocalesArgument, options?: NumberFormatOptions): NumberFormat; + supportedLocalesOf(locales: LocalesArgument, options?: NumberFormatOptions): string[]; + } + + interface PluralRulesConstructor { + new (locales?: LocalesArgument, options?: PluralRulesOptions): PluralRules; + (locales?: LocalesArgument, options?: PluralRulesOptions): PluralRules; + + supportedLocalesOf(locales: LocalesArgument, options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; + } } diff --git a/src/lib/es2020.string.d.ts b/src/lib/es2020.string.d.ts index 382bc75595e..bc7cf1ad5f7 100644 --- a/src/lib/es2020.string.d.ts +++ b/src/lib/es2020.string.d.ts @@ -6,5 +6,19 @@ interface String { * containing the results of that search. * @param regexp A variable name or string literal containing the regular expression pattern and flags. */ - matchAll(regexp: RegExp): IterableIterator; + matchAll(regexp: RegExp): IterableIterator; + + /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */ + toLocaleLowerCase(locales?: Intl.LocalesArgument): string; + + /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */ + toLocaleUpperCase(locales?: Intl.LocalesArgument): string; + + /** + * Determines whether two strings are equivalent in the current or specified locale. + * @param that String to compare to target string + * @param locales A locale string or array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details. + * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details. + */ + localeCompare(that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number; } diff --git a/src/lib/es2021.intl.d.ts b/src/lib/es2021.intl.d.ts index b3835b8b1ff..1566a7353f8 100644 --- a/src/lib/es2021.intl.d.ts +++ b/src/lib/es2021.intl.d.ts @@ -125,7 +125,7 @@ declare namespace Intl { * * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/ListFormat). */ - new (locales?: BCP47LanguageTag | BCP47LanguageTag[], options?: ListFormatOptions): ListFormat; + new (locales?: LocalesArgument, options?: ListFormatOptions): ListFormat; /** * Returns an array containing those of the provided locales that are @@ -143,6 +143,6 @@ declare namespace Intl { * * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/ListFormat/supportedLocalesOf). */ - supportedLocalesOf(locales: BCP47LanguageTag | BCP47LanguageTag[], options?: Pick): BCP47LanguageTag[]; + supportedLocalesOf(locales: LocalesArgument, options?: Pick): UnicodeBCP47LocaleIdentifier[]; }; } diff --git a/src/lib/es2022.intl.d.ts b/src/lib/es2022.intl.d.ts index 7ed03b05e07..3beaea6af8d 100644 --- a/src/lib/es2022.intl.d.ts +++ b/src/lib/es2022.intl.d.ts @@ -71,7 +71,7 @@ declare namespace Intl { * * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Segmenter). */ - new (locales?: BCP47LanguageTag | BCP47LanguageTag[], options?: SegmenterOptions): Segmenter; + new (locales?: LocalesArgument, options?: SegmenterOptions): Segmenter; /** * Returns an array containing those of the provided locales that are supported without having to fall back to the runtime's default locale. @@ -85,7 +85,7 @@ declare namespace Intl { * * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Segmenter/supportedLocalesOf) */ - supportedLocalesOf(locales: BCP47LanguageTag | BCP47LanguageTag[], options?: Pick): BCP47LanguageTag[]; + supportedLocalesOf(locales: LocalesArgument, options?: Pick): UnicodeBCP47LocaleIdentifier[]; }; /** diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 8065e2d3de8..f3df2304702 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -4400,11 +4400,14 @@ declare namespace Intl { compare(x: string, y: string): number; resolvedOptions(): ResolvedCollatorOptions; } - var Collator: { + + interface CollatorConstructor { new (locales?: string | string[], options?: CollatorOptions): Collator; (locales?: string | string[], options?: CollatorOptions): Collator; supportedLocalesOf(locales: string | string[], options?: CollatorOptions): string[]; - }; + } + + var Collator: CollatorConstructor; interface NumberFormatOptions { localeMatcher?: string | undefined; @@ -4436,12 +4439,15 @@ declare namespace Intl { format(value: number): string; resolvedOptions(): ResolvedNumberFormatOptions; } - var NumberFormat: { + + interface NumberFormatConstructor { new (locales?: string | string[], options?: NumberFormatOptions): NumberFormat; (locales?: string | string[], options?: NumberFormatOptions): NumberFormat; supportedLocalesOf(locales: string | string[], options?: NumberFormatOptions): string[]; readonly prototype: NumberFormat; - }; + } + + var NumberFormat: NumberFormatConstructor; interface DateTimeFormatOptions { localeMatcher?: "best fit" | "lookup" | undefined; @@ -4480,12 +4486,15 @@ declare namespace Intl { format(date?: Date | number): string; resolvedOptions(): ResolvedDateTimeFormatOptions; } - var DateTimeFormat: { + + interface DateTimeFormatConstructor { new (locales?: string | string[], options?: DateTimeFormatOptions): DateTimeFormat; (locales?: string | string[], options?: DateTimeFormatOptions): DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: DateTimeFormatOptions): string[]; readonly prototype: DateTimeFormat; - }; + } + + var DateTimeFormat: DateTimeFormatConstructor; } interface String { diff --git a/src/lib/esnext.d.ts b/src/lib/esnext.d.ts index cf34802c0e2..0fd9d10076e 100644 --- a/src/lib/esnext.d.ts +++ b/src/lib/esnext.d.ts @@ -2,3 +2,4 @@ /// /// /// +/// diff --git a/src/lib/esnext.promise.d.ts b/src/lib/esnext.promise.d.ts new file mode 100644 index 00000000000..fbed8c9aa2c --- /dev/null +++ b/src/lib/esnext.promise.d.ts @@ -0,0 +1,17 @@ +interface PromiseWithResolvers { + promise: Promise; + resolve: (value: T | PromiseLike) => void; + reject: (reason?: any) => void; +} + +interface PromiseConstructor { + /** + * Creates a new Promise and returns it in an object, along with its resolve and reject functions. + * @returns An object with the properties `promise`, `resolve`, and `reject`. + * + * ```ts + * const { promise, resolve, reject } = Promise.withResolvers(); + * ``` + */ + withResolvers(): PromiseWithResolvers; +} diff --git a/src/lib/libs.json b/src/lib/libs.json index 5bb4ab80162..0c7fd7d53e7 100644 --- a/src/lib/libs.json +++ b/src/lib/libs.json @@ -71,6 +71,7 @@ "esnext.decorators", "esnext.intl", "esnext.disposable", + "esnext.promise", "decorators", "decorators.legacy", // Default libraries diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 18d6cabbfa2..8a7f9d4b183 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -810,7 +810,17 @@ interface NodeModulesWatcher extends FileWatcher { /** How many watchers of this directory were for closed ScriptInfo */ refreshScriptInfoRefCount: number; /** List of project names whose module specifier cache should be cleared when package.jsons change */ - affectedModuleSpecifierCacheProjects?: Set; + affectedModuleSpecifierCacheProjects?: Set; +} + +/** @internal */ +export interface PackageJsonWatcher extends FileWatcher { + projects: Set; +} + +/** @internal */ +export interface WildcardWatcher extends FileWatcher { + packageJsonWatches: Set | undefined; } function getDetailWatchInfo(watchType: WatchType, project: Project | NormalizedPath | undefined) { @@ -1002,7 +1012,7 @@ export class ProjectService { * @internal */ readonly filenameToScriptInfo = new Map(); - private readonly nodeModulesWatchers = new Map(); + private readonly nodeModulesWatchers = new Map(); /** * Contains all the deleted script info's version information so that * it does not reset when creating script info again @@ -1120,7 +1130,7 @@ export class ProjectService { /** @internal */ readonly packageJsonCache: PackageJsonCache; /** @internal */ - private packageJsonFilesMap: Map | undefined; + private packageJsonFilesMap: Map | undefined; /** @internal */ private incompleteCompletionsCache: IncompleteCompletionsCache | undefined; /** @internal */ @@ -1642,24 +1652,26 @@ export class ProjectService { * * @internal */ - private watchWildcardDirectory(directory: Path, flags: WatchDirectoryFlags, configFileName: NormalizedPath, config: ParsedConfig) { - return this.watchFactory.watchDirectory( + private watchWildcardDirectory(directory: string, flags: WatchDirectoryFlags, configFileName: NormalizedPath, config: ParsedConfig) { + let watcher: FileWatcher | undefined = this.watchFactory.watchDirectory( directory, fileOrDirectory => { const fileOrDirectoryPath = this.toPath(fileOrDirectory); const fsResult = config.cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath); if ( getBaseFileName(fileOrDirectoryPath) === "package.json" && !isInsideNodeModules(fileOrDirectoryPath) && - (fsResult && fsResult.fileExists || !fsResult && this.host.fileExists(fileOrDirectoryPath)) + (fsResult && fsResult.fileExists || !fsResult && this.host.fileExists(fileOrDirectory)) ) { - this.logger.info(`Config: ${configFileName} Detected new package.json: ${fileOrDirectory}`); - this.onAddPackageJson(fileOrDirectoryPath); + const file = this.getNormalizedAbsolutePath(fileOrDirectory); + this.logger.info(`Config: ${configFileName} Detected new package.json: ${file}`); + this.packageJsonCache.addOrUpdate(file, fileOrDirectoryPath); + this.watchPackageJsonFile(file, fileOrDirectoryPath, result); } const configuredProjectForConfig = this.findConfiguredProjectByProjectName(configFileName); if ( isIgnoredFileFromWildCardWatching({ - watchedDirPath: directory, + watchedDirPath: this.toPath(directory), fileOrDirectory, fileOrDirectoryPath, configFileName, @@ -1709,6 +1721,22 @@ export class ProjectService { WatchType.WildcardDirectory, configFileName, ); + + const result: WildcardWatcher = { + packageJsonWatches: undefined, + close() { + if (watcher) { + watcher.close(); + watcher = undefined; + result.packageJsonWatches?.forEach(watcher => { + watcher.projects.delete(result); + watcher.close(); + }); + result.packageJsonWatches = undefined; + } + }, + }; + return result; } /** @internal */ @@ -2640,9 +2668,9 @@ export class ProjectService { config!.watchedDirectoriesStale = false; updateWatchingWildcardDirectories( config!.watchedDirectories ||= new Map(), - new Map(Object.entries(config!.parsedCommandLine!.wildcardDirectories!)), + config!.parsedCommandLine!.wildcardDirectories, // Create new directory watcher - (directory, flags) => this.watchWildcardDirectory(directory as Path, flags, configFileName, config!), + (directory, flags) => this.watchWildcardDirectory(directory, flags, configFileName, config!), ); } else { @@ -2733,7 +2761,7 @@ export class ProjectService { projectRootFilesMap.forEach((value, path) => { if (!newRootScriptInfoMap.has(path)) { if (value.info) { - project.removeFile(value.info, project.fileExists(path), /*detachFromProject*/ true); + project.removeFile(value.info, project.fileExists(value.info.fileName), /*detachFromProject*/ true); } else { projectRootFilesMap.delete(path); @@ -3014,7 +3042,7 @@ export class ProjectService { (!this.globalCacheLocationDirectoryPath || !startsWith(info.path, this.globalCacheLocationDirectoryPath)) ) { - const indexOfNodeModules = info.path.indexOf("/node_modules/"); + const indexOfNodeModules = info.fileName.indexOf("/node_modules/"); if (!this.host.getModifiedTime || indexOfNodeModules === -1) { info.fileWatcher = this.watchFactory.watchFile( info.fileName, @@ -3026,13 +3054,13 @@ export class ProjectService { } else { info.mTime = this.getModifiedTime(info); - info.fileWatcher = this.watchClosedScriptInfoInNodeModules(info.path.substr(0, indexOfNodeModules) as Path); + info.fileWatcher = this.watchClosedScriptInfoInNodeModules(info.fileName.substring(0, indexOfNodeModules)); } } } - private createNodeModulesWatcher(dir: Path) { - const watcher = this.watchFactory.watchDirectory( + private createNodeModulesWatcher(dir: string, dirPath: Path) { + let watcher: FileWatcher | undefined = this.watchFactory.watchDirectory( dir, fileOrDirectory => { const fileOrDirectoryPath = removeIgnoredPath(this.toPath(fileOrDirectory)); @@ -3046,15 +3074,15 @@ export class ProjectService { basename === "package.json" || basename === "node_modules" ) ) { - result.affectedModuleSpecifierCacheProjects.forEach(projectName => { - this.findProject(projectName)?.getModuleSpecifierCache()?.clear(); + result.affectedModuleSpecifierCacheProjects.forEach(project => { + project.getModuleSpecifierCache()?.clear(); }); } // Refresh closed script info after an npm install if (result.refreshScriptInfoRefCount) { - if (dir === fileOrDirectoryPath) { - this.refreshScriptInfosInDirectory(dir); + if (dirPath === fileOrDirectoryPath) { + this.refreshScriptInfosInDirectory(dirPath); } else { const info = this.getScriptInfoForPath(fileOrDirectoryPath); @@ -3078,32 +3106,36 @@ export class ProjectService { refreshScriptInfoRefCount: 0, affectedModuleSpecifierCacheProjects: undefined, close: () => { - if (!result.refreshScriptInfoRefCount && !result.affectedModuleSpecifierCacheProjects?.size) { + if (watcher && !result.refreshScriptInfoRefCount && !result.affectedModuleSpecifierCacheProjects?.size) { watcher.close(); - this.nodeModulesWatchers.delete(dir); + watcher = undefined; + this.nodeModulesWatchers.delete(dirPath); } }, }; - this.nodeModulesWatchers.set(dir, result); + this.nodeModulesWatchers.set(dirPath, result); return result; } /** @internal */ - watchPackageJsonsInNodeModules(dir: Path, project: Project): FileWatcher { - const watcher = this.nodeModulesWatchers.get(dir) || this.createNodeModulesWatcher(dir); - (watcher.affectedModuleSpecifierCacheProjects ||= new Set()).add(project.getProjectName()); + watchPackageJsonsInNodeModules(dir: string, project: Project): FileWatcher { + const dirPath = this.toPath(dir); + const watcher = this.nodeModulesWatchers.get(dirPath) || this.createNodeModulesWatcher(dir, dirPath); + Debug.assert(!watcher.affectedModuleSpecifierCacheProjects?.has(project)); + (watcher.affectedModuleSpecifierCacheProjects ||= new Set()).add(project); return { close: () => { - watcher.affectedModuleSpecifierCacheProjects?.delete(project.getProjectName()); + watcher.affectedModuleSpecifierCacheProjects?.delete(project); watcher.close(); }, }; } - private watchClosedScriptInfoInNodeModules(dir: Path): FileWatcher { - const watchDir = dir + "/node_modules" as Path; - const watcher = this.nodeModulesWatchers.get(watchDir) || this.createNodeModulesWatcher(watchDir); + private watchClosedScriptInfoInNodeModules(dir: string): FileWatcher { + const watchDir = dir + "/node_modules"; + const watchDirPath = this.toPath(watchDir); + const watcher = this.nodeModulesWatchers.get(watchDirPath) || this.createNodeModulesWatcher(watchDir, watchDirPath); watcher.refreshScriptInfoRefCount++; return { @@ -3115,7 +3147,7 @@ export class ProjectService { } private getModifiedTime(info: ScriptInfo) { - return (this.host.getModifiedTime!(info.path) || missingFileModifiedTime).getTime(); + return (this.host.getModifiedTime!(info.fileName) || missingFileModifiedTime).getTime(); } private refreshScriptInfo(info: ScriptInfo) { @@ -3408,7 +3440,9 @@ export class ProjectService { }); } if (includePackageJsonAutoImports !== args.preferences.includePackageJsonAutoImports) { - this.invalidateProjectPackageJson(/*packageJsonPath*/ undefined); + this.forEachProject(project => { + project.onAutoImportProviderSettingsChanged(); + }); } } if (args.extraFileExtensions) { @@ -4602,12 +4636,11 @@ export class ProjectService { } /** @internal */ - getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly ProjectPackageJsonInfo[] { + getPackageJsonsVisibleToFile(fileName: string, project: Project, rootDir?: string): readonly ProjectPackageJsonInfo[] { const packageJsonCache = this.packageJsonCache; const rootPath = rootDir && this.toPath(rootDir); - const filePath = this.toPath(fileName); const result: ProjectPackageJsonInfo[] = []; - const processDirectory = (directory: Path): boolean | undefined => { + const processDirectory = (directory: string): boolean | undefined => { switch (packageJsonCache.directoryHasPackageJson(directory)) { // Sync and check same directory again case Ternary.Maybe: @@ -4616,7 +4649,7 @@ export class ProjectService { // Check package.json case Ternary.True: const packageJsonFileName = combinePaths(directory, "package.json"); - this.watchPackageJsonFile(packageJsonFileName as Path); + this.watchPackageJsonFile(packageJsonFileName, this.toPath(packageJsonFileName), project); const info = packageJsonCache.getInDirectory(directory); if (info) result.push(info); } @@ -4625,14 +4658,14 @@ export class ProjectService { } }; - forEachAncestorDirectory(getDirectoryPath(filePath), processDirectory); + forEachAncestorDirectory(getDirectoryPath(fileName), processDirectory); return result; } /** @internal */ getNearestAncestorDirectoryWithPackageJson(fileName: string): string | undefined { return forEachAncestorDirectory(fileName, directory => { - switch (this.packageJsonCache.directoryHasPackageJson(this.toPath(directory))) { + switch (this.packageJsonCache.directoryHasPackageJson(directory)) { case Ternary.True: return directory; case Ternary.False: @@ -4646,42 +4679,51 @@ export class ProjectService { } /** @internal */ - private watchPackageJsonFile(path: Path) { - const watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new Map()); - if (!watchers.has(path)) { - this.invalidateProjectPackageJson(path); - watchers.set( - path, - this.watchFactory.watchFile( - path, - (fileName, eventKind) => { - const path = this.toPath(fileName); - switch (eventKind) { - case FileWatcherEventKind.Created: - return Debug.fail(); - case FileWatcherEventKind.Changed: - this.packageJsonCache.addOrUpdate(path); - this.invalidateProjectPackageJson(path); - break; - case FileWatcherEventKind.Deleted: - this.packageJsonCache.delete(path); - this.invalidateProjectPackageJson(path); - watchers.get(path)!.close(); - watchers.delete(path); - } - }, - PollingInterval.Low, - this.hostConfiguration.watchOptions, - WatchType.PackageJson, - ), + private watchPackageJsonFile(file: string, path: Path, project: Project | WildcardWatcher) { + Debug.assert(project !== undefined); + let result = (this.packageJsonFilesMap ??= new Map()).get(path); + if (!result) { + // this.invalidateProjectPackageJson(path); + let watcher: FileWatcher | undefined = this.watchFactory.watchFile( + file, + (fileName, eventKind) => { + switch (eventKind) { + case FileWatcherEventKind.Created: + return Debug.fail(); + case FileWatcherEventKind.Changed: + this.packageJsonCache.addOrUpdate(fileName, path); + this.onPackageJsonChange(result); + break; + case FileWatcherEventKind.Deleted: + this.packageJsonCache.delete(path); + this.onPackageJsonChange(result); + result.projects.clear(); + result.close(); + } + }, + PollingInterval.Low, + this.hostConfiguration.watchOptions, + WatchType.PackageJson, ); + result = { + projects: new Set(), + close: () => { + if (result.projects.size || !watcher) return; + watcher.close(); + watcher = undefined; + this.packageJsonFilesMap?.delete(path); + this.packageJsonCache.invalidate(path); + }, + }; + this.packageJsonFilesMap.set(path, result); } + result.projects.add(project); + (project.packageJsonWatches ??= new Set()).add(result); } /** @internal */ - private onAddPackageJson(path: Path) { - this.packageJsonCache.addOrUpdate(path); - this.watchPackageJsonFile(path); + private onPackageJsonChange(result: PackageJsonWatcher) { + result.projects.forEach(project => (project as Project).onPackageJsonChange?.()); } /** @internal */ @@ -4696,21 +4738,6 @@ export class ProjectService { } } - /** @internal */ - private invalidateProjectPackageJson(packageJsonPath: Path | undefined) { - this.configuredProjects.forEach(invalidate); - this.inferredProjects.forEach(invalidate); - this.externalProjects.forEach(invalidate); - function invalidate(project: Project) { - if (packageJsonPath) { - project.onPackageJsonChange(packageJsonPath); - } - else { - project.onAutoImportProviderSettingsChanged(); - } - } - } - /** @internal */ getIncompleteCompletionsCache() { return this.incompleteCompletionsCache ||= createIncompleteCompletionsCache(); diff --git a/src/server/moduleSpecifierCache.ts b/src/server/moduleSpecifierCache.ts index 7a4499c4348..fd5d74fcd86 100644 --- a/src/server/moduleSpecifierCache.ts +++ b/src/server/moduleSpecifierCache.ts @@ -1,4 +1,5 @@ import { + closeFileWatcher, Debug, FileWatcher, ModulePath, @@ -13,11 +14,12 @@ import { /** @internal */ export interface ModuleSpecifierResolutionCacheHost { watchNodeModulesForPackageJsonChanges(directoryPath: string): FileWatcher; + toPath(fileName: string): Path; } /** @internal */ export function createModuleSpecifierCache(host: ModuleSpecifierResolutionCacheHost): ModuleSpecifierCache { - let containedNodeModulesWatchers: Map | undefined; + let containedNodeModulesWatchers: Map | undefined; let cache: Map | undefined; let currentKey: string | undefined; const result: ModuleSpecifierCache = { @@ -38,9 +40,10 @@ export function createModuleSpecifierCache(host: ModuleSpecifierResolutionCacheH if (p.isInNodeModules) { // No trailing slash const nodeModulesPath = p.path.substring(0, p.path.indexOf(nodeModulesPathPart) + nodeModulesPathPart.length - 1); - if (!containedNodeModulesWatchers?.has(nodeModulesPath)) { + const key = host.toPath(nodeModulesPath); + if (!containedNodeModulesWatchers?.has(key)) { (containedNodeModulesWatchers ||= new Map()).set( - nodeModulesPath, + key, host.watchNodeModulesForPackageJsonChanges(nodeModulesPath), ); } @@ -69,7 +72,7 @@ export function createModuleSpecifierCache(host: ModuleSpecifierResolutionCacheH } }, clear() { - containedNodeModulesWatchers?.forEach(watcher => watcher.close()); + containedNodeModulesWatchers?.forEach(closeFileWatcher); cache?.clear(); containedNodeModulesWatchers?.clear(); currentKey = undefined; diff --git a/src/server/packageJsonCache.ts b/src/server/packageJsonCache.ts index dc62d64f693..0baab10ac44 100644 --- a/src/server/packageJsonCache.ts +++ b/src/server/packageJsonCache.ts @@ -15,55 +15,59 @@ import { /** @internal */ export interface PackageJsonCache { - addOrUpdate(fileName: Path): void; - forEach(action: (info: ProjectPackageJsonInfo, fileName: Path) => void): void; + addOrUpdate(fileName: string, path: Path): void; + invalidate(path: Path): void; delete(fileName: Path): void; - get(fileName: Path): ProjectPackageJsonInfo | false | undefined; - getInDirectory(directory: Path): ProjectPackageJsonInfo | undefined; - directoryHasPackageJson(directory: Path): Ternary; - searchDirectoryAndAncestors(directory: Path): void; + getInDirectory(directory: string): ProjectPackageJsonInfo | undefined; + directoryHasPackageJson(directory: string): Ternary; + searchDirectoryAndAncestors(directory: string): void; } /** @internal */ export function createPackageJsonCache(host: ProjectService): PackageJsonCache { - const packageJsons = new Map(); - const directoriesWithoutPackageJson = new Map(); + const packageJsons = new Map(); + const directoriesWithoutPackageJson = new Map(); return { addOrUpdate, - forEach: packageJsons.forEach.bind(packageJsons), - get: packageJsons.get.bind(packageJsons), + invalidate, delete: fileName => { packageJsons.delete(fileName); directoriesWithoutPackageJson.set(getDirectoryPath(fileName), true); }, getInDirectory: directory => { - return packageJsons.get(combinePaths(directory, "package.json")) || undefined; + return packageJsons.get(host.toPath(combinePaths(directory, "package.json"))) || undefined; }, - directoryHasPackageJson, + directoryHasPackageJson: directory => directoryHasPackageJson(host.toPath(directory)), searchDirectoryAndAncestors: directory => { forEachAncestorDirectory(directory, ancestor => { - if (directoryHasPackageJson(ancestor) !== Ternary.Maybe) { + const ancestorPath = host.toPath(ancestor); + if (directoryHasPackageJson(ancestorPath) !== Ternary.Maybe) { return true; } - const packageJsonFileName = host.toPath(combinePaths(ancestor, "package.json")); + const packageJsonFileName = combinePaths(ancestor, "package.json"); if (tryFileExists(host, packageJsonFileName)) { - addOrUpdate(packageJsonFileName); + addOrUpdate(packageJsonFileName, combinePaths(ancestorPath, "package.json") as Path); } else { - directoriesWithoutPackageJson.set(ancestor, true); + directoriesWithoutPackageJson.set(ancestorPath, true); } }); }, }; - function addOrUpdate(fileName: Path) { + function addOrUpdate(fileName: string, path: Path) { const packageJsonInfo = Debug.checkDefined(createPackageJsonInfo(fileName, host.host)); - packageJsons.set(fileName, packageJsonInfo); - directoriesWithoutPackageJson.delete(getDirectoryPath(fileName)); + packageJsons.set(path, packageJsonInfo); + directoriesWithoutPackageJson.delete(getDirectoryPath(path)); + } + + function invalidate(path: Path) { + packageJsons.delete(path); + directoriesWithoutPackageJson.delete(getDirectoryPath(path)); } function directoryHasPackageJson(directory: Path) { - return packageJsons.has(combinePaths(directory, "package.json")) ? Ternary.True : + return packageJsons.has(combinePaths(directory, "package.json") as Path) ? Ternary.True : directoriesWithoutPackageJson.has(directory) ? Ternary.False : Ternary.Maybe; } diff --git a/src/server/project.ts b/src/server/project.ts index d0cf5f2c321..fbac2fb111c 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -144,6 +144,7 @@ import { ModuleImportResult, Msg, NormalizedPath, + PackageJsonWatcher, projectContainsInfoDirectly, ProjectOptions, ProjectReferenceProjectLoadKind, @@ -347,7 +348,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo readonly realpath?: (path: string) => string; /** @internal */ - hasInvalidatedResolutions: HasInvalidatedResolutions | undefined; + hasInvalidatedResolutions?: HasInvalidatedResolutions | undefined; /** @internal */ hasInvalidatedLibResolutions: HasInvalidatedLibResolutions | undefined; @@ -398,7 +399,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo originalConfiguredProjects: Set | undefined; /** @internal */ - private packageJsonsForAutoImport: Set | undefined; + packageJsonWatches: Set | undefined; /** @internal */ noDtsResolutionProject?: AuxiliaryProject | undefined; @@ -1080,6 +1081,12 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo this.resolutionCache.clear(); this.resolutionCache = undefined!; this.cachedUnresolvedImportsPerFile = undefined!; + this.packageJsonWatches?.forEach(watcher => { + watcher.projects.delete(this); + watcher.close(); + }); + this.packageJsonWatches = undefined; + this.moduleSpecifierCache.clear(); this.moduleSpecifierCache = undefined!; this.directoryStructureHost = undefined!; this.exportMapCache = undefined; @@ -1308,12 +1315,10 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo } /** @internal */ - onPackageJsonChange(packageJsonPath: Path) { - if (this.packageJsonsForAutoImport?.has(packageJsonPath)) { - this.moduleSpecifierCache.clear(); - if (this.autoImportProviderHost) { - this.autoImportProviderHost.markAsDirty(); - } + onPackageJsonChange() { + this.moduleSpecifierCache.clear(); + if (this.autoImportProviderHost) { + this.autoImportProviderHost.markAsDirty(); } } @@ -1569,7 +1574,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo this.program, this.missingFilesMap || (this.missingFilesMap = new Map()), // Watch the missing files - missingFilePath => this.addMissingFileWatcher(missingFilePath), + (missingFilePath, missingFileName) => this.addMissingFileWatcher(missingFilePath, missingFileName), ); if (this.generatedFilesMap) { @@ -1694,14 +1699,14 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo } } - private addMissingFileWatcher(missingFilePath: Path): FileWatcher { + private addMissingFileWatcher(missingFilePath: Path, missingFileName: string): FileWatcher { if (isConfiguredProject(this)) { // If this file is referenced config file, we are already watching it, no need to watch again const configFileExistenceInfo = this.projectService.configFileExistenceInfoCache.get(missingFilePath as string as NormalizedPath); if (configFileExistenceInfo?.config?.projects.has(this.canonicalConfigFilePath)) return noopFileWatcher; } const fileWatcher = this.projectService.watchFactory.watchFile( - missingFilePath, + getNormalizedAbsolutePath(missingFileName, this.currentDirectory), (fileName, eventKind) => { if (isConfiguredProject(this)) { this.getCachedDirectoryStructureHost().addOrDeleteFile(fileName, missingFilePath, eventKind); @@ -2078,7 +2083,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo /** @internal */ getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly ProjectPackageJsonInfo[] { if (this.projectService.serverMode !== LanguageServiceMode.Semantic) return emptyArray; - return this.projectService.getPackageJsonsVisibleToFile(fileName, rootDir); + return this.projectService.getPackageJsonsVisibleToFile(fileName, this, rootDir); } /** @internal */ @@ -2088,9 +2093,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo /** @internal */ getPackageJsonsForAutoImport(rootDir?: string): readonly ProjectPackageJsonInfo[] { - const packageJsons = this.getPackageJsonsVisibleToFile(combinePaths(this.currentDirectory, inferredTypesContainingFile), rootDir); - this.packageJsonsForAutoImport = new Set(packageJsons.map(p => p.fileName)); - return packageJsons; + return this.getPackageJsonsVisibleToFile(combinePaths(this.currentDirectory, inferredTypesContainingFile), rootDir); } /** @internal */ @@ -2188,7 +2191,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo /** @internal */ watchNodeModulesForPackageJsonChanges(directoryPath: string) { - return this.projectService.watchPackageJsonsInNodeModules(this.toPath(directoryPath), this); + return this.projectService.watchPackageJsonsInNodeModules(directoryPath, this); } /** @internal */ diff --git a/src/server/session.ts b/src/server/session.ts index 3b816498ddb..116ff92c5d9 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -53,6 +53,7 @@ import { formatting, getDeclarationFromName, getDeclarationOfKind, + getDocumentSpansEqualityComparer, getEmitDeclarations, getEntrypointsFromPackageJsonInfo, getLineAndCharacterOfPosition, @@ -498,8 +499,8 @@ interface ProjectNavigateToItems { navigateToItems: readonly NavigateToItem[]; } -function createDocumentSpanSet(): Set { - return createSet(({ textSpan }) => textSpan.start + 100003 * textSpan.length, documentSpansEqual); +function createDocumentSpanSet(useCaseSensitiveFileNames: boolean): Set { + return createSet(({ textSpan }) => textSpan.start + 100003 * textSpan.length, getDocumentSpansEqualityComparer(useCaseSensitiveFileNames)); } function getRenameLocationsWorker( @@ -509,6 +510,7 @@ function getRenameLocationsWorker( findInStrings: boolean, findInComments: boolean, preferences: protocol.UserPreferences, + useCaseSensitiveFileNames: boolean, ): readonly RenameLocation[] { const perProjectResults = getPerProjectReferences( projects, @@ -525,7 +527,7 @@ function getRenameLocationsWorker( } const results: RenameLocation[] = []; - const seen = createDocumentSpanSet(); + const seen = createDocumentSpanSet(useCaseSensitiveFileNames); perProjectResults.forEach((projectResults, project) => { for (const result of projectResults) { @@ -552,6 +554,7 @@ function getReferencesWorker( projects: Projects, defaultProject: Project, initialLocation: DocumentPosition, + useCaseSensitiveFileNames: boolean, logger: Logger, ): readonly ReferencedSymbol[] { const perProjectResults = getPerProjectReferences( @@ -593,7 +596,7 @@ function getReferencesWorker( } else { // Correct isDefinition properties from projects other than defaultProject - const knownSymbolSpans = createDocumentSpanSet(); + const knownSymbolSpans = createDocumentSpanSet(useCaseSensitiveFileNames); for (const referencedSymbol of defaultProjectResults) { for (const ref of referencedSymbol.references) { if (ref.isDefinition) { @@ -632,7 +635,7 @@ function getReferencesWorker( // of each definition and merging references from all the projects where they appear. const results: ReferencedSymbol[] = []; - const seenRefs = createDocumentSpanSet(); // It doesn't make sense to have a reference in two definition lists, so we de-dup globally + const seenRefs = createDocumentSpanSet(useCaseSensitiveFileNames); // It doesn't make sense to have a reference in two definition lists, so we de-dup globally // TODO: We might end up with a more logical allocation of refs to defs if we pre-sorted the defs by descending ref-count. // Otherwise, it just ends up attached to the first corresponding def we happen to process. The others may or may not be @@ -649,7 +652,7 @@ function getReferencesWorker( contextSpan: getMappedContextSpanForProject(referencedSymbol.definition, project), }; - let symbolToAddTo = find(results, o => documentSpansEqual(o.definition, definition)); + let symbolToAddTo = find(results, o => documentSpansEqual(o.definition, definition, useCaseSensitiveFileNames)); if (!symbolToAddTo) { symbolToAddTo = { definition, references: [] }; results.push(symbolToAddTo); @@ -1542,7 +1545,10 @@ export class Session implements EventSender { ); if (needsJsResolution) { - const definitionSet = createSet(d => d.textSpan.start, documentSpansEqual); + const definitionSet = createSet( + d => d.textSpan.start, + getDocumentSpansEqualityComparer(this.host.useCaseSensitiveFileNames), + ); definitions?.forEach(d => definitionSet.add(d)); const noDtsProject = project.getNoDtsResolutionProject(file); const ls = noDtsProject.getLanguageService(); @@ -1993,6 +1999,7 @@ export class Session implements EventSender { !!args.findInStrings, !!args.findInComments, preferences, + this.host.useCaseSensitiveFileNames, ); if (!simplifiedResult) return locations; return { info: renameInfo, locs: this.toSpanGroups(locations) }; @@ -2029,6 +2036,7 @@ export class Session implements EventSender { projects, this.getDefaultProject(args), { fileName: args.file, pos: position }, + this.host.useCaseSensitiveFileNames, this.logger, ); @@ -2054,7 +2062,7 @@ export class Session implements EventSender { const preferences = this.getPreferences(toNormalizedPath(fileName)); const references: ReferenceEntry[] = []; - const seen = createDocumentSpanSet(); + const seen = createDocumentSpanSet(this.host.useCaseSensitiveFileNames); forEachProjectInProjects(projects, /*path*/ undefined, project => { if (project.getCancellationToken().isCancellationRequested()) return; diff --git a/src/services/completions.ts b/src/services/completions.ts index 9c558f194ab..61f543100f5 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -3122,7 +3122,7 @@ function getContextualType(previousToken: Node, position: number, sourceFile: So case SyntaxKind.OpenBraceToken: return isJsxExpression(parent) && !isJsxElement(parent.parent) && !isJsxFragment(parent.parent) ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined; default: - const argInfo = SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile); + const argInfo = SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker); return argInfo ? // At `,`, treat this as the next argument after the comma. checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === SyntaxKind.CommaToken ? 1 : 0)) : diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 4ff456f685b..06aea522ce9 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -163,6 +163,7 @@ import { isParameterPropertyDeclaration, isPrivateIdentifierClassElementDeclaration, isPropertyAccessExpression, + isPropertySignature, isQualifiedName, isReferencedFile, isReferenceFileLocation, @@ -2471,7 +2472,7 @@ export namespace Core { if (isStringLiteralLike(ref) && ref.text === node.text) { if (type) { const refType = getContextualTypeFromParentOrAncestorTypeNode(ref, checker); - if (type !== checker.getStringType() && type === refType) { + if (type !== checker.getStringType() && (type === refType || isStringLiteralPropertyReference(ref, checker))) { return nodeEntry(ref, EntryKind.StringLiteral); } } @@ -2489,6 +2490,12 @@ export namespace Core { }]; } + function isStringLiteralPropertyReference(node: StringLiteralLike, checker: TypeChecker) { + if (isPropertySignature(node.parent)) { + return checker.getPropertyOfType(checker.getTypeAtLocation(node.parent.parent), node.text); + } + } + // For certain symbol kinds, we need to include other symbols in the search set. // This is not needed when searching for re-exports. function populateSearchSymbolSet(symbol: Symbol, location: Node, checker: TypeChecker, isForRename: boolean, providePrefixAndSuffixText: boolean, implementations: boolean): Symbol[] { diff --git a/src/services/getEditsForFileRename.ts b/src/services/getEditsForFileRename.ts index e9b5245f0e1..d9f386ed7ce 100644 --- a/src/services/getEditsForFileRename.ts +++ b/src/services/getEditsForFileRename.ts @@ -35,7 +35,6 @@ import { ModuleResolutionHost, moduleSpecifiers, normalizePath, - Path, pathIsRelative, Program, PropertyAssignment, @@ -214,7 +213,7 @@ function updateImports( // Need an update if the imported file moved, or the importing file moved and was using a relative path. return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && pathIsRelative(importLiteral.text))) - ? moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), sourceFile, getCanonicalFileName(newImportFromPath) as Path, toImport.newFileName, createModuleSpecifierResolutionHost(program, host), importLiteral.text) + ? moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), sourceFile, newImportFromPath, toImport.newFileName, createModuleSpecifierResolutionHost(program, host), importLiteral.text) : undefined; }); } diff --git a/src/services/inlayHints.ts b/src/services/inlayHints.ts index a36e4054911..ef4abe8dce6 100644 --- a/src/services/inlayHints.ts +++ b/src/services/inlayHints.ts @@ -11,6 +11,7 @@ import { EnumMember, equateStringsCaseInsensitive, escapeString, + escapeTemplateSubstitution, Expression, findChildOfKind, findIndex, @@ -53,6 +54,7 @@ import { isIdentifierText, isImportTypeNode, isIndexedAccessTypeNode, + isIndexSignatureDeclaration, isInferTypeNode, isInfinityOrNaNString, isIntersectionTypeNode, @@ -76,7 +78,12 @@ import { isQualifiedName, isRestTypeNode, isSpreadElement, - isStringLiteral, + isTemplateHead, + isTemplateLiteralTypeNode, + isTemplateLiteralTypeSpan, + isTemplateMiddle, + isTemplateTail, + isThisTypeNode, isTupleTypeNode, isTypeLiteralNode, isTypeNode, @@ -88,7 +95,7 @@ import { isUnionTypeNode, isVarConst, isVariableDeclaration, - LiteralExpression, + LiteralLikeNode, MethodDeclaration, NewExpression, Node, @@ -105,6 +112,7 @@ import { Symbol, SymbolFlags, SyntaxKind, + TemplateLiteralLikeNode, textSpanIntersectsWith, tokenToString, TupleTypeReference, @@ -743,6 +751,17 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] { visitForDisplayParts(node.type); } break; + case SyntaxKind.IndexSignature: + Debug.assertNode(node, isIndexSignatureDeclaration); + Debug.assertEqual(node.parameters.length, 1); + parts.push({ text: "[" }); + visitForDisplayParts(node.parameters[0]); + parts.push({ text: "]" }); + if (node.type) { + parts.push({ text: ": " }); + visitForDisplayParts(node.type); + } + break; case SyntaxKind.MethodSignature: Debug.assertNode(node, isMethodSignature); if (node.modifiers?.length) { @@ -792,6 +811,32 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] { parts.push({ text: tokenToString(node.operator) }); visitForDisplayParts(node.operand); break; + case SyntaxKind.TemplateLiteralType: + Debug.assertNode(node, isTemplateLiteralTypeNode); + visitForDisplayParts(node.head); + node.templateSpans.forEach(visitForDisplayParts); + break; + case SyntaxKind.TemplateHead: + Debug.assertNode(node, isTemplateHead); + parts.push({ text: getLiteralText(node) }); + break; + case SyntaxKind.TemplateLiteralTypeSpan: + Debug.assertNode(node, isTemplateLiteralTypeSpan); + visitForDisplayParts(node.type); + visitForDisplayParts(node.literal); + break; + case SyntaxKind.TemplateMiddle: + Debug.assertNode(node, isTemplateMiddle); + parts.push({ text: getLiteralText(node) }); + break; + case SyntaxKind.TemplateTail: + Debug.assertNode(node, isTemplateTail); + parts.push({ text: getLiteralText(node) }); + break; + case SyntaxKind.ThisType: + Debug.assertNode(node, isThisTypeNode); + parts.push({ text: "this" }); + break; default: Debug.failBadSyntaxKind(node); } @@ -823,9 +868,23 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] { }); } - function getLiteralText(node: LiteralExpression) { - if (isStringLiteral(node)) { - return quotePreference === QuotePreference.Single ? `'${escapeString(node.text, CharacterCodes.singleQuote)}'` : `"${escapeString(node.text, CharacterCodes.doubleQuote)}"`; + function getLiteralText(node: LiteralLikeNode) { + switch (node.kind) { + case SyntaxKind.StringLiteral: + return quotePreference === QuotePreference.Single ? `'${escapeString(node.text, CharacterCodes.singleQuote)}'` : `"${escapeString(node.text, CharacterCodes.doubleQuote)}"`; + case SyntaxKind.TemplateHead: + case SyntaxKind.TemplateMiddle: + case SyntaxKind.TemplateTail: { + const rawText = (node as TemplateLiteralLikeNode).rawText ?? escapeTemplateSubstitution(escapeString(node.text, CharacterCodes.backtick)); + switch (node.kind) { + case SyntaxKind.TemplateHead: + return "`" + rawText + "${"; + case SyntaxKind.TemplateMiddle: + return "}" + rawText + "${"; + case SyntaxKind.TemplateTail: + return "}" + rawText + "`"; + } + } } return node.text; } diff --git a/src/services/refactors/moveToFile.ts b/src/services/refactors/moveToFile.ts index 7d99368a385..c1aa1d4bf5b 100644 --- a/src/services/refactors/moveToFile.ts +++ b/src/services/refactors/moveToFile.ts @@ -316,7 +316,7 @@ function getTargetFileImportsAndAddExportInOldFile( const resolved = program.getResolvedModule(oldFile, moduleSpecifier.text, getModeForUsageLocation(oldFile, moduleSpecifier)); const fileName = resolved?.resolvedModule?.resolvedFileName; if (fileName && targetSourceFile) { - const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), targetSourceFile, targetSourceFile.path, fileName, createModuleSpecifierResolutionHost(program, host)); + const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), targetSourceFile, targetSourceFile.fileName, fileName, createModuleSpecifierResolutionHost(program, host)); append(copiedOldImports, filterImport(i, makeStringLiteral(newModuleSpecifier, quotePreference), name => importsToCopy.has(checker.getSymbolAtLocation(name)!))); } else { @@ -418,7 +418,7 @@ export function updateImportsInOtherFiles( deleteUnusedImports(sourceFile, importNode, changes, shouldMove); // These will be changed to imports from the new file const pathToTargetFileWithExtension = resolvePath(getDirectoryPath(oldFile.path), targetFileName); - const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.path, pathToTargetFileWithExtension, createModuleSpecifierResolutionHost(program, host)); + const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.fileName, pathToTargetFileWithExtension, createModuleSpecifierResolutionHost(program, host)); const newImportDeclaration = filterImport(importNode, makeStringLiteral(newModuleSpecifier, quotePreference), shouldMove); if (newImportDeclaration) changes.insertNodeAfter(sourceFile, statement, newImportDeclaration); @@ -570,7 +570,7 @@ export function makeImportOrRequire( quotePreference: QuotePreference, ): AnyImportOrRequireStatement | undefined { const pathToTargetFile = resolvePath(getDirectoryPath(sourceFile.path), targetFileNameWithExtension); - const pathToTargetFileWithCorrectExtension = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.path, pathToTargetFile, createModuleSpecifierResolutionHost(program, host)); + const pathToTargetFileWithCorrectExtension = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.fileName, pathToTargetFile, createModuleSpecifierResolutionHost(program, host)); if (useEs6Imports) { const specifiers = imports.map(i => factory.createImportSpecifier(/*isTypeOnly*/ false, /*propertyName*/ undefined, factory.createIdentifier(i))); diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index bde65d54583..2caf2aaa853 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -12,6 +12,7 @@ import { createTextSpanFromBounds, createTextSpanFromNode, Debug, + ElementFlags, EmitHint, emptyArray, Expression, @@ -49,6 +50,7 @@ import { isPropertyAccessExpression, isSourceFile, isSourceFileJS, + isSpreadElement, isTaggedTemplateExpression, isTemplateHead, isTemplateLiteralToken, @@ -58,6 +60,7 @@ import { JsxTagNameExpression, last, lastOrUndefined, + length, ListFormat, map, mapToDisplayParts, @@ -77,6 +80,7 @@ import { skipTrivia, SourceFile, spacePart, + SpreadElement, Symbol, SymbolDisplayPart, symbolToDisplayParts, @@ -85,6 +89,7 @@ import { TemplateExpression, TextSpan, tryCast, + TupleTypeReference, Type, TypeChecker, TypeParameter, @@ -272,25 +277,25 @@ export interface ArgumentInfoForCompletions { readonly argumentCount: number; } /** @internal */ -export function getArgumentInfoForCompletions(node: Node, position: number, sourceFile: SourceFile): ArgumentInfoForCompletions | undefined { - const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile); +export function getArgumentInfoForCompletions(node: Node, position: number, sourceFile: SourceFile, checker: TypeChecker): ArgumentInfoForCompletions | undefined { + const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker); return !info || info.isTypeParameterList || info.invocation.kind !== InvocationKind.Call ? undefined : { invocation: info.invocation.node, argumentCount: info.argumentCount, argumentIndex: info.argumentIndex }; } -function getArgumentOrParameterListInfo(node: Node, position: number, sourceFile: SourceFile): { readonly list: Node; readonly argumentIndex: number; readonly argumentCount: number; readonly argumentsSpan: TextSpan; } | undefined { - const info = getArgumentOrParameterListAndIndex(node, sourceFile); +function getArgumentOrParameterListInfo(node: Node, position: number, sourceFile: SourceFile, checker: TypeChecker): { readonly list: Node; readonly argumentIndex: number; readonly argumentCount: number; readonly argumentsSpan: TextSpan; } | undefined { + const info = getArgumentOrParameterListAndIndex(node, sourceFile, checker); if (!info) return undefined; const { list, argumentIndex } = info; - const argumentCount = getArgumentCount(list, /*ignoreTrailingComma*/ isInString(sourceFile, position, node)); + const argumentCount = getArgumentCount(list, /*ignoreTrailingComma*/ isInString(sourceFile, position, node), checker); if (argumentIndex !== 0) { Debug.assertLessThan(argumentIndex, argumentCount); } const argumentsSpan = getApplicableSpanForArguments(list, sourceFile); return { list, argumentIndex, argumentCount, argumentsSpan }; } -function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile): { readonly list: Node; readonly argumentIndex: number; } | undefined { +function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile, checker: TypeChecker): { readonly list: Node; readonly argumentIndex: number; } | undefined { if (node.kind === SyntaxKind.LessThanToken || node.kind === SyntaxKind.OpenParenToken) { // Find the list that starts right *after* the < or ( token. // If the user has just opened a list, consider this item 0. @@ -304,7 +309,7 @@ function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile): // - On the target of the call (parent.func) // - On the 'new' keyword in a 'new' expression const list = findContainingList(node); - return list && { list, argumentIndex: getArgumentIndex(list, node) }; + return list && { list, argumentIndex: getArgumentIndex(list, node, checker) }; } } @@ -312,7 +317,7 @@ function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile): * Returns relevant information for the argument list and the current argument if we are * in the argument of an invocation; returns undefined otherwise. */ -function getImmediatelyContainingArgumentInfo(node: Node, position: number, sourceFile: SourceFile): ArgumentListInfo | undefined { +function getImmediatelyContainingArgumentInfo(node: Node, position: number, sourceFile: SourceFile, checker: TypeChecker): ArgumentListInfo | undefined { const { parent } = node; if (isCallOrNewExpression(parent)) { const invocation = parent; @@ -331,7 +336,7 @@ function getImmediatelyContainingArgumentInfo(node: Node, position: number, sour // Case 3: // foo(a#, #b#) -> The token is buried inside a list, and should give signature help // Find out if 'node' is an argument, a type argument, or neither - const info = getArgumentOrParameterListInfo(node, position, sourceFile); + const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker); if (!info) return undefined; const { list, argumentIndex, argumentCount, argumentsSpan } = info; const isTypeParameterList = !!parent.typeArguments && parent.typeArguments.pos === list.pos; @@ -397,7 +402,7 @@ function getImmediatelyContainingArgumentInfo(node: Node, position: number, sour } function getImmediatelyContainingArgumentOrContextualParameterInfo(node: Node, position: number, sourceFile: SourceFile, checker: TypeChecker): ArgumentListInfo | undefined { - return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile); + return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker); } function getHighestBinary(b: BinaryExpression): BinaryExpression { @@ -452,7 +457,7 @@ function getContextualSignatureLocationInfo(node: Node, sourceFile: SourceFile, case SyntaxKind.MethodDeclaration: case SyntaxKind.FunctionExpression: case SyntaxKind.ArrowFunction: - const info = getArgumentOrParameterListInfo(node, position, sourceFile); + const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker); if (!info) return undefined; const { argumentIndex, argumentCount, argumentsSpan } = info; const contextualType = isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent as ParenthesizedExpression | FunctionExpression | ArrowFunction); @@ -476,7 +481,7 @@ function chooseBetterSymbol(s: Symbol): Symbol { : s; } -function getArgumentIndex(argumentsList: Node, node: Node) { +function getArgumentIndex(argumentsList: Node, node: Node, checker: TypeChecker) { // The list we got back can include commas. In the presence of errors it may // also just have nodes without commas. For example "Foo(a b c)" will have 3 // args without commas. We want to find what index we're at. So we count @@ -488,20 +493,39 @@ function getArgumentIndex(argumentsList: Node, node: Node) { // on. In that case, even if we're after the trailing comma, we'll still see // that trailing comma in the list, and we'll have generated the appropriate // arg index. + const args = argumentsList.getChildren(); let argumentIndex = 0; - for (const child of argumentsList.getChildren()) { + for (let pos = 0; pos < length(args); pos++) { + const child = args[pos]; if (child === node) { break; } - if (child.kind !== SyntaxKind.CommaToken) { - argumentIndex++; + if (isSpreadElement(child)) { + argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0); + } + else { + if (child.kind !== SyntaxKind.CommaToken) { + argumentIndex++; + } } } - return argumentIndex; } -function getArgumentCount(argumentsList: Node, ignoreTrailingComma: boolean) { +function getSpreadElementCount(node: SpreadElement, checker: TypeChecker) { + const spreadType = checker.getTypeAtLocation(node.expression); + if (checker.isTupleType(spreadType)) { + const { elementFlags, fixedLength } = (spreadType as TupleTypeReference).target; + if (fixedLength === 0) { + return 0; + } + const firstOptionalIndex = findIndex(elementFlags, f => !(f & ElementFlags.Required)); + return firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex; + } + return 0; +} + +function getArgumentCount(argumentsList: Node, ignoreTrailingComma: boolean, checker: TypeChecker) { // The argument count for a list is normally the number of non-comma children it has. // For example, if you have "Foo(a,b)" then there will be three children of the arg // list 'a' '' 'b'. So, in this case the arg count will be 2. However, there @@ -515,7 +539,14 @@ function getArgumentCount(argumentsList: Node, ignoreTrailingComma: boolean) { // arg count of 3. const listChildren = argumentsList.getChildren(); - let argumentCount = countWhere(listChildren, arg => arg.kind !== SyntaxKind.CommaToken); + let argumentCount = 0; + for (const child of listChildren) { + if (isSpreadElement(child)) { + argumentCount = argumentCount + getSpreadElementCount(child, checker); + } + } + + argumentCount = argumentCount + countWhere(listChildren, arg => arg.kind !== SyntaxKind.CommaToken); if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === SyntaxKind.CommaToken) { argumentCount++; } diff --git a/src/services/sourcemaps.ts b/src/services/sourcemaps.ts index 72947635e6a..6ab47b61742 100644 --- a/src/services/sourcemaps.ts +++ b/src/services/sourcemaps.ts @@ -133,13 +133,13 @@ export function getSourceMapper(host: SourceMapperHost): SourceMapper { const fileFromCache = sourceFileLike.get(path); if (fileFromCache !== undefined) return fileFromCache ? fileFromCache : undefined; - if (!host.readFile || host.fileExists && !host.fileExists(path)) { + if (!host.readFile || host.fileExists && !host.fileExists(fileName)) { sourceFileLike.set(path, false); return undefined; } // And failing that, check the disk - const text = host.readFile(path); + const text = host.readFile(fileName); const file = text ? createSourceFileLike(text) : false; sourceFileLike.set(path, file); return file ? file : undefined; diff --git a/src/services/stringCompletions.ts b/src/services/stringCompletions.ts index b5c28a312d9..474c72be3dd 100644 --- a/src/services/stringCompletions.ts +++ b/src/services/stringCompletions.ts @@ -407,7 +407,7 @@ function getStringLiteralCompletionEntries(sourceFile: SourceFile, node: StringL case SyntaxKind.NewExpression: case SyntaxKind.JsxAttribute: if (!isRequireCallArgument(node) && !isImportCall(parent)) { - const argumentInfo = SignatureHelp.getArgumentInfoForCompletions(parent.kind === SyntaxKind.JsxAttribute ? parent.parent : node, position, sourceFile); + const argumentInfo = SignatureHelp.getArgumentInfoForCompletions(parent.kind === SyntaxKind.JsxAttribute ? parent.parent : node, position, sourceFile, typeChecker); // Get string literal completions from specialized signatures of the target // i.e. declare function f(a: 'A'); // f("/*completion position*/") diff --git a/src/services/transpile.ts b/src/services/transpile.ts index 9637387afa0..a15b48d8d74 100644 --- a/src/services/transpile.ts +++ b/src/services/transpile.ts @@ -36,6 +36,7 @@ export interface TranspileOptions { moduleName?: string; renamedDependencies?: MapLike; transformers?: CustomTransformers; + jsDocParsingMode?: JSDocParsingMode; } export interface TranspileOutput { @@ -121,7 +122,7 @@ export function transpileModule(input: string, transpileOptions: TranspileOption languageVersion: getEmitScriptTarget(options), impliedNodeFormat: getImpliedNodeFormatForFile(toPath(inputFileName, "", compilerHost.getCanonicalFileName), /*packageJsonInfoCache*/ undefined, compilerHost, options), setExternalModuleIndicator: getSetExternalModuleIndicator(options), - jsDocParsingMode: JSDocParsingMode.ParseNone, + jsDocParsingMode: transpileOptions.jsDocParsingMode ?? JSDocParsingMode.ParseAll, }, ); if (transpileOptions.moduleName) { diff --git a/src/services/types.ts b/src/services/types.ts index ef0315b557c..cfa61dc9195 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -340,7 +340,7 @@ export interface LanguageServiceHost extends GetEffectiveTypeRootsHost, MinimalR */ readDirectory?(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[]; realpath?(path: string): string; - /** @internal */ createHash?(data: string): string; + /** @internal */ createHash?: ((data: string) => string) | undefined; /* * Unlike `realpath and `readDirectory`, `readFile` and `fileExists` are now _required_ @@ -393,9 +393,9 @@ export interface LanguageServiceHost extends GetEffectiveTypeRootsHost, MinimalR * If provided along with custom resolveLibrary, used to determine if we should redo library resolutions * @internal */ - hasInvalidatedLibResolutions?(libFileName: string): boolean; + hasInvalidatedLibResolutions?: ((libFileName: string) => boolean) | undefined; - /** @internal */ hasInvalidatedResolutions?: HasInvalidatedResolutions; + /** @internal */ hasInvalidatedResolutions?: HasInvalidatedResolutions | undefined; /** @internal */ hasChangedAutomaticTypeDirectiveNames?: HasChangedAutomaticTypeDirectiveNames; /** @internal */ getGlobalTypingsCacheLocation?(): string | undefined; /** @internal */ getSymlinkCache?(files?: readonly SourceFile[]): SymlinkCache; @@ -432,7 +432,7 @@ export interface LanguageServiceHost extends GetEffectiveTypeRootsHost, MinimalR /** @internal */ onReleaseParsedCommandLine?(configFileName: string, oldResolvedRef: ResolvedProjectReference | undefined, optionOptions: CompilerOptions): void; /** @internal */ getIncompleteCompletionsCache?(): IncompleteCompletionsCache; - jsDocParsingMode?: JSDocParsingMode; + jsDocParsingMode?: JSDocParsingMode | undefined; } /** @internal */ diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 363868e80c5..5cbde51f828 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -59,7 +59,10 @@ import { EndOfFileToken, endsWith, ensureScriptKind, + EqualityComparer, EqualityOperator, + equateStringsCaseInsensitive, + equateStringsCaseSensitive, escapeString, ExportAssignment, ExportDeclaration, @@ -2663,8 +2666,14 @@ export function textSpansEqual(a: TextSpan | undefined, b: TextSpan | undefined) return !!a && !!b && a.start === b.start && a.length === b.length; } /** @internal */ -export function documentSpansEqual(a: DocumentSpan, b: DocumentSpan): boolean { - return a.fileName === b.fileName && textSpansEqual(a.textSpan, b.textSpan); +export function documentSpansEqual(a: DocumentSpan, b: DocumentSpan, useCaseSensitiveFileNames: boolean): boolean { + return (useCaseSensitiveFileNames ? equateStringsCaseSensitive : equateStringsCaseInsensitive)(a.fileName, b.fileName) && + textSpansEqual(a.textSpan, b.textSpan); +} + +/** @internal */ +export function getDocumentSpansEqualityComparer(useCaseSensitiveFileNames: boolean): EqualityComparer { + return (a, b) => documentSpansEqual(a, b, useCaseSensitiveFileNames); } /** diff --git a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts index 842a4ef3bfa..4c46bc24558 100644 --- a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts +++ b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts @@ -1,5 +1,7 @@ import { createWatchUtils, + Watches, + WatchUtils, } from "../../../harness/watchUtils"; import { arrayFrom, @@ -33,7 +35,6 @@ import { matchFiles, ModuleImportResult, ModuleResolutionHost, - MultiMap, noop, patchWriteFileEnsuringDirectory, Path, @@ -155,17 +156,6 @@ function isFsSymLink(s: FSEntry | undefined): s is FsSymLink { return !!s && isString((s as FsSymLink).symLink); } -function invokeWatcherCallbacks(callbacks: readonly T[] | undefined, invokeCallback: (cb: T) => void): void { - if (callbacks) { - // The array copy is made to ensure that even if one of the callback removes the callbacks, - // we dont miss any callbacks following it - const cbs = callbacks.slice(); - for (const cb of cbs) { - invokeCallback(cb); - } - } -} - export interface StateLogger { log(s: string): void; logs: string[]; @@ -351,7 +341,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, readonly pendingInstalls = new Callbacks(this, "PendingInstalls"); readonly screenClears: number[] = []; - readonly watchUtils = createWatchUtils("PolledWatches", "FsWatches"); + readonly watchUtils: WatchUtils; runWithFallbackPolling: boolean; public readonly useCaseSensitiveFileNames: boolean; public readonly newLine: string; @@ -387,6 +377,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, this.environmentVariables = environmentVariables; currentDirectory = currentDirectory || "/"; this.getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); + this.watchUtils = createWatchUtils("PolledWatches", "FsWatches", s => this.getCanonicalFileName(s)); this.toPath = s => toPath(s, currentDirectory, this.getCanonicalFileName); this.executingFilePath = this.getHostSpecificPath(executingFilePath || getExecutingFilePathFromLibFile()); this.currentDirectory = this.getHostSpecificPath(currentDirectory); @@ -691,7 +682,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, private watchFileWorker(fileName: string, cb: FileWatcherCallback, pollingInterval: PollingInterval) { return this.watchUtils.pollingWatch( - this.toFullPath(fileName), + this.toNormalizedAbsolutePath(fileName), { cb, pollingInterval }, ); } @@ -702,11 +693,11 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, cb: FsWatchCallback, ) { if (this.runWithFallbackPolling) throw new Error("Need to use fallback polling instead of file system native watching"); - const path = this.toFullPath(fileOrDirectory); + const path = this.toPath(fileOrDirectory); // Error if the path does not exist if (this.inodeWatching && !this.inodes?.has(path)) throw new Error(); const result = this.watchUtils.fsWatch( - path, + this.toNormalizedAbsolutePath(fileOrDirectory), recursive, { cb, @@ -718,13 +709,13 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, } invokeFileWatcher(fileFullPath: string, eventKind: FileWatcherEventKind, modifiedTime: Date | undefined) { - invokeWatcherCallbacks(this.watchUtils.pollingWatches.get(this.toPath(fileFullPath)), ({ cb }) => cb(fileFullPath, eventKind, modifiedTime)); + this.watchUtils.pollingWatches.forEach(fileFullPath, ({ cb }) => cb(fileFullPath, eventKind, modifiedTime)); } - private fsWatchCallback(map: MultiMap, fullPath: string, eventName: "rename" | "change", modifiedTime: Date | undefined, entryFullPath: string | undefined, useTildeSuffix: boolean | undefined) { + private fsWatchCallback(watches: Watches, fullPath: string, eventName: "rename" | "change", modifiedTime: Date | undefined, entryFullPath: string | undefined, useTildeSuffix: boolean | undefined) { const path = this.toPath(fullPath); const currentInode = this.inodes?.get(path); - invokeWatcherCallbacks(map.get(path), ({ cb, inode }) => { + watches.forEach(path, ({ cb, inode }) => { // TODO:: if (this.inodeWatching && inode !== undefined && inode !== currentInode) return; let relativeFileName = entryFullPath ? this.getRelativePathToDirectory(fullPath, entryFullPath) : ""; diff --git a/src/testRunner/unittests/programApi.ts b/src/testRunner/unittests/programApi.ts index b1aba4bb9c2..325dcba5665 100644 --- a/src/testRunner/unittests/programApi.ts +++ b/src/testRunner/unittests/programApi.ts @@ -7,8 +7,9 @@ import { jsonToReadableText, } from "./helpers"; -function verifyMissingFilePaths(missingPaths: readonly ts.Path[], expected: readonly string[]) { - assert.isDefined(missingPaths); +function verifyMissingFilePaths(missing: ReturnType, expected: readonly string[]) { + assert.isDefined(missing); + const missingPaths = ts.arrayFrom(missing.keys()); const map = new Set(expected); for (const missing of missingPaths) { const value = map.has(missing); @@ -82,8 +83,8 @@ describe("unittests:: programApi:: Program.getMissingFilePaths", () => { it("normalizes file paths", () => { const program0 = ts.createProgram(["./nonexistent.ts", "./NONEXISTENT.ts"], options, testCompilerHost); const program1 = ts.createProgram(["./NONEXISTENT.ts", "./nonexistent.ts"], options, testCompilerHost); - const missing0 = program0.getMissingFilePaths(); - const missing1 = program1.getMissingFilePaths(); + const missing0 = ts.arrayFrom(program0.getMissingFilePaths().keys()); + const missing1 = ts.arrayFrom(program1.getMissingFilePaths().keys()); assert.equal(missing0.length, 1); assert.deepEqual(missing0, missing1); }); @@ -138,7 +139,7 @@ describe("unittests:: programApi:: Program.getMissingFilePaths", () => { const program = ts.createProgram(["test.ts"], { module: ts.ModuleKind.ES2015 }, host); assert(program.getSourceFiles().length === 1, "expected 'getSourceFiles' length to be 1"); - assert(program.getMissingFilePaths().length === 0, "expected 'getMissingFilePaths' length to be 0"); + assert(program.getMissingFilePaths().size === 0, "expected 'getMissingFilePaths' length to be 0"); assert((program.getFileProcessingDiagnostics()?.length || 0) === 0, "expected 'getFileProcessingDiagnostics' length to be 0"); }); }); diff --git a/src/testRunner/unittests/reuseProgramStructure.ts b/src/testRunner/unittests/reuseProgramStructure.ts index 1e3b034ee42..d006cfb40b3 100644 --- a/src/testRunner/unittests/reuseProgramStructure.ts +++ b/src/testRunner/unittests/reuseProgramStructure.ts @@ -53,7 +53,7 @@ describe("unittests:: Reuse program structure:: General", () => { host.getTrace().forEach(trace => baselines.push(Utils.sanitizeTraceResolutionLogEntry(trace))); host.clearTrace(); baselines.push(""); - baselines.push(`MissingPaths:: ${jsonToReadableText(program.getMissingFilePaths())}`); + baselines.push(`MissingPaths:: ${jsonToReadableText(ts.arrayFrom(program.getMissingFilePaths().values()))}`); baselines.push(""); baselines.push(ts.formatDiagnostics(program.getSemanticDiagnostics(), { getCurrentDirectory: () => program.getCurrentDirectory(), diff --git a/src/testRunner/unittests/tsserver/events/watchEvents.ts b/src/testRunner/unittests/tsserver/events/watchEvents.ts index c60fb4621fb..0a6028dcda3 100644 --- a/src/testRunner/unittests/tsserver/events/watchEvents.ts +++ b/src/testRunner/unittests/tsserver/events/watchEvents.ts @@ -38,7 +38,11 @@ describe("unittests:: tsserver:: events:: watchEvents", () => { const originalSerializeWatches = host.serializeWatches; host.serializeWatches = serializeWatches; host.factoryData = { - watchUtils: createWatchUtils(`Custom WatchedFiles`, `Custom WatchedDirectories`), + watchUtils: createWatchUtils( + "Custom WatchedFiles", + "Custom WatchedDirectories", + host.getCanonicalFileName, + ), watchFile, watchDirectory, closeWatcher, @@ -95,11 +99,13 @@ describe("unittests:: tsserver:: events:: watchEvents", () => { function addFile(session: TestSession, path: string) { updateFileOnHost(session, path, "Add file"); session.logger.log("Custom watch"); - (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.fsWatchesRecursive.get("/user/username/projects/myproject")?.forEach(data => - session.executeCommandSeq({ - command: ts.server.protocol.CommandTypes.WatchChange, - arguments: { id: data.id, path, eventType: "create" }, - }) + (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.fsWatchesRecursive.forEach( + "/user/username/projects/myproject", + data => + session.executeCommandSeq({ + command: ts.server.protocol.CommandTypes.WatchChange, + arguments: { id: data.id, path, eventType: "create" }, + }), ); session.host.runQueuedTimeoutCallbacks(); } @@ -107,11 +113,13 @@ describe("unittests:: tsserver:: events:: watchEvents", () => { function changeFile(session: TestSession, path: string) { updateFileOnHost(session, path, "Change File"); session.logger.log("Custom watch"); - (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.pollingWatches.get(path)?.forEach(data => - session.executeCommandSeq({ - command: ts.server.protocol.CommandTypes.WatchChange, - arguments: { id: data.id, path, eventType: "update" }, - }) + (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.pollingWatches.forEach( + path, + data => + session.executeCommandSeq({ + command: ts.server.protocol.CommandTypes.WatchChange, + arguments: { id: data.id, path, eventType: "update" }, + }), ); session.host.runQueuedTimeoutCallbacks(); } diff --git a/src/testRunner/unittests/tsserver/packageJsonInfo.ts b/src/testRunner/unittests/tsserver/packageJsonInfo.ts index f47b923d882..953e24e9079 100644 --- a/src/testRunner/unittests/tsserver/packageJsonInfo.ts +++ b/src/testRunner/unittests/tsserver/packageJsonInfo.ts @@ -1,4 +1,3 @@ -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; @@ -39,12 +38,12 @@ describe("unittests:: tsserver:: packageJsonInfo::", () => { it("detects new package.json files that are added, caches them, and watches them", () => { // Initialize project without package.json const { session, projectService, host } = setup([tsConfig]); - assert.isUndefined(projectService.packageJsonCache.getInDirectory("/" as ts.Path)); + assert.isUndefined(projectService.packageJsonCache.getInDirectory("/")); // Add package.json host.writeFile(packageJson.path, packageJson.content); session.host.baselineHost("Add package.json"); - let packageJsonInfo = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + let packageJsonInfo = projectService.packageJsonCache.getInDirectory("/")!; assert.ok(packageJsonInfo); assert.ok(packageJsonInfo.dependencies); assert.ok(packageJsonInfo.devDependencies); @@ -60,7 +59,7 @@ describe("unittests:: tsserver:: packageJsonInfo::", () => { }), ); session.host.baselineHost("Edit package.json"); - packageJsonInfo = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + packageJsonInfo = projectService.packageJsonCache.getInDirectory("/")!; assert.isUndefined(packageJsonInfo.dependencies); baselineTsserverLogs("packageJsonInfo", "detects new package.json files that are added, caches them, and watches them", session); @@ -68,39 +67,39 @@ describe("unittests:: tsserver:: packageJsonInfo::", () => { it("finds package.json on demand, watches for deletion, and removes them from cache", () => { // Initialize project with package.json - const { session, projectService, host } = setup(); - projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts" as ts.Path); - assert.ok(projectService.packageJsonCache.getInDirectory("/" as ts.Path)); + const { session, projectService, host, project } = setup(); + projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts", project); + assert.ok(projectService.packageJsonCache.getInDirectory("/")); // Delete package.json host.deleteFile(packageJson.path); session.host.baselineHost("delete packageJson"); - assert.isUndefined(projectService.packageJsonCache.getInDirectory("/" as ts.Path)); + assert.isUndefined(projectService.packageJsonCache.getInDirectory("/")); baselineTsserverLogs("packageJsonInfo", "finds package.json on demand, watches for deletion, and removes them from cache", session); }); it("finds multiple package.json files when present", () => { // Initialize project with package.json at root - const { session, projectService, host } = setup(); + const { session, projectService, host, project } = setup(); // Add package.json in /src host.writeFile("/src/package.json", packageJson.content); session.host.baselineHost("packageJson"); - assert.lengthOf(projectService.getPackageJsonsVisibleToFile("/a.ts" as ts.Path), 1); - assert.lengthOf(projectService.getPackageJsonsVisibleToFile("/src/b.ts" as ts.Path), 2); + assert.lengthOf(projectService.getPackageJsonsVisibleToFile("/a.ts", project), 1); + assert.lengthOf(projectService.getPackageJsonsVisibleToFile("/src/b.ts", project), 2); baselineTsserverLogs("packageJsonInfo", "finds multiple package.json files when present", session); }); it("handles errors in json parsing of package.json", () => { const packageJsonContent = `{ "mod" }`; - const { session, projectService, host } = setup([tsConfig, { path: packageJson.path, content: packageJsonContent }]); - projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts" as ts.Path); - const packageJsonInfo = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + const { session, projectService, host, project } = setup([tsConfig, { path: packageJson.path, content: packageJsonContent }]); + projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts", project); + const packageJsonInfo = projectService.packageJsonCache.getInDirectory("/")!; assert.isFalse(packageJsonInfo.parseable); host.writeFile(packageJson.path, packageJson.content); session.host.baselineHost("packageJson"); - projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts" as ts.Path); - const packageJsonInfo2 = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts", project); + const packageJsonInfo2 = projectService.packageJsonCache.getInDirectory("/")!; assert.ok(packageJsonInfo2); assert.ok(packageJsonInfo2.dependencies); assert.ok(packageJsonInfo2.devDependencies); @@ -111,15 +110,15 @@ describe("unittests:: tsserver:: packageJsonInfo::", () => { it("handles empty package.json", () => { const packageJsonContent = ""; - const { session, projectService, host } = setup([tsConfig, { path: packageJson.path, content: packageJsonContent }]); - projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts" as ts.Path); - const packageJsonInfo = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + const { session, projectService, host, project } = setup([tsConfig, { path: packageJson.path, content: packageJsonContent }]); + projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts", project); + const packageJsonInfo = projectService.packageJsonCache.getInDirectory("/")!; assert.isFalse(packageJsonInfo.parseable); host.writeFile(packageJson.path, packageJson.content); session.host.baselineHost("PackageJson"); - projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts" as ts.Path); - const packageJsonInfo2 = projectService.packageJsonCache.getInDirectory("/" as ts.Path)!; + projectService.getPackageJsonsVisibleToFile("/src/whatever/blah.ts", project); + const packageJsonInfo2 = projectService.packageJsonCache.getInDirectory("/")!; assert.ok(packageJsonInfo2); assert.ok(packageJsonInfo2.dependencies); assert.ok(packageJsonInfo2.devDependencies); @@ -133,5 +132,13 @@ function setup(files: readonly File[] = [tsConfig, packageJson]) { const host = createServerHost(files); const session = new TestSession(host); openFilesForSession([files[0]], session); - return { host, session, projectService: session.getProjectService() }; + const projectService = session.getProjectService(); + const getPackageJsonsVisibleToFile = projectService.getPackageJsonsVisibleToFile; + projectService.getPackageJsonsVisibleToFile = (fileName, project, rootDir) => { + session.host.baselineHost(`getPackageJsonsVisibleToFile:: ${fileName} ${rootDir}`); + const result = getPackageJsonsVisibleToFile.call(projectService, fileName, project, rootDir); + session.host.baselineHost(`getPackageJsonsVisibleToFile:: ${fileName} ${rootDir}:: Result:: ${jsonToReadableText(result)}`); + return result; + }; + return { host, session, projectService, project: projectService.inferredProjects[0] }; } diff --git a/src/testRunner/unittests/tsserver/rename.ts b/src/testRunner/unittests/tsserver/rename.ts index b54102ef173..6ab02ae47b7 100644 --- a/src/testRunner/unittests/tsserver/rename.ts +++ b/src/testRunner/unittests/tsserver/rename.ts @@ -1,4 +1,13 @@ import * as ts from "../../_namespaces/ts"; +import { + dedent, +} from "../../_namespaces/Utils"; +import { + jsonToReadableText, +} from "../helpers"; +import { + libContent, +} from "../helpers/contents"; import { baselineTsserverLogs, openFilesForSession, @@ -8,6 +17,7 @@ import { import { createServerHost, File, + libFile, } from "../helpers/virtualFileSystemWithWatch"; describe("unittests:: tsserver:: rename", () => { @@ -131,4 +141,56 @@ describe("unittests:: tsserver:: rename", () => { }); baselineTsserverLogs("rename", "rename behavior is based on file of rename initiation", session); }); + + it("with symlinks and case difference", () => { + const file: File = { + path: "C:/temp/test/project1/index.ts", + content: dedent` + export function myFunc() { + } + `, + }; + const host = createServerHost({ + [file.path]: file.content, + "C:/temp/test/project1/tsconfig.json": jsonToReadableText({ + compilerOptions: { + composite: true, + }, + }), + "C:/temp/test/project1/package.json": jsonToReadableText({ + name: "project1", + version: "1.0.0", + main: "index.js", + }), + "C:/temp/test/project2/index.ts": dedent` + import { myFunc } from 'project1' + myFunc(); + `, + "C:/temp/test/project2/tsconfig.json": jsonToReadableText({ + compilerOptions: { + composite: true, + }, + references: [ + { path: "../project1" }, + ], + }), + "C:/temp/test/tsconfig.json": jsonToReadableText({ + references: [ + { path: "./project1" }, + { path: "./project2" }, + ], + files: [], + include: [], + }), + "C:/temp/test/node_modules/project1": { symLink: "c:/temp/test/project1" }, + [libFile.path]: libContent, + }, { windowsStyleRoot: "C:/" }); + const session = new TestSession(host); + openFilesForSession([file.path.toLowerCase()], session); + session.executeCommandSeq({ + command: ts.server.protocol.CommandTypes.Rename, + arguments: protocolFileLocationFromSubstring(file, "myFunc"), + }); + baselineTsserverLogs("rename", "with symlinks and case difference", session); + }); }); diff --git a/src/testRunner/unittests/tsserver/watchEnvironment.ts b/src/testRunner/unittests/tsserver/watchEnvironment.ts index 4e5f091be01..5511300f1ee 100644 --- a/src/testRunner/unittests/tsserver/watchEnvironment.ts +++ b/src/testRunner/unittests/tsserver/watchEnvironment.ts @@ -119,91 +119,95 @@ describe("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem Watche verifyWatchedDirectories("files not at root", "c:/", /*useProjectAtRoot*/ false); }); -it(`unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem recursive watch directory implementation does not watch files/directories in node_modules starting with "."`, () => { - const projectFolder = "/a/username/project"; - const projectSrcFolder = `${projectFolder}/src`; - const configFile: File = { - path: `${projectFolder}/tsconfig.json`, - content: "{}", - }; - const index: File = { - path: `${projectSrcFolder}/index.ts`, - content: `import {} from "file"`, - }; - const file1: File = { - path: `${projectSrcFolder}/file1.ts`, - content: "", - }; - const nodeModulesExistingUnusedFile: File = { - path: `${projectFolder}/node_modules/someFile.d.ts`, - content: "", - }; - const environmentVariables = new Map(); - environmentVariables.set("TSC_WATCHDIRECTORY", Tsc_WatchDirectory.NonRecursiveWatchDirectory); - const host = createServerHost([index, file1, configFile, libFile, nodeModulesExistingUnusedFile], { environmentVariables }); - const session = new TestSession(host); - openFilesForSession([index], session); +describe("unittests:: tsserver:: watchEnvironment:: recursiveWatchDirectory", () => { + it(`unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem recursive watch directory implementation does not watch files/directories in node_modules starting with "."`, () => { + const projectFolder = "/a/username/project"; + const projectSrcFolder = `${projectFolder}/src`; + const configFile: File = { + path: `${projectFolder}/tsconfig.json`, + content: "{}", + }; + const index: File = { + path: `${projectSrcFolder}/index.ts`, + content: `import {} from "file"`, + }; + const file1: File = { + path: `${projectSrcFolder}/file1.ts`, + content: "", + }; + const nodeModulesExistingUnusedFile: File = { + path: `${projectFolder}/node_modules/someFile.d.ts`, + content: "", + }; + const environmentVariables = new Map(); + environmentVariables.set("TSC_WATCHDIRECTORY", Tsc_WatchDirectory.NonRecursiveWatchDirectory); + const host = createServerHost([index, file1, configFile, libFile, nodeModulesExistingUnusedFile], { environmentVariables }); + const session = new TestSession(host); + openFilesForSession([index], session); - const nodeModulesIgnoredFileFromIgnoreDirectory: File = { - path: `${projectFolder}/node_modules/.cache/someFile.d.ts`, - content: "", - }; + const nodeModulesIgnoredFileFromIgnoreDirectory: File = { + path: `${projectFolder}/node_modules/.cache/someFile.d.ts`, + content: "", + }; - const nodeModulesIgnoredFile: File = { - path: `${projectFolder}/node_modules/.cacheFile.ts`, - content: "", - }; + const nodeModulesIgnoredFile: File = { + path: `${projectFolder}/node_modules/.cacheFile.ts`, + content: "", + }; - const gitIgnoredFileFromIgnoreDirectory: File = { - path: `${projectFolder}/.git/someFile.d.ts`, - content: "", - }; + const gitIgnoredFileFromIgnoreDirectory: File = { + path: `${projectFolder}/.git/someFile.d.ts`, + content: "", + }; - const gitIgnoredFile: File = { - path: `${projectFolder}/.gitCache.d.ts`, - content: "", - }; - const emacsIgnoredFileFromIgnoreDirectory: File = { - path: `${projectFolder}/src/.#field.ts`, - content: "", - }; + const gitIgnoredFile: File = { + path: `${projectFolder}/.gitCache.d.ts`, + content: "", + }; + const emacsIgnoredFileFromIgnoreDirectory: File = { + path: `${projectFolder}/src/.#field.ts`, + content: "", + }; - [ - nodeModulesIgnoredFileFromIgnoreDirectory, - nodeModulesIgnoredFile, - gitIgnoredFileFromIgnoreDirectory, - gitIgnoredFile, - emacsIgnoredFileFromIgnoreDirectory, - ].forEach(ignoredEntity => { - host.ensureFileOrFolder(ignoredEntity); - session.host.baselineHost("After writing ignored file or folder"); + [ + nodeModulesIgnoredFileFromIgnoreDirectory, + nodeModulesIgnoredFile, + gitIgnoredFileFromIgnoreDirectory, + gitIgnoredFile, + emacsIgnoredFileFromIgnoreDirectory, + ].forEach(ignoredEntity => { + host.ensureFileOrFolder(ignoredEntity); + session.host.baselineHost("After writing ignored file or folder"); + }); + + baselineTsserverLogs("watchEnvironment", `recursive directory does not watch files starting with dot in node_modules`, session); }); - - baselineTsserverLogs("watchEnvironment", `recursive directory does not watch files starting with dot in node_modules`, session); }); -it("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watching files with network style paths", () => { - const logger = createLoggerWithInMemoryLogs(/*host*/ undefined!); // Special handling to ensure same logger is used - verifyFilePathStyle("c:/myprojects/project/x.js", logger); - verifyFilePathStyle("//vda1cs4850/myprojects/project/x.js", logger); - verifyFilePathStyle("//vda1cs4850/c$/myprojects/project/x.js", logger); - verifyFilePathStyle("c:/users/username/myprojects/project/x.js", logger); - verifyFilePathStyle("//vda1cs4850/c$/users/username/myprojects/project/x.js", logger); - baselineTsserverLogs("watchEnvironment", `watching files with network style paths`, { logger }); +describe("unittests:: tsserver:: watchEnvironment:: networkStylePaths", () => { + it("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watching files with network style paths", () => { + const logger = createLoggerWithInMemoryLogs(/*host*/ undefined!); // Special handling to ensure same logger is used + verifyFilePathStyle("c:/myprojects/project/x.js", logger); + verifyFilePathStyle("//vda1cs4850/myprojects/project/x.js", logger); + verifyFilePathStyle("//vda1cs4850/c$/myprojects/project/x.js", logger); + verifyFilePathStyle("c:/users/username/myprojects/project/x.js", logger); + verifyFilePathStyle("//vda1cs4850/c$/users/username/myprojects/project/x.js", logger); + baselineTsserverLogs("watchEnvironment", `watching files with network style paths`, { logger }); - function verifyFilePathStyle(path: string, logger: LoggerWithInMemoryLogs) { - const windowsStyleRoot = path.substring(0, ts.getRootLength(path)); - const file: File = { path, content: "const x = 10" }; - const host = createServerHost( - [libFile, file], - { windowsStyleRoot }, - ); - logger.host = host; - logger.info(`For files of style ${path}`); - logger.log(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames}`); - const session = new TestSession({ host, logger }); - openFilesForSession([file], session); - } + function verifyFilePathStyle(path: string, logger: LoggerWithInMemoryLogs) { + const windowsStyleRoot = path.substring(0, ts.getRootLength(path)); + const file: File = { path, content: "const x = 10" }; + const host = createServerHost( + [libFile, file], + { windowsStyleRoot }, + ); + logger.host = host; + logger.info(`For files of style ${path}`); + logger.log(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames}`); + const session = new TestSession({ host, logger }); + openFilesForSession([file], session); + } + }); }); describe("unittests:: tsserver:: watchEnvironment:: handles watch compiler options", () => { @@ -527,3 +531,19 @@ describe("unittests:: tsserver:: watchEnvironment:: watching at workspaces codes baselineTsserverLogs("watchEnvironment", "watching npm install in codespaces where workspaces folder is hosted at root", session); }); }); + +describe("unittests:: tsserver:: watchEnvironment:: perVolumeCasing", () => { + it("new file addition", () => { + const host = createServerHost([libFile]); + // Make /Volumes case sensitive + host.getCanonicalFileName = s => ts.startsWith(s, "/Volumes/") ? s : ts.toFileNameLowerCase(s); + host.ensureFileOrFolder({ path: "/Volumes/git/projects/project/foo.ts", content: `export const foo = "foo";` }); + host.writeFile("/Volumes/git/projects/project/tsconfig.json", "{ }"); + host.writeFile("/Volumes/git/projects/project/package.json", jsonToReadableText({ name: "project", version: "1.0.0" })); + const session = new TestSession(host); + openFilesForSession(["/Volumes/git/projects/project/foo.ts"], session); + host.writeFile("/Volumes/git/projects/project/Bar.ts", `export const bar = "bar";`); + host.runQueuedTimeoutCallbacks(); + baselineTsserverLogs("watchEnvironment", "perVolumeCasing and new file addition", session); + }); +}); diff --git a/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.symbols b/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.symbols index 43802d65932..82aede47ba9 100644 --- a/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.symbols +++ b/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.symbols @@ -2,19 +2,19 @@ === DateTimeFormatAndNumberFormatES2021.ts === Intl.NumberFormat.prototype.formatRange ->Intl.NumberFormat.prototype : Symbol(prototype, Decl(lib.es5.d.ts, --, --)) +>Intl.NumberFormat.prototype : Symbol(Intl.NumberFormatConstructor.prototype, Decl(lib.es5.d.ts, --, --)) >Intl.NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) >Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) >NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) ->prototype : Symbol(prototype, Decl(lib.es5.d.ts, --, --)) +>prototype : Symbol(Intl.NumberFormatConstructor.prototype, Decl(lib.es5.d.ts, --, --)) Intl.DateTimeFormat.prototype.formatRange >Intl.DateTimeFormat.prototype.formatRange : Symbol(Intl.DateTimeFormat.formatRange, Decl(lib.es2021.intl.d.ts, --, --)) ->Intl.DateTimeFormat.prototype : Symbol(prototype, Decl(lib.es5.d.ts, --, --)) +>Intl.DateTimeFormat.prototype : Symbol(Intl.DateTimeFormatConstructor.prototype, Decl(lib.es5.d.ts, --, --)) >Intl.DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) >Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) >DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) ->prototype : Symbol(prototype, Decl(lib.es5.d.ts, --, --)) +>prototype : Symbol(Intl.DateTimeFormatConstructor.prototype, Decl(lib.es5.d.ts, --, --)) >formatRange : Symbol(Intl.DateTimeFormat.formatRange, Decl(lib.es2021.intl.d.ts, --, --)) new Intl.NumberFormat().formatRange diff --git a/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.types b/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.types index 51ec4fc0d8a..e499924e258 100644 --- a/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.types +++ b/tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.types @@ -4,50 +4,50 @@ Intl.NumberFormat.prototype.formatRange >Intl.NumberFormat.prototype.formatRange : any >Intl.NumberFormat.prototype : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >prototype : Intl.NumberFormat >formatRange : any Intl.DateTimeFormat.prototype.formatRange >Intl.DateTimeFormat.prototype.formatRange : (startDate: number | bigint | Date, endDate: number | bigint | Date) => string >Intl.DateTimeFormat.prototype : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >prototype : Intl.DateTimeFormat >formatRange : (startDate: number | bigint | Date, endDate: number | bigint | Date) => string new Intl.NumberFormat().formatRange >new Intl.NumberFormat().formatRange : any >new Intl.NumberFormat() : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >formatRange : any new Intl.NumberFormat().formatRangeToParts >new Intl.NumberFormat().formatRangeToParts : any >new Intl.NumberFormat() : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >formatRangeToParts : any new Intl.DateTimeFormat().formatRange >new Intl.DateTimeFormat().formatRange : (startDate: number | bigint | Date, endDate: number | bigint | Date) => string >new Intl.DateTimeFormat() : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >formatRange : (startDate: number | bigint | Date, endDate: number | bigint | Date) => string new Intl.DateTimeFormat().formatRangeToParts >new Intl.DateTimeFormat().formatRangeToParts : (startDate: number | bigint | Date, endDate: number | bigint | Date) => Intl.DateTimeRangeFormatPart[] >new Intl.DateTimeFormat() : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >formatRangeToParts : (startDate: number | bigint | Date, endDate: number | bigint | Date) => Intl.DateTimeRangeFormatPart[] diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 166ac8eb1eb..b22bcf6650a 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -6020,9 +6020,11 @@ declare namespace ts { /** @deprecated */ type AssertionKey = ImportAttributeName; /** @deprecated */ - type AssertEntry = ImportAttribute; + interface AssertEntry extends ImportAttribute { + } /** @deprecated */ - type AssertClause = ImportAttributes; + interface AssertClause extends ImportAttributes { + } type ImportAttributeName = Identifier | StringLiteral; interface ImportAttribute extends Node { readonly kind: SyntaxKind.ImportAttribute; @@ -10442,7 +10444,7 @@ declare namespace ts { installPackage?(options: InstallPackageOptions): Promise; writeFile?(fileName: string, content: string): void; getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined; - jsDocParsingMode?: JSDocParsingMode; + jsDocParsingMode?: JSDocParsingMode | undefined; } type WithMetadata = T & { metadata?: unknown; @@ -11638,6 +11640,7 @@ declare namespace ts { moduleName?: string; renamedDependencies?: MapLike; transformers?: CustomTransformers; + jsDocParsingMode?: JSDocParsingMode; } interface TranspileOutput { outputText: string; diff --git a/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt b/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt index 008c8d2e399..ad14784e6e3 100644 --- a/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt +++ b/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt @@ -8,12 +8,12 @@ arityErrorRelatedSpanBindingPattern.ts(7,1): error TS2554: Expected 3 arguments, function bar(a, b, [c]): void {} foo("", 0); - ~~~~~~~~~~ + ~~~ !!! error TS2554: Expected 3 arguments, but got 2. !!! related TS6211 arityErrorRelatedSpanBindingPattern.ts:1:20: An argument matching this binding pattern was not provided. bar("", 0); - ~~~~~~~~~~ + ~~~ !!! error TS2554: Expected 3 arguments, but got 2. !!! related TS6211 arityErrorRelatedSpanBindingPattern.ts:3:20: An argument matching this binding pattern was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/arrayFrom.types b/tests/baselines/reference/arrayFrom.types index dda3f91d269..b3189e4ef57 100644 --- a/tests/baselines/reference/arrayFrom.types +++ b/tests/baselines/reference/arrayFrom.types @@ -31,7 +31,7 @@ const inputALike: ArrayLike = { length: 0 }; const inputARand = getEither(inputA, inputALike); >inputARand : ArrayLike | Iterable >getEither(inputA, inputALike) : ArrayLike | Iterable ->getEither : (in1: Iterable, in2: ArrayLike) => ArrayLike | Iterable +>getEither : (in1: Iterable, in2: ArrayLike) => Iterable | ArrayLike >inputA : A[] >inputALike : ArrayLike @@ -163,12 +163,12 @@ const result11: B[] = Array.from(inputASet, ({ a }): B => ({ b: a })); // the ?: as always taking the false branch, narrowing to ArrayLike, // even when the type is written as : Iterable|ArrayLike function getEither (in1: Iterable, in2: ArrayLike) { ->getEither : (in1: Iterable, in2: ArrayLike) => ArrayLike | Iterable +>getEither : (in1: Iterable, in2: ArrayLike) => Iterable | ArrayLike >in1 : Iterable >in2 : ArrayLike return Math.random() > 0.5 ? in1 : in2; ->Math.random() > 0.5 ? in1 : in2 : ArrayLike | Iterable +>Math.random() > 0.5 ? in1 : in2 : Iterable | ArrayLike >Math.random() > 0.5 : boolean >Math.random() : number >Math.random : () => number diff --git a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.symbols b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.symbols new file mode 100644 index 00000000000..a273d75e485 --- /dev/null +++ b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.symbols @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts] //// + +=== avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts === +declare const foo: ["a", string, number] | ["b", string, boolean]; +>foo : Symbol(foo, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 0, 13)) + +export function test(arg: { index?: number }) { +>test : Symbol(test, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 0, 66)) +>arg : Symbol(arg, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 2, 21)) +>index : Symbol(index, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 2, 27)) + + const { index = 0 } = arg; +>index : Symbol(index, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 3, 9)) +>arg : Symbol(arg, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 2, 21)) + + if (foo[index] === "a") { +>foo : Symbol(foo, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 0, 13)) +>index : Symbol(index, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 3, 9)) + + foo; +>foo : Symbol(foo, Decl(avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts, 0, 13)) + } +} + diff --git a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types new file mode 100644 index 00000000000..24155c1a020 --- /dev/null +++ b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts] //// + +=== avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts === +declare const foo: ["a", string, number] | ["b", string, boolean]; +>foo : ["a", string, number] | ["b", string, boolean] + +export function test(arg: { index?: number }) { +>test : (arg: { index?: number | undefined; }) => void +>arg : { index?: number | undefined; } +>index : number | undefined + + const { index = 0 } = arg; +>index : number +>0 : 0 +>arg : { index?: number | undefined; } + + if (foo[index] === "a") { +>foo[index] === "a" : boolean +>foo[index] : string | number | boolean +>foo : ["a", string, number] | ["b", string, boolean] +>index : number +>"a" : "a" + + foo; +>foo : ["a", string, number] | ["b", string, boolean] + } +} + diff --git a/tests/baselines/reference/baseCheck.errors.txt b/tests/baselines/reference/baseCheck.errors.txt index e3da66d472f..58464d7fb99 100644 --- a/tests/baselines/reference/baseCheck.errors.txt +++ b/tests/baselines/reference/baseCheck.errors.txt @@ -30,7 +30,7 @@ baseCheck.ts(26,9): error TS2304: Cannot find name 'x'. } class D extends C { constructor(public z: number) { super(this.z) } } // too few params - ~~~~~~~~~~~~~ + ~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 baseCheck.ts:1:34: An argument for 'y' was not provided. ~~~~ diff --git a/tests/baselines/reference/bigintWithLib.types b/tests/baselines/reference/bigintWithLib.types index 659ef454134..52f029d8cd5 100644 --- a/tests/baselines/reference/bigintWithLib.types +++ b/tests/baselines/reference/bigintWithLib.types @@ -392,9 +392,9 @@ new Intl.NumberFormat("fr").format(3000n); >new Intl.NumberFormat("fr").format(3000n) : string >new Intl.NumberFormat("fr").format : { (value: number): string; (value: number | bigint): string; } >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >format : { (value: number): string; (value: number | bigint): string; } >3000n : 3000n @@ -403,9 +403,9 @@ new Intl.NumberFormat("fr").format(bigintVal); >new Intl.NumberFormat("fr").format(bigintVal) : string >new Intl.NumberFormat("fr").format : { (value: number): string; (value: number | bigint): string; } >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >format : { (value: number): string; (value: number | bigint): string; } >bigintVal : bigint diff --git a/tests/baselines/reference/bigintWithoutLib.types b/tests/baselines/reference/bigintWithoutLib.types index 8935093c133..6789435ca90 100644 --- a/tests/baselines/reference/bigintWithoutLib.types +++ b/tests/baselines/reference/bigintWithoutLib.types @@ -376,9 +376,9 @@ new Intl.NumberFormat("fr").format(3000n); >new Intl.NumberFormat("fr").format(3000n) : string >new Intl.NumberFormat("fr").format : (value: number) => string >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >format : (value: number) => string >3000n : 3000n @@ -387,9 +387,9 @@ new Intl.NumberFormat("fr").format(bigintVal); >new Intl.NumberFormat("fr").format(bigintVal) : string >new Intl.NumberFormat("fr").format : (value: number) => string >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >format : (value: number) => string >bigintVal : bigint diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt index 520ce2bb735..47b4cf9a063 100644 --- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt +++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt @@ -33,6 +33,6 @@ blockScopedSameNameFunctionDeclarationES5.ts(16,1): error TS2554: Expected 1 arg } foo(10); foo(); // not ok - needs number - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationES5.ts:1:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt index 45ccd8b400b..19f6f09e639 100644 --- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt +++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt @@ -33,6 +33,6 @@ blockScopedSameNameFunctionDeclarationES6.ts(16,1): error TS2554: Expected 1 arg } foo(10); foo(); // not ok - needs number - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationES6.ts:1:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt index b510cc0b9b4..86d4d724cac 100644 --- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt +++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt @@ -29,12 +29,12 @@ blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2554: Expected } foo(10); foo(); // not ok - needs number - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationStrictES5.ts:2:14: An argument for 'a' was not provided. } foo(10); foo(); // not ok - needs number - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationStrictES5.ts:2:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt index 4086b95bd59..0863524100f 100644 --- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt +++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt @@ -23,12 +23,12 @@ blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): error TS2554: Expected } foo(10); foo(); // not ok - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationStrictES6.ts:2:14: An argument for 'a' was not provided. } foo(10); foo(); // not ok - needs number - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 blockScopedSameNameFunctionDeclarationStrictES6.ts:2:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/callOverload.errors.txt b/tests/baselines/reference/callOverload.errors.txt index f19a0b8af45..e10608b023b 100644 --- a/tests/baselines/reference/callOverload.errors.txt +++ b/tests/baselines/reference/callOverload.errors.txt @@ -19,7 +19,7 @@ callOverload.ts(11,10): error TS2556: A spread argument must either have a tuple !!! error TS2554: Expected 2 arguments, but got 4. withRest('a', ...n); // no error withRest(); - ~~~~~~~~~~ + ~~~~~~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 callOverload.ts:3:27: An argument for 'a' was not provided. withRest(...n); diff --git a/tests/baselines/reference/callWithMissingVoid.errors.txt b/tests/baselines/reference/callWithMissingVoid.errors.txt index 7de86855ba2..27c4b8daefb 100644 --- a/tests/baselines/reference/callWithMissingVoid.errors.txt +++ b/tests/baselines/reference/callWithMissingVoid.errors.txt @@ -28,19 +28,19 @@ callWithMissingVoid.ts(75,1): error TS2554: Expected 3 arguments, but got 1. declare const xAny: X; xAny.f() // error, any still expects an argument - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:3:7: An argument for 't' was not provided. declare const xUnknown: X; xUnknown.f() // error, unknown still expects an argument - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:3:7: An argument for 't' was not provided. declare const xNever: X; xNever.f() // error, never still expects an argument - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:3:7: An argument for 't' was not provided. @@ -56,15 +56,15 @@ callWithMissingVoid.ts(75,1): error TS2554: Expected 3 arguments, but got 1. new MyPromise(resolve => resolve()); // no error new MyPromise(resolve => resolve()); // no error new MyPromise(resolve => resolve()); // error, `any` arguments cannot be omitted - ~~~~~~~~~ + ~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:28:38: An argument for 'value' was not provided. new MyPromise(resolve => resolve()); // error, `unknown` arguments cannot be omitted - ~~~~~~~~~ + ~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:28:38: An argument for 'value' was not provided. new MyPromise(resolve => resolve()); // error, `never` arguments cannot be omitted - ~~~~~~~~~ + ~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 callWithMissingVoid.ts:28:38: An argument for 'value' was not provided. @@ -78,7 +78,7 @@ callWithMissingVoid.ts(75,1): error TS2554: Expected 3 arguments, but got 1. a(4, "hello"); // ok a(4, "hello", void 0); // ok a(4); // not ok - ~~~~ + ~ !!! error TS2554: Expected 2-3 arguments, but got 1. !!! related TS6210 callWithMissingVoid.ts:42:23: An argument for 'y' was not provided. @@ -88,15 +88,15 @@ callWithMissingVoid.ts(75,1): error TS2554: Expected 3 arguments, but got 1. b(4, "hello", void 0, 2); // ok b(4, "hello"); // not ok - ~~~~~~~~~~~~~ + ~ !!! error TS2554: Expected 4 arguments, but got 2. !!! related TS6210 callWithMissingVoid.ts:50:34: An argument for 'z' was not provided. b(4, "hello", void 0); // not ok - ~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2554: Expected 4 arguments, but got 3. !!! related TS6210 callWithMissingVoid.ts:50:43: An argument for 'what' was not provided. b(4); // not ok - ~~~~ + ~ !!! error TS2554: Expected 4 arguments, but got 1. !!! related TS6210 callWithMissingVoid.ts:50:23: An argument for 'y' was not provided. @@ -117,7 +117,7 @@ callWithMissingVoid.ts(75,1): error TS2554: Expected 3 arguments, but got 1. ...args: TS): void; call((x: number, y: number) => x + y) // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 1. !!! related TS6236 callWithMissingVoid.ts:73:5: Arguments for the rest parameter 'args' were not provided. call((x: number, y: number) => x + y, 4, 2) // ok diff --git a/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=false).errors.txt b/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=false).errors.txt index 1e07ccaa1a3..eda6d969332 100644 --- a/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=false).errors.txt +++ b/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=false).errors.txt @@ -39,28 +39,28 @@ tsfile.ts(12,4): error TS2554: Expected 1 arguments, but got 0. // no change in behavior f2(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:2:21: An argument for 'p' was not provided. f3(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:3:21: An argument for 'p' was not provided. f4(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:4:21: An argument for 'p' was not provided. o2.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o3.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o4.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=true).errors.txt b/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=true).errors.txt index 560b38ad42c..4323dce5667 100644 --- a/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=true).errors.txt +++ b/tests/baselines/reference/callWithMissingVoidUndefinedUnknownAnyInJs(strict=true).errors.txt @@ -31,28 +31,28 @@ tsfile.ts(12,4): error TS2554: Expected 1 arguments, but got 0. // new behavior: treat 'undefined', 'unknown', and 'any' as optional in non-strict mode f2(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:2:21: An argument for 'p' was not provided. f3(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:3:21: An argument for 'p' was not provided. f4(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:4:21: An argument for 'p' was not provided. o2.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o3.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o4.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. @@ -63,28 +63,28 @@ tsfile.ts(12,4): error TS2554: Expected 1 arguments, but got 0. // no change in behavior f2(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:2:21: An argument for 'p' was not provided. f3(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:3:21: An argument for 'p' was not provided. f4(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:4:21: An argument for 'p' was not provided. o2.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o3.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. o4.m(); - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 defs.d.ts:6:20: An argument for 'p' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/callbackTag4.symbols b/tests/baselines/reference/callbackTag4.symbols new file mode 100644 index 00000000000..17c0d29004c --- /dev/null +++ b/tests/baselines/reference/callbackTag4.symbols @@ -0,0 +1,23 @@ +//// [tests/cases/conformance/jsdoc/callbackTag4.ts] //// + +=== ./a.js === +/** + * @callback C + * @this {{ a: string, b: number }} + * @param {string} a + * @param {number} b + * @returns {boolean} + */ + +/** @type {C} */ +const cb = function (a, b) { +>cb : Symbol(cb, Decl(a.js, 9, 5)) +>a : Symbol(a, Decl(a.js, 9, 21)) +>b : Symbol(b, Decl(a.js, 9, 23)) + + this +>this : Symbol(this) + + return true +} + diff --git a/tests/baselines/reference/callbackTag4.types b/tests/baselines/reference/callbackTag4.types new file mode 100644 index 00000000000..1afbc752a07 --- /dev/null +++ b/tests/baselines/reference/callbackTag4.types @@ -0,0 +1,25 @@ +//// [tests/cases/conformance/jsdoc/callbackTag4.ts] //// + +=== ./a.js === +/** + * @callback C + * @this {{ a: string, b: number }} + * @param {string} a + * @param {number} b + * @returns {boolean} + */ + +/** @type {C} */ +const cb = function (a, b) { +>cb : C +>function (a, b) { this return true} : (this: { a: string; b: number; }, a: string, b: number) => boolean +>a : string +>b : number + + this +>this : { a: string; b: number; } + + return true +>true : true +} + diff --git a/tests/baselines/reference/circularMappedTypeConstraint.symbols b/tests/baselines/reference/circularMappedTypeConstraint.symbols new file mode 100644 index 00000000000..8c963abf1fd --- /dev/null +++ b/tests/baselines/reference/circularMappedTypeConstraint.symbols @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/circularMappedTypeConstraint.ts] //// + +=== circularMappedTypeConstraint.ts === +// Repro from #56232 + +declare function foo2]: V }, V extends string>(a: T): T; +>foo2 : Symbol(foo2, Decl(circularMappedTypeConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(circularMappedTypeConstraint.ts, 2, 22)) +>P : Symbol(P, Decl(circularMappedTypeConstraint.ts, 2, 35)) +>T : Symbol(T, Decl(circularMappedTypeConstraint.ts, 2, 22)) +>Capitalize : Symbol(Capitalize, Decl(lib.es5.d.ts, --, --)) +>P : Symbol(P, Decl(circularMappedTypeConstraint.ts, 2, 35)) +>V : Symbol(V, Decl(circularMappedTypeConstraint.ts, 2, 80)) +>V : Symbol(V, Decl(circularMappedTypeConstraint.ts, 2, 80)) +>a : Symbol(a, Decl(circularMappedTypeConstraint.ts, 2, 99)) +>T : Symbol(T, Decl(circularMappedTypeConstraint.ts, 2, 22)) +>T : Symbol(T, Decl(circularMappedTypeConstraint.ts, 2, 22)) + +export const r2 = foo2({A: "a"}); +>r2 : Symbol(r2, Decl(circularMappedTypeConstraint.ts, 3, 12)) +>foo2 : Symbol(foo2, Decl(circularMappedTypeConstraint.ts, 0, 0)) +>A : Symbol(A, Decl(circularMappedTypeConstraint.ts, 3, 24)) + diff --git a/tests/baselines/reference/circularMappedTypeConstraint.types b/tests/baselines/reference/circularMappedTypeConstraint.types new file mode 100644 index 00000000000..5e00e8e2165 --- /dev/null +++ b/tests/baselines/reference/circularMappedTypeConstraint.types @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/circularMappedTypeConstraint.ts] //// + +=== circularMappedTypeConstraint.ts === +// Repro from #56232 + +declare function foo2]: V }, V extends string>(a: T): T; +>foo2 : ]: V; }, V extends string>(a: T) => T +>a : T + +export const r2 = foo2({A: "a"}); +>r2 : { A: string; } +>foo2({A: "a"}) : { A: string; } +>foo2 : ]: V; }, V extends string>(a: T) => T +>{A: "a"} : { A: string; } +>A : string +>"a" : "a" + diff --git a/tests/baselines/reference/circularReferenceInReturnType.symbols b/tests/baselines/reference/circularReferenceInReturnType.symbols new file mode 100644 index 00000000000..7baad0aa81c --- /dev/null +++ b/tests/baselines/reference/circularReferenceInReturnType.symbols @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/circularReferenceInReturnType.ts] //// + +=== circularReferenceInReturnType.ts === +declare function fn1(cb: () => T): string; +>fn1 : Symbol(fn1, Decl(circularReferenceInReturnType.ts, 0, 0)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 0, 21)) +>cb : Symbol(cb, Decl(circularReferenceInReturnType.ts, 0, 24)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 0, 21)) + +const res1 = fn1(() => res1); +>res1 : Symbol(res1, Decl(circularReferenceInReturnType.ts, 1, 5)) +>fn1 : Symbol(fn1, Decl(circularReferenceInReturnType.ts, 0, 0)) +>res1 : Symbol(res1, Decl(circularReferenceInReturnType.ts, 1, 5)) + +declare function fn2(): (cb: () => any) => (a: T) => void; +>fn2 : Symbol(fn2, Decl(circularReferenceInReturnType.ts, 1, 29)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 3, 21)) +>cb : Symbol(cb, Decl(circularReferenceInReturnType.ts, 3, 28)) +>a : Symbol(a, Decl(circularReferenceInReturnType.ts, 3, 47)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 3, 21)) + +const res2 = fn2()(() => res2); +>res2 : Symbol(res2, Decl(circularReferenceInReturnType.ts, 4, 5)) +>fn2 : Symbol(fn2, Decl(circularReferenceInReturnType.ts, 1, 29)) +>res2 : Symbol(res2, Decl(circularReferenceInReturnType.ts, 4, 5)) + +declare function fn3(): (cb: (arg: T2) => any) => (a: T) => void; +>fn3 : Symbol(fn3, Decl(circularReferenceInReturnType.ts, 4, 31)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 6, 21)) +>T2 : Symbol(T2, Decl(circularReferenceInReturnType.ts, 6, 28)) +>cb : Symbol(cb, Decl(circularReferenceInReturnType.ts, 6, 32)) +>arg : Symbol(arg, Decl(circularReferenceInReturnType.ts, 6, 37)) +>T2 : Symbol(T2, Decl(circularReferenceInReturnType.ts, 6, 28)) +>a : Symbol(a, Decl(circularReferenceInReturnType.ts, 6, 58)) +>T : Symbol(T, Decl(circularReferenceInReturnType.ts, 6, 21)) + +const res3 = fn3()(() => res3); +>res3 : Symbol(res3, Decl(circularReferenceInReturnType.ts, 7, 5)) +>fn3 : Symbol(fn3, Decl(circularReferenceInReturnType.ts, 4, 31)) +>res3 : Symbol(res3, Decl(circularReferenceInReturnType.ts, 7, 5)) + diff --git a/tests/baselines/reference/circularReferenceInReturnType.types b/tests/baselines/reference/circularReferenceInReturnType.types new file mode 100644 index 00000000000..68fb3d2bd65 --- /dev/null +++ b/tests/baselines/reference/circularReferenceInReturnType.types @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/circularReferenceInReturnType.ts] //// + +=== circularReferenceInReturnType.ts === +declare function fn1(cb: () => T): string; +>fn1 : (cb: () => T) => string +>cb : () => T + +const res1 = fn1(() => res1); +>res1 : string +>fn1(() => res1) : string +>fn1 : (cb: () => T) => string +>() => res1 : () => string +>res1 : string + +declare function fn2(): (cb: () => any) => (a: T) => void; +>fn2 : () => (cb: () => any) => (a: T) => void +>cb : () => any +>a : T + +const res2 = fn2()(() => res2); +>res2 : (a: unknown) => void +>fn2()(() => res2) : (a: unknown) => void +>fn2() : (cb: () => any) => (a: unknown) => void +>fn2 : () => (cb: () => any) => (a: T) => void +>() => res2 : () => (a: unknown) => void +>res2 : (a: unknown) => void + +declare function fn3(): (cb: (arg: T2) => any) => (a: T) => void; +>fn3 : () => (cb: (arg: T2) => any) => (a: T) => void +>cb : (arg: T2) => any +>arg : T2 +>a : T + +const res3 = fn3()(() => res3); +>res3 : (a: unknown) => void +>fn3()(() => res3) : (a: unknown) => void +>fn3() : (cb: (arg: T2) => any) => (a: unknown) => void +>fn3 : () => (cb: (arg: T2) => any) => (a: T) => void +>() => res3 : () => (a: unknown) => void +>res3 : (a: unknown) => void + diff --git a/tests/baselines/reference/circularReferenceInReturnType2.symbols b/tests/baselines/reference/circularReferenceInReturnType2.symbols new file mode 100644 index 00000000000..119e9245ea0 --- /dev/null +++ b/tests/baselines/reference/circularReferenceInReturnType2.symbols @@ -0,0 +1,160 @@ +//// [tests/cases/compiler/circularReferenceInReturnType2.ts] //// + +=== circularReferenceInReturnType2.ts === +type ObjectType = { +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 0, 16)) + + kind: "object"; +>kind : Symbol(kind, Decl(circularReferenceInReturnType2.ts, 0, 27)) + + __source: (source: Source) => void; +>__source : Symbol(__source, Decl(circularReferenceInReturnType2.ts, 1, 17)) +>source : Symbol(source, Decl(circularReferenceInReturnType2.ts, 2, 13)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 0, 16)) + +}; + +type Field = { +>Field : Symbol(Field, Decl(circularReferenceInReturnType2.ts, 3, 2)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 5, 11)) +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 5, 18)) + + __key: (key: Key) => void; +>__key : Symbol(__key, Decl(circularReferenceInReturnType2.ts, 5, 42)) +>key : Symbol(key, Decl(circularReferenceInReturnType2.ts, 6, 10)) +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 5, 18)) + + __source: (source: Source) => void; +>__source : Symbol(__source, Decl(circularReferenceInReturnType2.ts, 6, 28)) +>source : Symbol(source, Decl(circularReferenceInReturnType2.ts, 7, 13)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 5, 11)) + +}; + +declare const object: () => < +>object : Symbol(object, Decl(circularReferenceInReturnType2.ts, 10, 13)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 10, 23)) + + Fields extends { +>Fields : Symbol(Fields, Decl(circularReferenceInReturnType2.ts, 10, 37)) + + [Key in keyof Fields]: Field; +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 12, 5)) +>Fields : Symbol(Fields, Decl(circularReferenceInReturnType2.ts, 10, 37)) +>Field : Symbol(Field, Decl(circularReferenceInReturnType2.ts, 3, 2)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 10, 23)) +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 12, 5)) + } +>(config: { +>config : Symbol(config, Decl(circularReferenceInReturnType2.ts, 14, 2)) + + name: string; +>name : Symbol(name, Decl(circularReferenceInReturnType2.ts, 14, 11)) + + fields: Fields | (() => Fields); +>fields : Symbol(fields, Decl(circularReferenceInReturnType2.ts, 15, 15)) +>Fields : Symbol(Fields, Decl(circularReferenceInReturnType2.ts, 10, 37)) +>Fields : Symbol(Fields, Decl(circularReferenceInReturnType2.ts, 10, 37)) + +}) => ObjectType; +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 10, 23)) + +type InferValueFromObjectType> = +>InferValueFromObjectType : Symbol(InferValueFromObjectType, Decl(circularReferenceInReturnType2.ts, 17, 25)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 19, 30)) +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) + + Type extends ObjectType ? Source : never; +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 19, 30)) +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 20, 31)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 20, 31)) + +type FieldResolver> = ( +>FieldResolver : Symbol(FieldResolver, Decl(circularReferenceInReturnType2.ts, 20, 57)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 22, 19)) +>TType : Symbol(TType, Decl(circularReferenceInReturnType2.ts, 22, 26)) +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) + + source: Source +>source : Symbol(source, Decl(circularReferenceInReturnType2.ts, 22, 61)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 22, 19)) + +) => InferValueFromObjectType; +>InferValueFromObjectType : Symbol(InferValueFromObjectType, Decl(circularReferenceInReturnType2.ts, 17, 25)) +>TType : Symbol(TType, Decl(circularReferenceInReturnType2.ts, 22, 26)) + +type FieldFuncArgs> = { +>FieldFuncArgs : Symbol(FieldFuncArgs, Decl(circularReferenceInReturnType2.ts, 24, 37)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 26, 19)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 26, 26)) +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) + + type: Type; +>type : Symbol(type, Decl(circularReferenceInReturnType2.ts, 26, 60)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 26, 26)) + + resolve: FieldResolver; +>resolve : Symbol(resolve, Decl(circularReferenceInReturnType2.ts, 27, 13)) +>FieldResolver : Symbol(FieldResolver, Decl(circularReferenceInReturnType2.ts, 20, 57)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 26, 19)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 26, 26)) + +}; + +declare const field: , Key extends string>( +>field : Symbol(field, Decl(circularReferenceInReturnType2.ts, 31, 13)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 31, 22)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 31, 29)) +>ObjectType : Symbol(ObjectType, Decl(circularReferenceInReturnType2.ts, 0, 0)) +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 31, 59)) + + field: FieldFuncArgs +>field : Symbol(field, Decl(circularReferenceInReturnType2.ts, 31, 80)) +>FieldFuncArgs : Symbol(FieldFuncArgs, Decl(circularReferenceInReturnType2.ts, 24, 37)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 31, 22)) +>Type : Symbol(Type, Decl(circularReferenceInReturnType2.ts, 31, 29)) + +) => Field; +>Field : Symbol(Field, Decl(circularReferenceInReturnType2.ts, 3, 2)) +>Source : Symbol(Source, Decl(circularReferenceInReturnType2.ts, 31, 22)) +>Key : Symbol(Key, Decl(circularReferenceInReturnType2.ts, 31, 59)) + +type Something = { foo: number }; +>Something : Symbol(Something, Decl(circularReferenceInReturnType2.ts, 33, 24)) +>foo : Symbol(foo, Decl(circularReferenceInReturnType2.ts, 35, 18)) + +const A = object()({ +>A : Symbol(A, Decl(circularReferenceInReturnType2.ts, 37, 5)) +>object : Symbol(object, Decl(circularReferenceInReturnType2.ts, 10, 13)) +>Something : Symbol(Something, Decl(circularReferenceInReturnType2.ts, 33, 24)) + + name: "A", +>name : Symbol(name, Decl(circularReferenceInReturnType2.ts, 37, 31)) + + fields: () => ({ +>fields : Symbol(fields, Decl(circularReferenceInReturnType2.ts, 38, 12)) + + a: field({ +>a : Symbol(a, Decl(circularReferenceInReturnType2.ts, 39, 18)) +>field : Symbol(field, Decl(circularReferenceInReturnType2.ts, 31, 13)) + + type: A, +>type : Symbol(type, Decl(circularReferenceInReturnType2.ts, 40, 14)) +>A : Symbol(A, Decl(circularReferenceInReturnType2.ts, 37, 5)) + + resolve() { +>resolve : Symbol(resolve, Decl(circularReferenceInReturnType2.ts, 41, 14)) + + return { + foo: 100, +>foo : Symbol(foo, Decl(circularReferenceInReturnType2.ts, 43, 16)) + + }; + }, + }), + }), +}); + diff --git a/tests/baselines/reference/circularReferenceInReturnType2.types b/tests/baselines/reference/circularReferenceInReturnType2.types new file mode 100644 index 00000000000..49096d1921f --- /dev/null +++ b/tests/baselines/reference/circularReferenceInReturnType2.types @@ -0,0 +1,124 @@ +//// [tests/cases/compiler/circularReferenceInReturnType2.ts] //// + +=== circularReferenceInReturnType2.ts === +type ObjectType = { +>ObjectType : ObjectType + + kind: "object"; +>kind : "object" + + __source: (source: Source) => void; +>__source : (source: Source) => void +>source : Source + +}; + +type Field = { +>Field : Field + + __key: (key: Key) => void; +>__key : (key: Key) => void +>key : Key + + __source: (source: Source) => void; +>__source : (source: Source) => void +>source : Source + +}; + +declare const object: () => < +>object : () => ; }>(config: { name: string; fields: Fields | (() => Fields);}) => ObjectType + + Fields extends { + [Key in keyof Fields]: Field; + } +>(config: { +>config : { name: string; fields: Fields | (() => Fields); } + + name: string; +>name : string + + fields: Fields | (() => Fields); +>fields : Fields | (() => Fields) + +}) => ObjectType; + +type InferValueFromObjectType> = +>InferValueFromObjectType : InferValueFromObjectType + + Type extends ObjectType ? Source : never; + +type FieldResolver> = ( +>FieldResolver : FieldResolver + + source: Source +>source : Source + +) => InferValueFromObjectType; + +type FieldFuncArgs> = { +>FieldFuncArgs : FieldFuncArgs + + type: Type; +>type : Type + + resolve: FieldResolver; +>resolve : FieldResolver + +}; + +declare const field: , Key extends string>( +>field : , Key extends string>(field: FieldFuncArgs) => Field + + field: FieldFuncArgs +>field : FieldFuncArgs + +) => Field; + +type Something = { foo: number }; +>Something : { foo: number; } +>foo : number + +const A = object()({ +>A : ObjectType +>object()({ name: "A", fields: () => ({ a: field({ type: A, resolve() { return { foo: 100, }; }, }), }),}) : ObjectType +>object() : ; }>(config: { name: string; fields: Fields | (() => Fields); }) => ObjectType +>object : () => ; }>(config: { name: string; fields: Fields | (() => Fields); }) => ObjectType +>{ name: "A", fields: () => ({ a: field({ type: A, resolve() { return { foo: 100, }; }, }), }),} : { name: string; fields: () => { a: Field; }; } + + name: "A", +>name : string +>"A" : "A" + + fields: () => ({ +>fields : () => { a: Field; } +>() => ({ a: field({ type: A, resolve() { return { foo: 100, }; }, }), }) : () => { a: Field; } +>({ a: field({ type: A, resolve() { return { foo: 100, }; }, }), }) : { a: Field; } +>{ a: field({ type: A, resolve() { return { foo: 100, }; }, }), } : { a: Field; } + + a: field({ +>a : Field +>field({ type: A, resolve() { return { foo: 100, }; }, }) : Field +>field : , Key extends string>(field: FieldFuncArgs) => Field +>{ type: A, resolve() { return { foo: 100, }; }, } : { type: ObjectType; resolve(): { foo: number; }; } + + type: A, +>type : ObjectType +>A : ObjectType + + resolve() { +>resolve : () => { foo: number; } + + return { +>{ foo: 100, } : { foo: number; } + + foo: 100, +>foo : number +>100 : 100 + + }; + }, + }), + }), +}); + diff --git a/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt b/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt index 4078a255dfc..8a32b0c5807 100644 --- a/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt +++ b/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt @@ -1,31 +1,12 @@ circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.ts(63,84): error TS2344: Type 'GetProps' does not satisfy the constraint 'Shared>'. - Type 'unknown' is not assignable to type 'Shared>'. - Type 'Matching>' is not assignable to type 'Shared>'. - Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[P] | (TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>] | (TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>] | GetProps[Extract>] | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]) | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & Extract>] | TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]) | GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & keyof GetProps & string] | TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Matching>' is not assignable to type 'Shared>'. + Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type '(TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string]) | GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. ==== circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.ts (1 errors) ==== @@ -94,31 +75,12 @@ circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth ) => ConnectedComponentClass, keyof Shared>> & TNeedsProps>; ~~~~~~~~~~~ !!! error TS2344: Type 'GetProps' does not satisfy the constraint 'Shared>'. -!!! error TS2344: Type 'unknown' is not assignable to type 'Shared>'. -!!! error TS2344: Type 'Matching>' is not assignable to type 'Shared>'. -!!! error TS2344: Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[P] | (TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>] | (TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>] | GetProps[Extract>] | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]) | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & Extract>] | TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]) | GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & keyof GetProps & string] | TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Matching>' is not assignable to type 'Shared>'. +!!! error TS2344: Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string]) | GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. \ No newline at end of file diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt index c97c014caf5..6be00dcf3fb 100644 --- a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt +++ b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt @@ -39,7 +39,7 @@ second.ts(17,15): error TS2345: Argument of type 'string' is not assignable to p class Sql extends Wagon { constructor() { super(); // error: not enough arguments - ~~~~~~~ + ~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 first.js:5:16: An argument for 'numberOxen' was not provided. this.foonly = 12 diff --git a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.errors.txt b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.errors.txt index ad9d57b5401..466c6664966 100644 --- a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.errors.txt +++ b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.errors.txt @@ -1,25 +1,49 @@ -computedPropertyNamesWithStaticProperty.ts(3,10): error TS2449: Class 'C' used before its declaration. -computedPropertyNamesWithStaticProperty.ts(6,10): error TS2449: Class 'C' used before its declaration. -computedPropertyNamesWithStaticProperty.ts(9,6): error TS2449: Class 'C' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(3,10): error TS2449: Class 'C1' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(6,10): error TS2449: Class 'C1' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(9,6): error TS2449: Class 'C1' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(14,10): error TS2449: Class 'C2' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(17,10): error TS2449: Class 'C2' used before its declaration. +computedPropertyNamesWithStaticProperty.ts(20,6): error TS2449: Class 'C2' used before its declaration. -==== computedPropertyNamesWithStaticProperty.ts (3 errors) ==== - class C { +==== computedPropertyNamesWithStaticProperty.ts (6 errors) ==== + class C1 { static staticProp = 10; - get [C.staticProp]() { - ~ -!!! error TS2449: Class 'C' used before its declaration. -!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C' is declared here. + get [C1.staticProp]() { + ~~ +!!! error TS2449: Class 'C1' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C1' is declared here. return "hello"; } - set [C.staticProp](x: string) { - ~ -!!! error TS2449: Class 'C' used before its declaration. -!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C' is declared here. + set [C1.staticProp](x: string) { + ~~ +!!! error TS2449: Class 'C1' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C1' is declared here. var y = x; } - [C.staticProp]() { } - ~ -!!! error TS2449: Class 'C' used before its declaration. -!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C' is declared here. - } \ No newline at end of file + [C1.staticProp]() { } + ~~ +!!! error TS2449: Class 'C1' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:1:7: 'C1' is declared here. + } + + (class C2 { + static staticProp = 10; + get [C2.staticProp]() { + ~~ +!!! error TS2449: Class 'C2' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:12:8: 'C2' is declared here. + return "hello"; + } + set [C2.staticProp](x: string) { + ~~ +!!! error TS2449: Class 'C2' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:12:8: 'C2' is declared here. + var y = x; + } + [C2.staticProp]() { } + ~~ +!!! error TS2449: Class 'C2' used before its declaration. +!!! related TS2728 computedPropertyNamesWithStaticProperty.ts:12:8: 'C2' is declared here. + }) + \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js index aaface52b35..63068159d90 100644 --- a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js +++ b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js @@ -1,25 +1,49 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts] //// //// [computedPropertyNamesWithStaticProperty.ts] -class C { +class C1 { static staticProp = 10; - get [C.staticProp]() { + get [C1.staticProp]() { return "hello"; } - set [C.staticProp](x: string) { + set [C1.staticProp](x: string) { var y = x; } - [C.staticProp]() { } -} + [C1.staticProp]() { } +} + +(class C2 { + static staticProp = 10; + get [C2.staticProp]() { + return "hello"; + } + set [C2.staticProp](x: string) { + var y = x; + } + [C2.staticProp]() { } +}) + //// [computedPropertyNamesWithStaticProperty.js] -class C { - get [C.staticProp]() { +var _a; +class C1 { + get [C1.staticProp]() { return "hello"; } - set [C.staticProp](x) { + set [C1.staticProp](x) { var y = x; } - [C.staticProp]() { } + [C1.staticProp]() { } } -C.staticProp = 10; +C1.staticProp = 10; +(_a = class C2 { + get [C2.staticProp]() { + return "hello"; + } + set [C2.staticProp](x) { + var y = x; + } + [C2.staticProp]() { } + }, + _a.staticProp = 10, + _a); diff --git a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.symbols b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.symbols index 3b6b3d1aeb0..42410e531eb 100644 --- a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.symbols +++ b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.symbols @@ -1,34 +1,68 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts] //// === computedPropertyNamesWithStaticProperty.ts === -class C { ->C : Symbol(C, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) +class C1 { +>C1 : Symbol(C1, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) static staticProp = 10; ->staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) +>staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) - get [C.staticProp]() { ->[C.staticProp] : Symbol(C[C.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 1, 27)) ->C.staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) ->C : Symbol(C, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) ->staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) + get [C1.staticProp]() { +>[C1.staticProp] : Symbol(C1[C1.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 1, 27)) +>C1.staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) +>C1 : Symbol(C1, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) +>staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) return "hello"; } - set [C.staticProp](x: string) { ->[C.staticProp] : Symbol(C[C.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 4, 5)) ->C.staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) ->C : Symbol(C, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) ->staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) ->x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 5, 23)) + set [C1.staticProp](x: string) { +>[C1.staticProp] : Symbol(C1[C1.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 4, 5)) +>C1.staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) +>C1 : Symbol(C1, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) +>staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) +>x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 5, 24)) var y = x; >y : Symbol(y, Decl(computedPropertyNamesWithStaticProperty.ts, 6, 11)) ->x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 5, 23)) +>x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 5, 24)) } - [C.staticProp]() { } ->[C.staticProp] : Symbol(C[C.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 7, 5)) ->C.staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) ->C : Symbol(C, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) ->staticProp : Symbol(C.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 9)) + [C1.staticProp]() { } +>[C1.staticProp] : Symbol(C1[C1.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 7, 5)) +>C1.staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) +>C1 : Symbol(C1, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 0)) +>staticProp : Symbol(C1.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 0, 10)) } + +(class C2 { +>C2 : Symbol(C2, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 1)) + + static staticProp = 10; +>staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) + + get [C2.staticProp]() { +>[C2.staticProp] : Symbol(C2[C2.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 12, 27)) +>C2.staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) +>C2 : Symbol(C2, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 1)) +>staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) + + return "hello"; + } + set [C2.staticProp](x: string) { +>[C2.staticProp] : Symbol(C2[C2.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 15, 5)) +>C2.staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) +>C2 : Symbol(C2, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 1)) +>staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) +>x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 16, 24)) + + var y = x; +>y : Symbol(y, Decl(computedPropertyNamesWithStaticProperty.ts, 17, 11)) +>x : Symbol(x, Decl(computedPropertyNamesWithStaticProperty.ts, 16, 24)) + } + [C2.staticProp]() { } +>[C2.staticProp] : Symbol(C2[C2.staticProp], Decl(computedPropertyNamesWithStaticProperty.ts, 18, 5)) +>C2.staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) +>C2 : Symbol(C2, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 1)) +>staticProp : Symbol(C2.staticProp, Decl(computedPropertyNamesWithStaticProperty.ts, 11, 11)) + +}) + diff --git a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.types b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.types index f4707536a6a..00d4cdf9e21 100644 --- a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.types +++ b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.types @@ -1,26 +1,26 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts] //// === computedPropertyNamesWithStaticProperty.ts === -class C { ->C : C +class C1 { +>C1 : C1 static staticProp = 10; >staticProp : number >10 : 10 - get [C.staticProp]() { ->[C.staticProp] : string ->C.staticProp : number ->C : typeof C + get [C1.staticProp]() { +>[C1.staticProp] : string +>C1.staticProp : number +>C1 : typeof C1 >staticProp : number return "hello"; >"hello" : "hello" } - set [C.staticProp](x: string) { ->[C.staticProp] : string ->C.staticProp : number ->C : typeof C + set [C1.staticProp](x: string) { +>[C1.staticProp] : string +>C1.staticProp : number +>C1 : typeof C1 >staticProp : number >x : string @@ -28,9 +28,47 @@ class C { >y : string >x : string } - [C.staticProp]() { } ->[C.staticProp] : () => void ->C.staticProp : number ->C : typeof C + [C1.staticProp]() { } +>[C1.staticProp] : () => void +>C1.staticProp : number +>C1 : typeof C1 >staticProp : number } + +(class C2 { +>(class C2 { static staticProp = 10; get [C2.staticProp]() { return "hello"; } set [C2.staticProp](x: string) { var y = x; } [C2.staticProp]() { }}) : typeof C2 +>class C2 { static staticProp = 10; get [C2.staticProp]() { return "hello"; } set [C2.staticProp](x: string) { var y = x; } [C2.staticProp]() { }} : typeof C2 +>C2 : typeof C2 + + static staticProp = 10; +>staticProp : number +>10 : 10 + + get [C2.staticProp]() { +>[C2.staticProp] : string +>C2.staticProp : number +>C2 : typeof C2 +>staticProp : number + + return "hello"; +>"hello" : "hello" + } + set [C2.staticProp](x: string) { +>[C2.staticProp] : string +>C2.staticProp : number +>C2 : typeof C2 +>staticProp : number +>x : string + + var y = x; +>y : string +>x : string + } + [C2.staticProp]() { } +>[C2.staticProp] : () => void +>C2.staticProp : number +>C2 : typeof C2 +>staticProp : number + +}) + diff --git a/tests/baselines/reference/conditionalTypes1.errors.txt b/tests/baselines/reference/conditionalTypes1.errors.txt index 6c6443b045c..ea66f14d927 100644 --- a/tests/baselines/reference/conditionalTypes1.errors.txt +++ b/tests/baselines/reference/conditionalTypes1.errors.txt @@ -57,8 +57,10 @@ conditionalTypes1.ts(136,22): error TS2540: Cannot assign to 'id' because it is conditionalTypes1.ts(137,10): error TS2339: Property 'updatePart' does not exist on type 'DeepReadonlyObject'. conditionalTypes1.ts(159,5): error TS2322: Type 'ZeroOf' is not assignable to type 'T'. 'ZeroOf' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. - Type '0 | (T extends string ? "" : false)' is not assignable to type 'T'. - 'T' could be instantiated with an arbitrary type which could be unrelated to '0 | (T extends string ? "" : false)'. + Type 'string | number' is not assignable to type 'T'. + 'string | number' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. + Type 'string' is not assignable to type 'T'. + 'string' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. conditionalTypes1.ts(160,5): error TS2322: Type 'T' is not assignable to type 'ZeroOf'. Type 'string | number' is not assignable to type 'ZeroOf'. Type 'string' is not assignable to type 'ZeroOf'. @@ -86,6 +88,7 @@ conditionalTypes1.ts(288,43): error TS2322: Type 'T95' is not assignable to t !!! error TS2322: Type 'T' is not assignable to type 'NonNullable'. !!! error TS2322: Type 'T' is not assignable to type '{}'. !!! related TS2208 conditionalTypes1.ts:10:13: This type parameter might need an `extends {}` constraint. +!!! related TS2208 conditionalTypes1.ts:10:13: This type parameter might need an `extends NonNullable` constraint. } function f2(x: T, y: NonNullable) { @@ -306,8 +309,10 @@ conditionalTypes1.ts(288,43): error TS2322: Type 'T95' is not assignable to t ~ !!! error TS2322: Type 'ZeroOf' is not assignable to type 'T'. !!! error TS2322: 'ZeroOf' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. -!!! error TS2322: Type '0 | (T extends string ? "" : false)' is not assignable to type 'T'. -!!! error TS2322: 'T' could be instantiated with an arbitrary type which could be unrelated to '0 | (T extends string ? "" : false)'. +!!! error TS2322: Type 'string | number' is not assignable to type 'T'. +!!! error TS2322: 'string | number' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. +!!! error TS2322: Type 'string' is not assignable to type 'T'. +!!! error TS2322: 'string' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'. y = x; // Error ~ !!! error TS2322: Type 'T' is not assignable to type 'ZeroOf'. diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt index ef0eab5c43e..de78fe2d373 100644 --- a/tests/baselines/reference/conditionalTypes2.errors.txt +++ b/tests/baselines/reference/conditionalTypes2.errors.txt @@ -25,9 +25,8 @@ conditionalTypes2.ts(25,5): error TS2322: Type 'Invariant' is not assignable Type 'A' is not assignable to type 'B'. 'B' could be instantiated with an arbitrary type which could be unrelated to 'A'. conditionalTypes2.ts(73,12): error TS2345: Argument of type 'Extract, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'. - Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. - Type 'Extract' is not assignable to type '{ foo: string; bat: string; }'. - Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. + Type 'Extract' is not assignable to type '{ foo: string; bat: string; }'. + Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. conditionalTypes2.ts(74,12): error TS2345: Argument of type 'Extract' is not assignable to parameter of type '{ foo: string; bat: string; }'. Property 'bat' is missing in type 'Foo & Bar' but required in type '{ foo: string; bat: string; }'. conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2' is not assignable to parameter of type '{ foo: string; bat: string; }'. @@ -145,10 +144,8 @@ conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'. -!!! error TS2345: Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. -!!! error TS2345: Type 'Extract' is not assignable to type '{ foo: string; bat: string; }'. -!!! error TS2345: Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. -!!! related TS2728 conditionalTypes2.ts:62:43: 'bat' is declared here. +!!! error TS2345: Type 'Extract' is not assignable to type '{ foo: string; bat: string; }'. +!!! error TS2345: Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'. !!! related TS2728 conditionalTypes2.ts:62:43: 'bat' is declared here. fooBat(y); // Error ~ diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.errors.txt b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.errors.txt similarity index 90% rename from tests/baselines/reference/contextuallyTypedParametersWithInitializers.errors.txt rename to tests/baselines/reference/contextuallyTypedParametersWithInitializers1.errors.txt index ead06513c52..037a858524c 100644 --- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.errors.txt +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.errors.txt @@ -1,8 +1,8 @@ -contextuallyTypedParametersWithInitializers.ts(24,24): error TS7006: Parameter 'x' implicitly has an 'any' type. -contextuallyTypedParametersWithInitializers.ts(40,5): error TS7006: Parameter 'x' implicitly has an 'any' type. +contextuallyTypedParametersWithInitializers1.ts(24,24): error TS7006: Parameter 'x' implicitly has an 'any' type. +contextuallyTypedParametersWithInitializers1.ts(40,5): error TS7006: Parameter 'x' implicitly has an 'any' type. -==== contextuallyTypedParametersWithInitializers.ts (2 errors) ==== +==== contextuallyTypedParametersWithInitializers1.ts (2 errors) ==== declare function id1(input: T): T; declare function id2 any>(input: T): T; declare function id3 any>(input: T): T; diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.js b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.js similarity index 94% rename from tests/baselines/reference/contextuallyTypedParametersWithInitializers.js rename to tests/baselines/reference/contextuallyTypedParametersWithInitializers1.js index 088fb6235d5..975f8af6aba 100644 --- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.js +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.js @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers.ts] //// +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers1.ts] //// -//// [contextuallyTypedParametersWithInitializers.ts] +//// [contextuallyTypedParametersWithInitializers1.ts] declare function id1(input: T): T; declare function id2 any>(input: T): T; declare function id3 any>(input: T): T; @@ -86,7 +86,7 @@ const fz1 = (debug = true) => false; const fz2: Function = (debug = true) => false; -//// [contextuallyTypedParametersWithInitializers.js] +//// [contextuallyTypedParametersWithInitializers1.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.executeSomething = void 0; @@ -234,5 +234,5 @@ var fz2 = function (debug) { }; -//// [contextuallyTypedParametersWithInitializers.d.ts] +//// [contextuallyTypedParametersWithInitializers1.d.ts] export declare function executeSomething(): Promise; diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.symbols b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.symbols similarity index 55% rename from tests/baselines/reference/contextuallyTypedParametersWithInitializers.symbols rename to tests/baselines/reference/contextuallyTypedParametersWithInitializers1.symbols index 24e5287c028..b02818faea9 100644 --- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.symbols +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.symbols @@ -1,321 +1,321 @@ -//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers.ts] //// +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers1.ts] //// -=== contextuallyTypedParametersWithInitializers.ts === +=== contextuallyTypedParametersWithInitializers1.ts === declare function id1(input: T): T; ->id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 0)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 21)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 24)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 21)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 21)) +>id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 0)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 21)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 24)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 21)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 21)) declare function id2 any>(input: T): T; ->id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 37)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 21)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 32)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 48)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 21)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 21)) +>id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 37)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 21)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 32)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 48)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 21)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 21)) declare function id3 any>(input: T): T; ->id3 : Symbol(id3, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 61)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 21)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 32)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 36)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 57)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 21)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 21)) +>id3 : Symbol(id3, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 61)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 21)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 32)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 36)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 57)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 21)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 21)) declare function id4 any>(input: T): T; ->id4 : Symbol(id4, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 70)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 21)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 32)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 36)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 61)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 21)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 21)) +>id4 : Symbol(id4, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 70)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 21)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 32)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 36)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 61)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 21)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 21)) declare function id5 any>(input: T): T; ->id5 : Symbol(id5, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 74)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 4, 21)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 4, 32)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 4, 52)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 4, 21)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 4, 21)) +>id5 : Symbol(id5, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 74)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 4, 21)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 4, 32)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 4, 52)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 4, 21)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 4, 21)) const f10 = function ({ foo = 42 }) { return foo }; ->f10 : Symbol(f10, Decl(contextuallyTypedParametersWithInitializers.ts, 6, 5)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 6, 23)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 6, 23)) +>f10 : Symbol(f10, Decl(contextuallyTypedParametersWithInitializers1.ts, 6, 5)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 6, 23)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 6, 23)) const f11 = id1(function ({ foo = 42 }) { return foo }); ->f11 : Symbol(f11, Decl(contextuallyTypedParametersWithInitializers.ts, 7, 5)) ->id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 0)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 7, 27)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 7, 27)) +>f11 : Symbol(f11, Decl(contextuallyTypedParametersWithInitializers1.ts, 7, 5)) +>id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 0)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 7, 27)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 7, 27)) const f12 = id2(function ({ foo = 42 }) { return foo }); ->f12 : Symbol(f12, Decl(contextuallyTypedParametersWithInitializers.ts, 8, 5)) ->id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 37)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 8, 27)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 8, 27)) +>f12 : Symbol(f12, Decl(contextuallyTypedParametersWithInitializers1.ts, 8, 5)) +>id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 37)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 8, 27)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 8, 27)) const f13 = id3(function ({ foo = 42 }) { return foo }); ->f13 : Symbol(f13, Decl(contextuallyTypedParametersWithInitializers.ts, 9, 5)) ->id3 : Symbol(id3, Decl(contextuallyTypedParametersWithInitializers.ts, 1, 61)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 9, 27)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 9, 27)) +>f13 : Symbol(f13, Decl(contextuallyTypedParametersWithInitializers1.ts, 9, 5)) +>id3 : Symbol(id3, Decl(contextuallyTypedParametersWithInitializers1.ts, 1, 61)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 9, 27)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 9, 27)) const f14 = id4(function ({ foo = 42 }) { return foo }); ->f14 : Symbol(f14, Decl(contextuallyTypedParametersWithInitializers.ts, 10, 5)) ->id4 : Symbol(id4, Decl(contextuallyTypedParametersWithInitializers.ts, 2, 70)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 10, 27)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 10, 27)) +>f14 : Symbol(f14, Decl(contextuallyTypedParametersWithInitializers1.ts, 10, 5)) +>id4 : Symbol(id4, Decl(contextuallyTypedParametersWithInitializers1.ts, 2, 70)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 10, 27)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 10, 27)) const f20 = function (foo = 42) { return foo }; ->f20 : Symbol(f20, Decl(contextuallyTypedParametersWithInitializers.ts, 12, 5)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 12, 22)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 12, 22)) +>f20 : Symbol(f20, Decl(contextuallyTypedParametersWithInitializers1.ts, 12, 5)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 12, 22)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 12, 22)) const f21 = id1(function (foo = 42) { return foo }); ->f21 : Symbol(f21, Decl(contextuallyTypedParametersWithInitializers.ts, 13, 5)) ->id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 0)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 13, 26)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 13, 26)) +>f21 : Symbol(f21, Decl(contextuallyTypedParametersWithInitializers1.ts, 13, 5)) +>id1 : Symbol(id1, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 0)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 13, 26)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 13, 26)) const f22 = id2(function (foo = 42) { return foo }); ->f22 : Symbol(f22, Decl(contextuallyTypedParametersWithInitializers.ts, 14, 5)) ->id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers.ts, 0, 37)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 14, 26)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 14, 26)) +>f22 : Symbol(f22, Decl(contextuallyTypedParametersWithInitializers1.ts, 14, 5)) +>id2 : Symbol(id2, Decl(contextuallyTypedParametersWithInitializers1.ts, 0, 37)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 14, 26)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 14, 26)) const f25 = id5(function (foo = 42) { return foo }); ->f25 : Symbol(f25, Decl(contextuallyTypedParametersWithInitializers.ts, 15, 5)) ->id5 : Symbol(id5, Decl(contextuallyTypedParametersWithInitializers.ts, 3, 74)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 15, 26)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 15, 26)) +>f25 : Symbol(f25, Decl(contextuallyTypedParametersWithInitializers1.ts, 15, 5)) +>id5 : Symbol(id5, Decl(contextuallyTypedParametersWithInitializers1.ts, 3, 74)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 15, 26)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 15, 26)) const f1 = (x = 1) => 0; // number ->f1 : Symbol(f1, Decl(contextuallyTypedParametersWithInitializers.ts, 17, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 17, 12)) +>f1 : Symbol(f1, Decl(contextuallyTypedParametersWithInitializers1.ts, 17, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 17, 12)) const f2: any = (x = 1) => 0; // number ->f2 : Symbol(f2, Decl(contextuallyTypedParametersWithInitializers.ts, 18, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 18, 17)) +>f2 : Symbol(f2, Decl(contextuallyTypedParametersWithInitializers1.ts, 18, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 18, 17)) const f3: unknown = (x = 1) => 0; // number ->f3 : Symbol(f3, Decl(contextuallyTypedParametersWithInitializers.ts, 19, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 19, 21)) +>f3 : Symbol(f3, Decl(contextuallyTypedParametersWithInitializers1.ts, 19, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 19, 21)) const f4: Function = (x = 1) => 0; // number ->f4 : Symbol(f4, Decl(contextuallyTypedParametersWithInitializers.ts, 20, 5)) +>f4 : Symbol(f4, Decl(contextuallyTypedParametersWithInitializers1.ts, 20, 5)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 20, 22)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 20, 22)) const f5: (...args: any[]) => any = (x = 1) => 0; // any ->f5 : Symbol(f5, Decl(contextuallyTypedParametersWithInitializers.ts, 21, 5)) ->args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers.ts, 21, 11)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 21, 37)) +>f5 : Symbol(f5, Decl(contextuallyTypedParametersWithInitializers1.ts, 21, 5)) +>args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers1.ts, 21, 11)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 21, 37)) const f6: () => any = (x = 1) => 0; // number ->f6 : Symbol(f6, Decl(contextuallyTypedParametersWithInitializers.ts, 22, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 22, 23)) +>f6 : Symbol(f6, Decl(contextuallyTypedParametersWithInitializers1.ts, 22, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 22, 23)) const f7: () => any = (x?) => 0; // Implicit any error ->f7 : Symbol(f7, Decl(contextuallyTypedParametersWithInitializers.ts, 23, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 23, 23)) +>f7 : Symbol(f7, Decl(contextuallyTypedParametersWithInitializers1.ts, 23, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 23, 23)) const f8: () => any = (...x) => 0; // [] ->f8 : Symbol(f8, Decl(contextuallyTypedParametersWithInitializers.ts, 24, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 24, 23)) +>f8 : Symbol(f8, Decl(contextuallyTypedParametersWithInitializers1.ts, 24, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 24, 23)) declare function g1(x: T): T; ->g1 : Symbol(g1, Decl(contextuallyTypedParametersWithInitializers.ts, 24, 34)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 20)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 23)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 20)) +>g1 : Symbol(g1, Decl(contextuallyTypedParametersWithInitializers1.ts, 24, 34)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 20)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 23)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 20)) declare function g2(x: T): T; ->g2 : Symbol(g2, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 32)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 20)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 35)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 20)) +>g2 : Symbol(g2, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 32)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 20)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 35)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 20)) declare function g3(x: T): T; ->g3 : Symbol(g3, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 44)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 20)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 39)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 20)) +>g3 : Symbol(g3, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 44)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 20)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 39)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 20)) declare function g4(x: T): T; ->g4 : Symbol(g4, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 48)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 20)) +>g4 : Symbol(g4, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 48)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 20)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 40)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 20)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 40)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 20)) declare function g5 any>(x: T): T; ->g5 : Symbol(g5, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 49)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 20)) ->args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 31)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 55)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 20)) +>g5 : Symbol(g5, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 49)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 20)) +>args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 31)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 55)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 20)) declare function g6 any>(x: T): T; ->g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 64)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 31, 20)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 31, 41)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 31, 20)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 31, 20)) +>g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 64)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 31, 20)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 31, 41)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 31, 20)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 31, 20)) g1((x = 1) => 0); // number ->g1 : Symbol(g1, Decl(contextuallyTypedParametersWithInitializers.ts, 24, 34)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 33, 4)) +>g1 : Symbol(g1, Decl(contextuallyTypedParametersWithInitializers1.ts, 24, 34)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 33, 4)) g2((x = 1) => 0); // number ->g2 : Symbol(g2, Decl(contextuallyTypedParametersWithInitializers.ts, 26, 32)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 34, 4)) +>g2 : Symbol(g2, Decl(contextuallyTypedParametersWithInitializers1.ts, 26, 32)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 34, 4)) g3((x = 1) => 0); // number ->g3 : Symbol(g3, Decl(contextuallyTypedParametersWithInitializers.ts, 27, 44)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 35, 4)) +>g3 : Symbol(g3, Decl(contextuallyTypedParametersWithInitializers1.ts, 27, 44)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 35, 4)) g4((x = 1) => 0); // number ->g4 : Symbol(g4, Decl(contextuallyTypedParametersWithInitializers.ts, 28, 48)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 36, 4)) +>g4 : Symbol(g4, Decl(contextuallyTypedParametersWithInitializers1.ts, 28, 48)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 36, 4)) g5((x = 1) => 0); // any ->g5 : Symbol(g5, Decl(contextuallyTypedParametersWithInitializers.ts, 29, 49)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 37, 4)) +>g5 : Symbol(g5, Decl(contextuallyTypedParametersWithInitializers1.ts, 29, 49)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 37, 4)) g6((x = 1) => 0); // number ->g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 64)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 38, 4)) +>g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 64)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 38, 4)) g6((x?) => 0); // Implicit any error ->g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 64)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 39, 4)) +>g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 64)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 39, 4)) g6((...x) => 0); // [] ->g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers.ts, 30, 64)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 40, 4)) +>g6 : Symbol(g6, Decl(contextuallyTypedParametersWithInitializers1.ts, 30, 64)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 40, 4)) // Repro from #28816 function id(input: T): T { return input } ->id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers.ts, 40, 16)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 12)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 15)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 12)) ->T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 12)) ->input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 15)) +>id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers1.ts, 40, 16)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 12)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 15)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 12)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 12)) +>input : Symbol(input, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 15)) function getFoo ({ foo = 42 }) { ->getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 44)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 46, 18)) +>getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 44)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 46, 18)) return foo; ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 46, 18)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 46, 18)) } const newGetFoo = id(getFoo); ->newGetFoo : Symbol(newGetFoo, Decl(contextuallyTypedParametersWithInitializers.ts, 50, 5)) ->id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers.ts, 40, 16)) ->getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers.ts, 44, 44)) +>newGetFoo : Symbol(newGetFoo, Decl(contextuallyTypedParametersWithInitializers1.ts, 50, 5)) +>id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers1.ts, 40, 16)) +>getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers1.ts, 44, 44)) const newGetFoo2 = id(function getFoo ({ foo = 42 }) { ->newGetFoo2 : Symbol(newGetFoo2, Decl(contextuallyTypedParametersWithInitializers.ts, 51, 5)) ->id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers.ts, 40, 16)) ->getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers.ts, 51, 22)) ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 51, 40)) +>newGetFoo2 : Symbol(newGetFoo2, Decl(contextuallyTypedParametersWithInitializers1.ts, 51, 5)) +>id : Symbol(id, Decl(contextuallyTypedParametersWithInitializers1.ts, 40, 16)) +>getFoo : Symbol(getFoo, Decl(contextuallyTypedParametersWithInitializers1.ts, 51, 22)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 51, 40)) return foo; ->foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers.ts, 51, 40)) +>foo : Symbol(foo, Decl(contextuallyTypedParametersWithInitializers1.ts, 51, 40)) }); // Repro from comment in #30840 declare function memoize(func: F): F; ->memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers.ts, 53, 3)) ->F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 25)) +>memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers1.ts, 53, 3)) +>F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 25)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->func : Symbol(func, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 45)) ->F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 25)) ->F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 25)) +>func : Symbol(func, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 45)) +>F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 25)) +>F : Symbol(F, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 25)) function add(x: number, y = 0): number { ->add : Symbol(add, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 57)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 59, 13)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 59, 23)) +>add : Symbol(add, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 57)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 59, 13)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 59, 23)) return x + y; ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 59, 13)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 59, 23)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 59, 13)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 59, 23)) } const memoizedAdd = memoize(add); ->memoizedAdd : Symbol(memoizedAdd, Decl(contextuallyTypedParametersWithInitializers.ts, 62, 5)) ->memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers.ts, 53, 3)) ->add : Symbol(add, Decl(contextuallyTypedParametersWithInitializers.ts, 57, 57)) +>memoizedAdd : Symbol(memoizedAdd, Decl(contextuallyTypedParametersWithInitializers1.ts, 62, 5)) +>memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers1.ts, 53, 3)) +>add : Symbol(add, Decl(contextuallyTypedParametersWithInitializers1.ts, 57, 57)) const add2 = (x: number, y = 0): number => x + y; ->add2 : Symbol(add2, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 5)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 14)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 24)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 14)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 24)) +>add2 : Symbol(add2, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 5)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 14)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 24)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 14)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 24)) const memoizedAdd2 = memoize(add2); ->memoizedAdd2 : Symbol(memoizedAdd2, Decl(contextuallyTypedParametersWithInitializers.ts, 65, 5)) ->memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers.ts, 53, 3)) ->add2 : Symbol(add2, Decl(contextuallyTypedParametersWithInitializers.ts, 64, 5)) +>memoizedAdd2 : Symbol(memoizedAdd2, Decl(contextuallyTypedParametersWithInitializers1.ts, 65, 5)) +>memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers1.ts, 53, 3)) +>add2 : Symbol(add2, Decl(contextuallyTypedParametersWithInitializers1.ts, 64, 5)) const memoizedAdd3 = memoize((x: number, y = 0): number => x + y); ->memoizedAdd3 : Symbol(memoizedAdd3, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 5)) ->memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers.ts, 53, 3)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 30)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 40)) ->x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 30)) ->y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 40)) +>memoizedAdd3 : Symbol(memoizedAdd3, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 5)) +>memoize : Symbol(memoize, Decl(contextuallyTypedParametersWithInitializers1.ts, 53, 3)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 30)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 40)) +>x : Symbol(x, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 30)) +>y : Symbol(y, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 40)) // Repro from #36052 declare function execute(script: string | Function): Promise; ->execute : Symbol(execute, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 66)) ->script : Symbol(script, Decl(contextuallyTypedParametersWithInitializers.ts, 71, 25)) +>execute : Symbol(execute, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 66)) +>script : Symbol(script, Decl(contextuallyTypedParametersWithInitializers1.ts, 71, 25)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --)) export function executeSomething() { ->executeSomething : Symbol(executeSomething, Decl(contextuallyTypedParametersWithInitializers.ts, 71, 69)) +>executeSomething : Symbol(executeSomething, Decl(contextuallyTypedParametersWithInitializers1.ts, 71, 69)) return execute((root: HTMLElement, debug = true) => { ->execute : Symbol(execute, Decl(contextuallyTypedParametersWithInitializers.ts, 67, 66)) ->root : Symbol(root, Decl(contextuallyTypedParametersWithInitializers.ts, 74, 20)) +>execute : Symbol(execute, Decl(contextuallyTypedParametersWithInitializers1.ts, 67, 66)) +>root : Symbol(root, Decl(contextuallyTypedParametersWithInitializers1.ts, 74, 20)) >HTMLElement : Symbol(HTMLElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) ->debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers.ts, 74, 38)) +>debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers1.ts, 74, 38)) if (debug) { ->debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers.ts, 74, 38)) +>debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers1.ts, 74, 38)) root.innerHTML = ''; >root.innerHTML : Symbol(InnerHTML.innerHTML, Decl(lib.dom.d.ts, --, --)) ->root : Symbol(root, Decl(contextuallyTypedParametersWithInitializers.ts, 74, 20)) +>root : Symbol(root, Decl(contextuallyTypedParametersWithInitializers1.ts, 74, 20)) >innerHTML : Symbol(InnerHTML.innerHTML, Decl(lib.dom.d.ts, --, --)) } }); } const fz1 = (debug = true) => false; ->fz1 : Symbol(fz1, Decl(contextuallyTypedParametersWithInitializers.ts, 81, 5)) ->debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers.ts, 81, 13)) +>fz1 : Symbol(fz1, Decl(contextuallyTypedParametersWithInitializers1.ts, 81, 5)) +>debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers1.ts, 81, 13)) const fz2: Function = (debug = true) => false; ->fz2 : Symbol(fz2, Decl(contextuallyTypedParametersWithInitializers.ts, 82, 5)) +>fz2 : Symbol(fz2, Decl(contextuallyTypedParametersWithInitializers1.ts, 82, 5)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers.ts, 82, 23)) +>debug : Symbol(debug, Decl(contextuallyTypedParametersWithInitializers1.ts, 82, 23)) diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types similarity index 95% rename from tests/baselines/reference/contextuallyTypedParametersWithInitializers.types rename to tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types index e55c3685d7a..5a178b7bb7e 100644 --- a/tests/baselines/reference/contextuallyTypedParametersWithInitializers.types +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers1.types @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers.ts] //// +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers1.ts] //// -=== contextuallyTypedParametersWithInitializers.ts === +=== contextuallyTypedParametersWithInitializers1.ts === declare function id1(input: T): T; >id1 : (input: T) => T >input : T diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.symbols b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.symbols new file mode 100644 index 00000000000..53a8082c893 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.symbols @@ -0,0 +1,58 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers2.ts] //// + +=== contextuallyTypedParametersWithInitializers2.ts === +declare function test1< +>test1 : Symbol(test1, Decl(contextuallyTypedParametersWithInitializers2.ts, 0, 0)) + + TContext, +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers2.ts, 0, 23)) + + TMethods extends Record unknown>, +>TMethods : Symbol(TMethods, Decl(contextuallyTypedParametersWithInitializers2.ts, 1, 11)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>ctx : Symbol(ctx, Decl(contextuallyTypedParametersWithInitializers2.ts, 2, 35)) +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers2.ts, 0, 23)) +>args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers2.ts, 2, 49)) + +>(context: TContext, methods: TMethods): void; +>context : Symbol(context, Decl(contextuallyTypedParametersWithInitializers2.ts, 3, 2)) +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers2.ts, 0, 23)) +>methods : Symbol(methods, Decl(contextuallyTypedParametersWithInitializers2.ts, 3, 20)) +>TMethods : Symbol(TMethods, Decl(contextuallyTypedParametersWithInitializers2.ts, 1, 11)) + +test1( +>test1 : Symbol(test1, Decl(contextuallyTypedParametersWithInitializers2.ts, 0, 0)) + { + count: 0, +>count : Symbol(count, Decl(contextuallyTypedParametersWithInitializers2.ts, 6, 3)) + + }, + { + checkLimit: (ctx, max = 500) => {}, +>checkLimit : Symbol(checkLimit, Decl(contextuallyTypedParametersWithInitializers2.ts, 9, 3)) +>ctx : Symbol(ctx, Decl(contextuallyTypedParametersWithInitializers2.ts, 10, 17)) +>max : Symbol(max, Decl(contextuallyTypedParametersWithInitializers2.ts, 10, 21)) + + hasAccess: (ctx, user: { name: string }) => {}, +>hasAccess : Symbol(hasAccess, Decl(contextuallyTypedParametersWithInitializers2.ts, 10, 39)) +>ctx : Symbol(ctx, Decl(contextuallyTypedParametersWithInitializers2.ts, 11, 16)) +>user : Symbol(user, Decl(contextuallyTypedParametersWithInitializers2.ts, 11, 20)) +>name : Symbol(name, Decl(contextuallyTypedParametersWithInitializers2.ts, 11, 28)) + + }, +); + +declare const num: number; +>num : Symbol(num, Decl(contextuallyTypedParametersWithInitializers2.ts, 15, 13)) + +const test2: (arg: 1 | 2) => void = (arg = num) => {}; +>test2 : Symbol(test2, Decl(contextuallyTypedParametersWithInitializers2.ts, 16, 5)) +>arg : Symbol(arg, Decl(contextuallyTypedParametersWithInitializers2.ts, 16, 14)) +>arg : Symbol(arg, Decl(contextuallyTypedParametersWithInitializers2.ts, 16, 37)) +>num : Symbol(num, Decl(contextuallyTypedParametersWithInitializers2.ts, 15, 13)) + +const test3: (arg: number) => void = (arg = 1) => {}; +>test3 : Symbol(test3, Decl(contextuallyTypedParametersWithInitializers2.ts, 18, 5)) +>arg : Symbol(arg, Decl(contextuallyTypedParametersWithInitializers2.ts, 18, 14)) +>arg : Symbol(arg, Decl(contextuallyTypedParametersWithInitializers2.ts, 18, 38)) + diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types new file mode 100644 index 00000000000..cc18f89dd35 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers2.types @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers2.ts] //// + +=== contextuallyTypedParametersWithInitializers2.ts === +declare function test1< +>test1 : unknown>>(context: TContext, methods: TMethods) => void + + TContext, + TMethods extends Record unknown>, +>ctx : TContext +>args : never[] + +>(context: TContext, methods: TMethods): void; +>context : TContext +>methods : TMethods + +test1( +>test1( { count: 0, }, { checkLimit: (ctx, max = 500) => {}, hasAccess: (ctx, user: { name: string }) => {}, },) : void +>test1 : unknown>>(context: TContext, methods: TMethods) => void + { +>{ count: 0, } : { count: number; } + + count: 0, +>count : number +>0 : 0 + + }, + { +>{ checkLimit: (ctx, max = 500) => {}, hasAccess: (ctx, user: { name: string }) => {}, } : { checkLimit: (ctx: { count: number; }, max?: number) => void; hasAccess: (ctx: { count: number; }, user: { name: string;}) => void; } + + checkLimit: (ctx, max = 500) => {}, +>checkLimit : (ctx: { count: number; }, max?: number) => void +>(ctx, max = 500) => {} : (ctx: { count: number; }, max?: number) => void +>ctx : { count: number; } +>max : number +>500 : 500 + + hasAccess: (ctx, user: { name: string }) => {}, +>hasAccess : (ctx: { count: number; }, user: { name: string;}) => void +>(ctx, user: { name: string }) => {} : (ctx: { count: number; }, user: { name: string;}) => void +>ctx : { count: number; } +>user : { name: string; } +>name : string + + }, +); + +declare const num: number; +>num : number + +const test2: (arg: 1 | 2) => void = (arg = num) => {}; +>test2 : (arg: 1 | 2) => void +>arg : 1 | 2 +>(arg = num) => {} : (arg?: number) => void +>arg : number +>num : number + +const test3: (arg: number) => void = (arg = 1) => {}; +>test3 : (arg: number) => void +>arg : number +>(arg = 1) => {} : (arg?: number) => void +>arg : number +>1 : 1 + diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.symbols b/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.symbols new file mode 100644 index 00000000000..5e59d656f61 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.symbols @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers3.ts] //// + +=== contextuallyTypedParametersWithInitializers3.ts === +type CanvasDirection = "RIGHT" | "LEFT"; +>CanvasDirection : Symbol(CanvasDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 0, 0)) + +interface GraphActions { +>GraphActions : Symbol(GraphActions, Decl(contextuallyTypedParametersWithInitializers3.ts, 0, 40)) + + setDirection: (direction: CanvasDirection) => void; +>setDirection : Symbol(GraphActions.setDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 2, 24)) +>direction : Symbol(direction, Decl(contextuallyTypedParametersWithInitializers3.ts, 3, 17)) +>CanvasDirection : Symbol(CanvasDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 0, 0)) +} + +export declare function create(config: T): void; +>create : Symbol(create, Decl(contextuallyTypedParametersWithInitializers3.ts, 4, 1)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers3.ts, 6, 31)) +>config : Symbol(config, Decl(contextuallyTypedParametersWithInitializers3.ts, 6, 34)) +>T : Symbol(T, Decl(contextuallyTypedParametersWithInitializers3.ts, 6, 31)) + +declare function takesDirection(direction: CanvasDirection): void; +>takesDirection : Symbol(takesDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 6, 51)) +>direction : Symbol(direction, Decl(contextuallyTypedParametersWithInitializers3.ts, 8, 32)) +>CanvasDirection : Symbol(CanvasDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 0, 0)) + +create({ +>create : Symbol(create, Decl(contextuallyTypedParametersWithInitializers3.ts, 4, 1)) +>GraphActions : Symbol(GraphActions, Decl(contextuallyTypedParametersWithInitializers3.ts, 0, 40)) + + setDirection: (direction = "RIGHT") => { +>setDirection : Symbol(setDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 10, 22)) +>direction : Symbol(direction, Decl(contextuallyTypedParametersWithInitializers3.ts, 11, 17)) + + takesDirection(direction); +>takesDirection : Symbol(takesDirection, Decl(contextuallyTypedParametersWithInitializers3.ts, 6, 51)) +>direction : Symbol(direction, Decl(contextuallyTypedParametersWithInitializers3.ts, 11, 17)) + + }, +}); diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.types new file mode 100644 index 00000000000..096e964c7a1 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers3.types @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers3.ts] //// + +=== contextuallyTypedParametersWithInitializers3.ts === +type CanvasDirection = "RIGHT" | "LEFT"; +>CanvasDirection : "RIGHT" | "LEFT" + +interface GraphActions { + setDirection: (direction: CanvasDirection) => void; +>setDirection : (direction: CanvasDirection) => void +>direction : CanvasDirection +} + +export declare function create(config: T): void; +>create : (config: T) => void +>config : T + +declare function takesDirection(direction: CanvasDirection): void; +>takesDirection : (direction: CanvasDirection) => void +>direction : CanvasDirection + +create({ +>create({ setDirection: (direction = "RIGHT") => { takesDirection(direction); },}) : void +>create : (config: T) => void +>{ setDirection: (direction = "RIGHT") => { takesDirection(direction); },} : { setDirection: (direction?: CanvasDirection) => void; } + + setDirection: (direction = "RIGHT") => { +>setDirection : (direction?: CanvasDirection) => void +>(direction = "RIGHT") => { takesDirection(direction); } : (direction?: CanvasDirection) => void +>direction : CanvasDirection +>"RIGHT" : "RIGHT" + + takesDirection(direction); +>takesDirection(direction) : void +>takesDirection : (direction: CanvasDirection) => void +>direction : CanvasDirection + + }, +}); diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.symbols b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.symbols new file mode 100644 index 00000000000..9f003f9d3ca --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.symbols @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers4.ts] //// + +=== contextuallyTypedParametersWithInitializers4.ts === +declare function test< +>test : Symbol(test, Decl(contextuallyTypedParametersWithInitializers4.ts, 0, 0)) + + TContext, +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers4.ts, 0, 22)) + + TMethods extends Record unknown>, +>TMethods : Symbol(TMethods, Decl(contextuallyTypedParametersWithInitializers4.ts, 1, 11)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>ctx : Symbol(ctx, Decl(contextuallyTypedParametersWithInitializers4.ts, 2, 35)) +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers4.ts, 0, 22)) +>args : Symbol(args, Decl(contextuallyTypedParametersWithInitializers4.ts, 2, 49)) + +>(context: TContext, methods: TMethods): void; +>context : Symbol(context, Decl(contextuallyTypedParametersWithInitializers4.ts, 3, 2)) +>TContext : Symbol(TContext, Decl(contextuallyTypedParametersWithInitializers4.ts, 0, 22)) +>methods : Symbol(methods, Decl(contextuallyTypedParametersWithInitializers4.ts, 3, 20)) +>TMethods : Symbol(TMethods, Decl(contextuallyTypedParametersWithInitializers4.ts, 1, 11)) + +test( +>test : Symbol(test, Decl(contextuallyTypedParametersWithInitializers4.ts, 0, 0)) + { + count: 0, +>count : Symbol(count, Decl(contextuallyTypedParametersWithInitializers4.ts, 6, 3)) + + }, + { + checkLimit: (ctx, max = 3) => {}, +>checkLimit : Symbol(checkLimit, Decl(contextuallyTypedParametersWithInitializers4.ts, 9, 3)) +>ctx : Symbol(ctx, Decl(contextuallyTypedParametersWithInitializers4.ts, 10, 17)) +>max : Symbol(max, Decl(contextuallyTypedParametersWithInitializers4.ts, 10, 21)) + + }, +); + diff --git a/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types new file mode 100644 index 00000000000..66dd8aa5328 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypedParametersWithInitializers4.types @@ -0,0 +1,39 @@ +//// [tests/cases/compiler/contextuallyTypedParametersWithInitializers4.ts] //// + +=== contextuallyTypedParametersWithInitializers4.ts === +declare function test< +>test : unknown>>(context: TContext, methods: TMethods) => void + + TContext, + TMethods extends Record unknown>, +>ctx : TContext +>args : (1 | 2)[] + +>(context: TContext, methods: TMethods): void; +>context : TContext +>methods : TMethods + +test( +>test( { count: 0, }, { checkLimit: (ctx, max = 3) => {}, },) : void +>test : unknown>>(context: TContext, methods: TMethods) => void + { +>{ count: 0, } : { count: number; } + + count: 0, +>count : number +>0 : 0 + + }, + { +>{ checkLimit: (ctx, max = 3) => {}, } : { checkLimit: (ctx: { count: number; }, max?: number) => void; } + + checkLimit: (ctx, max = 3) => {}, +>checkLimit : (ctx: { count: number; }, max?: number) => void +>(ctx, max = 3) => {} : (ctx: { count: number; }, max?: number) => void +>ctx : { count: number; } +>max : number +>3 : 3 + + }, +); + diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt index 7bb9974f426..4adb70251de 100644 --- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt +++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt @@ -5,7 +5,7 @@ file.tsx(27,64): error TS2769: No overload matches this call. Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. -file.tsx(28,12): error TS2769: No overload matches this call. +file.tsx(28,13): error TS2769: No overload matches this call. Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. @@ -19,7 +19,7 @@ file.tsx(29,43): error TS2769: No overload matches this call. Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. Type '{ extra: true; goTo: "home"; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. -file.tsx(30,12): error TS2769: No overload matches this call. +file.tsx(30,13): error TS2769: No overload matches this call. Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. Property 'goTo' does not exist on type 'IntrinsicAttributes & ButtonProps'. @@ -69,7 +69,7 @@ file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assi !!! error TS2769: Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. !!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. const b2 = {console.log(k)}} extra />; // k has type "left" | "right" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. !!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. @@ -87,7 +87,7 @@ file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assi !!! error TS2769: Type '{ extra: true; goTo: "home"; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. !!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. const b4 = ; // goTo has type "home" | "contact" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. !!! error TS2769: Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. diff --git a/tests/baselines/reference/controlFlowOptionalChain3.errors.txt b/tests/baselines/reference/controlFlowOptionalChain3.errors.txt new file mode 100644 index 00000000000..15a8997f037 --- /dev/null +++ b/tests/baselines/reference/controlFlowOptionalChain3.errors.txt @@ -0,0 +1,49 @@ +controlFlowOptionalChain3.tsx(30,8): error TS18048: 'foo' is possibly 'undefined'. +controlFlowOptionalChain3.tsx(36,31): error TS18048: 'options' is possibly 'undefined'. + + +==== controlFlowOptionalChain3.tsx (2 errors) ==== + /// + + // https://github.com/microsoft/TypeScript/issues/56482 + + import React from "react"; + + interface Foo { + bar: boolean; + } + + function test1(foo: Foo | undefined) { + if (foo?.bar === false) { + foo; + } + foo; + } + + function test2(foo: Foo | undefined) { + if (foo?.bar === false) { + foo; + } else { + foo; + } + } + + function Test3({ foo }: { foo: Foo | undefined }) { + return ( +

+ {foo?.bar === false && "foo"} + {foo.bar ? "true" : "false"} + ~~~ +!!! error TS18048: 'foo' is possibly 'undefined'. +
+ ); + } + + function test4(options?: { a?: boolean; b?: boolean }) { + if (options?.a === false || options.b) { + ~~~~~~~ +!!! error TS18048: 'options' is possibly 'undefined'. + options; + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/controlFlowOptionalChain3.symbols b/tests/baselines/reference/controlFlowOptionalChain3.symbols new file mode 100644 index 00000000000..714e32bd6e1 --- /dev/null +++ b/tests/baselines/reference/controlFlowOptionalChain3.symbols @@ -0,0 +1,98 @@ +//// [tests/cases/conformance/controlFlow/controlFlowOptionalChain3.tsx] //// + +=== controlFlowOptionalChain3.tsx === +/// + +// https://github.com/microsoft/TypeScript/issues/56482 + +import React from "react"; +>React : Symbol(React, Decl(controlFlowOptionalChain3.tsx, 4, 6)) + +interface Foo { +>Foo : Symbol(Foo, Decl(controlFlowOptionalChain3.tsx, 4, 26)) + + bar: boolean; +>bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) +} + +function test1(foo: Foo | undefined) { +>test1 : Symbol(test1, Decl(controlFlowOptionalChain3.tsx, 8, 1)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 10, 15)) +>Foo : Symbol(Foo, Decl(controlFlowOptionalChain3.tsx, 4, 26)) + + if (foo?.bar === false) { +>foo?.bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 10, 15)) +>bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) + + foo; +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 10, 15)) + } + foo; +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 10, 15)) +} + +function test2(foo: Foo | undefined) { +>test2 : Symbol(test2, Decl(controlFlowOptionalChain3.tsx, 15, 1)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 17, 15)) +>Foo : Symbol(Foo, Decl(controlFlowOptionalChain3.tsx, 4, 26)) + + if (foo?.bar === false) { +>foo?.bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 17, 15)) +>bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) + + foo; +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 17, 15)) + + } else { + foo; +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 17, 15)) + } +} + +function Test3({ foo }: { foo: Foo | undefined }) { +>Test3 : Symbol(Test3, Decl(controlFlowOptionalChain3.tsx, 23, 1)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 25, 16)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 25, 25)) +>Foo : Symbol(Foo, Decl(controlFlowOptionalChain3.tsx, 4, 26)) + + return ( +
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + + {foo?.bar === false && "foo"} +>foo?.bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 25, 16)) +>bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) + + {foo.bar ? "true" : "false"} +>foo.bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) +>foo : Symbol(foo, Decl(controlFlowOptionalChain3.tsx, 25, 16)) +>bar : Symbol(Foo.bar, Decl(controlFlowOptionalChain3.tsx, 6, 15)) + +
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + + ); +} + +function test4(options?: { a?: boolean; b?: boolean }) { +>test4 : Symbol(test4, Decl(controlFlowOptionalChain3.tsx, 32, 1)) +>options : Symbol(options, Decl(controlFlowOptionalChain3.tsx, 34, 15)) +>a : Symbol(a, Decl(controlFlowOptionalChain3.tsx, 34, 26)) +>b : Symbol(b, Decl(controlFlowOptionalChain3.tsx, 34, 39)) + + if (options?.a === false || options.b) { +>options?.a : Symbol(a, Decl(controlFlowOptionalChain3.tsx, 34, 26)) +>options : Symbol(options, Decl(controlFlowOptionalChain3.tsx, 34, 15)) +>a : Symbol(a, Decl(controlFlowOptionalChain3.tsx, 34, 26)) +>options.b : Symbol(b, Decl(controlFlowOptionalChain3.tsx, 34, 39)) +>options : Symbol(options, Decl(controlFlowOptionalChain3.tsx, 34, 15)) +>b : Symbol(b, Decl(controlFlowOptionalChain3.tsx, 34, 39)) + + options; +>options : Symbol(options, Decl(controlFlowOptionalChain3.tsx, 34, 15)) + } +} + diff --git a/tests/baselines/reference/controlFlowOptionalChain3.types b/tests/baselines/reference/controlFlowOptionalChain3.types new file mode 100644 index 00000000000..2ef7dc502c0 --- /dev/null +++ b/tests/baselines/reference/controlFlowOptionalChain3.types @@ -0,0 +1,110 @@ +//// [tests/cases/conformance/controlFlow/controlFlowOptionalChain3.tsx] //// + +=== controlFlowOptionalChain3.tsx === +/// + +// https://github.com/microsoft/TypeScript/issues/56482 + +import React from "react"; +>React : typeof React + +interface Foo { + bar: boolean; +>bar : boolean +} + +function test1(foo: Foo | undefined) { +>test1 : (foo: Foo | undefined) => void +>foo : Foo | undefined + + if (foo?.bar === false) { +>foo?.bar === false : boolean +>foo?.bar : boolean | undefined +>foo : Foo | undefined +>bar : boolean | undefined +>false : false + + foo; +>foo : Foo + } + foo; +>foo : Foo | undefined +} + +function test2(foo: Foo | undefined) { +>test2 : (foo: Foo | undefined) => void +>foo : Foo | undefined + + if (foo?.bar === false) { +>foo?.bar === false : boolean +>foo?.bar : boolean | undefined +>foo : Foo | undefined +>bar : boolean | undefined +>false : false + + foo; +>foo : Foo + + } else { + foo; +>foo : Foo | undefined + } +} + +function Test3({ foo }: { foo: Foo | undefined }) { +>Test3 : ({ foo }: { foo: Foo | undefined; }) => JSX.Element +>foo : Foo | undefined +>foo : Foo | undefined + + return ( +>(
{foo?.bar === false && "foo"} {foo.bar ? "true" : "false"}
) : JSX.Element + +
+>
{foo?.bar === false && "foo"} {foo.bar ? "true" : "false"}
: JSX.Element +>div : any + + {foo?.bar === false && "foo"} +>foo?.bar === false && "foo" : false | "foo" +>foo?.bar === false : boolean +>foo?.bar : boolean | undefined +>foo : Foo | undefined +>bar : boolean | undefined +>false : false +>"foo" : "foo" + + {foo.bar ? "true" : "false"} +>foo.bar ? "true" : "false" : "false" | "true" +>foo.bar : boolean +>foo : Foo | undefined +>bar : boolean +>"true" : "true" +>"false" : "false" + +
+>div : any + + ); +} + +function test4(options?: { a?: boolean; b?: boolean }) { +>test4 : (options?: { a?: boolean; b?: boolean;}) => void +>options : { a?: boolean | undefined; b?: boolean | undefined; } | undefined +>a : boolean | undefined +>b : boolean | undefined + + if (options?.a === false || options.b) { +>options?.a === false || options.b : boolean | undefined +>options?.a === false : boolean +>options?.a : boolean | undefined +>options : { a?: boolean | undefined; b?: boolean | undefined; } | undefined +>a : boolean | undefined +>false : false +>options.b : boolean | undefined +>options : { a?: boolean | undefined; b?: boolean | undefined; } | undefined +>b : boolean | undefined + + options; +>options : { a?: boolean | undefined; b?: boolean | undefined; } | undefined + } +} + diff --git a/tests/baselines/reference/covariantCallbacks.errors.txt b/tests/baselines/reference/covariantCallbacks.errors.txt index 5de161c1ab5..7a9e34234fc 100644 --- a/tests/baselines/reference/covariantCallbacks.errors.txt +++ b/tests/baselines/reference/covariantCallbacks.errors.txt @@ -23,9 +23,18 @@ covariantCallbacks.ts(69,5): error TS2322: Type 'AList4' is not assignable to ty Types of parameters 'cb' and 'cb' are incompatible. Types of parameters 'item' and 'item' are incompatible. Type 'A' is not assignable to type 'B'. +covariantCallbacks.ts(98,1): error TS2322: Type 'SetLike1<(x: string) => void>' is not assignable to type 'SetLike1<(x: unknown) => void>'. + Type '(x: string) => void' is not assignable to type '(x: unknown) => void'. + Types of parameters 'x' and 'x' are incompatible. + Type 'unknown' is not assignable to type 'string'. +covariantCallbacks.ts(106,1): error TS2322: Type 'SetLike2<(x: string) => void>' is not assignable to type 'SetLike1<(x: unknown) => void>'. + The types returned by 'get()' are incompatible between these types. + Type '(x: string) => void' is not assignable to type '(x: unknown) => void'. + Types of parameters 'x' and 'x' are incompatible. + Type 'unknown' is not assignable to type 'string'. -==== covariantCallbacks.ts (6 errors) ==== +==== covariantCallbacks.ts (8 errors) ==== // Test that callback parameters are related covariantly interface P { @@ -128,4 +137,52 @@ covariantCallbacks.ts(69,5): error TS2322: Type 'AList4' is not assignable to ty !!! error TS2322: Types of parameters 'item' and 'item' are incompatible. !!! error TS2322: Type 'A' is not assignable to type 'B'. } + + // Repro from #51620 + + type Bivar = { set(value: T): void } + + declare let bu: Bivar; + declare let bs: Bivar; + bu = bs; + bs = bu; + + declare let bfu: Bivar<(x: unknown) => void>; + declare let bfs: Bivar<(x: string) => void>; + bfu = bfs; + bfs = bfu; + + type Bivar1 = { set(value: T): void } + type Bivar2 = { set(value: T): void } + + declare let b1fu: Bivar1<(x: unknown) => void>; + declare let b2fs: Bivar2<(x: string) => void>; + b1fu = b2fs; + b2fs = b1fu; + + type SetLike = { set(value: T): void, get(): T } + + declare let sx: SetLike1<(x: unknown) => void>; + declare let sy: SetLike1<(x: string) => void>; + sx = sy; // Error + ~~ +!!! error TS2322: Type 'SetLike1<(x: string) => void>' is not assignable to type 'SetLike1<(x: unknown) => void>'. +!!! error TS2322: Type '(x: string) => void' is not assignable to type '(x: unknown) => void'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type 'unknown' is not assignable to type 'string'. + sy = sx; + + type SetLike1 = { set(value: T): void, get(): T } + type SetLike2 = { set(value: T): void, get(): T } + + declare let s1: SetLike1<(x: unknown) => void>; + declare let s2: SetLike2<(x: string) => void>; + s1 = s2; // Error + ~~ +!!! error TS2322: Type 'SetLike2<(x: string) => void>' is not assignable to type 'SetLike1<(x: unknown) => void>'. +!!! error TS2322: The types returned by 'get()' are incompatible between these types. +!!! error TS2322: Type '(x: string) => void' is not assignable to type '(x: unknown) => void'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type 'unknown' is not assignable to type 'string'. + s2 = s1; \ No newline at end of file diff --git a/tests/baselines/reference/covariantCallbacks.js b/tests/baselines/reference/covariantCallbacks.js index 38578f1af5c..226e7d3ab55 100644 --- a/tests/baselines/reference/covariantCallbacks.js +++ b/tests/baselines/reference/covariantCallbacks.js @@ -71,6 +71,43 @@ function f14(a: AList4, b: BList4) { a = b; b = a; // Error } + +// Repro from #51620 + +type Bivar = { set(value: T): void } + +declare let bu: Bivar; +declare let bs: Bivar; +bu = bs; +bs = bu; + +declare let bfu: Bivar<(x: unknown) => void>; +declare let bfs: Bivar<(x: string) => void>; +bfu = bfs; +bfs = bfu; + +type Bivar1 = { set(value: T): void } +type Bivar2 = { set(value: T): void } + +declare let b1fu: Bivar1<(x: unknown) => void>; +declare let b2fs: Bivar2<(x: string) => void>; +b1fu = b2fs; +b2fs = b1fu; + +type SetLike = { set(value: T): void, get(): T } + +declare let sx: SetLike1<(x: unknown) => void>; +declare let sy: SetLike1<(x: string) => void>; +sx = sy; // Error +sy = sx; + +type SetLike1 = { set(value: T): void, get(): T } +type SetLike2 = { set(value: T): void, get(): T } + +declare let s1: SetLike1<(x: unknown) => void>; +declare let s2: SetLike2<(x: string) => void>; +s1 = s2; // Error +s2 = s1; //// [covariantCallbacks.js] @@ -101,3 +138,13 @@ function f14(a, b) { a = b; b = a; // Error } +bu = bs; +bs = bu; +bfu = bfs; +bfs = bfu; +b1fu = b2fs; +b2fs = b1fu; +sx = sy; // Error +sy = sx; +s1 = s2; // Error +s2 = s1; diff --git a/tests/baselines/reference/covariantCallbacks.symbols b/tests/baselines/reference/covariantCallbacks.symbols index c710196e50b..ca168fca246 100644 --- a/tests/baselines/reference/covariantCallbacks.symbols +++ b/tests/baselines/reference/covariantCallbacks.symbols @@ -207,3 +207,141 @@ function f14(a: AList4, b: BList4) { >a : Symbol(a, Decl(covariantCallbacks.ts, 66, 13)) } +// Repro from #51620 + +type Bivar = { set(value: T): void } +>Bivar : Symbol(Bivar, Decl(covariantCallbacks.ts, 69, 1)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 73, 11)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 73, 17)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 73, 22)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 73, 11)) + +declare let bu: Bivar; +>bu : Symbol(bu, Decl(covariantCallbacks.ts, 75, 11)) +>Bivar : Symbol(Bivar, Decl(covariantCallbacks.ts, 69, 1)) + +declare let bs: Bivar; +>bs : Symbol(bs, Decl(covariantCallbacks.ts, 76, 11)) +>Bivar : Symbol(Bivar, Decl(covariantCallbacks.ts, 69, 1)) + +bu = bs; +>bu : Symbol(bu, Decl(covariantCallbacks.ts, 75, 11)) +>bs : Symbol(bs, Decl(covariantCallbacks.ts, 76, 11)) + +bs = bu; +>bs : Symbol(bs, Decl(covariantCallbacks.ts, 76, 11)) +>bu : Symbol(bu, Decl(covariantCallbacks.ts, 75, 11)) + +declare let bfu: Bivar<(x: unknown) => void>; +>bfu : Symbol(bfu, Decl(covariantCallbacks.ts, 80, 11)) +>Bivar : Symbol(Bivar, Decl(covariantCallbacks.ts, 69, 1)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 80, 24)) + +declare let bfs: Bivar<(x: string) => void>; +>bfs : Symbol(bfs, Decl(covariantCallbacks.ts, 81, 11)) +>Bivar : Symbol(Bivar, Decl(covariantCallbacks.ts, 69, 1)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 81, 24)) + +bfu = bfs; +>bfu : Symbol(bfu, Decl(covariantCallbacks.ts, 80, 11)) +>bfs : Symbol(bfs, Decl(covariantCallbacks.ts, 81, 11)) + +bfs = bfu; +>bfs : Symbol(bfs, Decl(covariantCallbacks.ts, 81, 11)) +>bfu : Symbol(bfu, Decl(covariantCallbacks.ts, 80, 11)) + +type Bivar1 = { set(value: T): void } +>Bivar1 : Symbol(Bivar1, Decl(covariantCallbacks.ts, 83, 10)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 85, 12)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 85, 18)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 85, 23)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 85, 12)) + +type Bivar2 = { set(value: T): void } +>Bivar2 : Symbol(Bivar2, Decl(covariantCallbacks.ts, 85, 40)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 86, 12)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 86, 18)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 86, 23)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 86, 12)) + +declare let b1fu: Bivar1<(x: unknown) => void>; +>b1fu : Symbol(b1fu, Decl(covariantCallbacks.ts, 88, 11)) +>Bivar1 : Symbol(Bivar1, Decl(covariantCallbacks.ts, 83, 10)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 88, 26)) + +declare let b2fs: Bivar2<(x: string) => void>; +>b2fs : Symbol(b2fs, Decl(covariantCallbacks.ts, 89, 11)) +>Bivar2 : Symbol(Bivar2, Decl(covariantCallbacks.ts, 85, 40)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 89, 26)) + +b1fu = b2fs; +>b1fu : Symbol(b1fu, Decl(covariantCallbacks.ts, 88, 11)) +>b2fs : Symbol(b2fs, Decl(covariantCallbacks.ts, 89, 11)) + +b2fs = b1fu; +>b2fs : Symbol(b2fs, Decl(covariantCallbacks.ts, 89, 11)) +>b1fu : Symbol(b1fu, Decl(covariantCallbacks.ts, 88, 11)) + +type SetLike = { set(value: T): void, get(): T } +>SetLike : Symbol(SetLike, Decl(covariantCallbacks.ts, 91, 12)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 93, 13)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 93, 19)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 93, 24)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 93, 13)) +>get : Symbol(get, Decl(covariantCallbacks.ts, 93, 40)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 93, 13)) + +declare let sx: SetLike1<(x: unknown) => void>; +>sx : Symbol(sx, Decl(covariantCallbacks.ts, 95, 11)) +>SetLike1 : Symbol(SetLike1, Decl(covariantCallbacks.ts, 98, 8)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 95, 26)) + +declare let sy: SetLike1<(x: string) => void>; +>sy : Symbol(sy, Decl(covariantCallbacks.ts, 96, 11)) +>SetLike1 : Symbol(SetLike1, Decl(covariantCallbacks.ts, 98, 8)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 96, 26)) + +sx = sy; // Error +>sx : Symbol(sx, Decl(covariantCallbacks.ts, 95, 11)) +>sy : Symbol(sy, Decl(covariantCallbacks.ts, 96, 11)) + +sy = sx; +>sy : Symbol(sy, Decl(covariantCallbacks.ts, 96, 11)) +>sx : Symbol(sx, Decl(covariantCallbacks.ts, 95, 11)) + +type SetLike1 = { set(value: T): void, get(): T } +>SetLike1 : Symbol(SetLike1, Decl(covariantCallbacks.ts, 98, 8)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 100, 14)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 100, 20)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 100, 25)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 100, 14)) +>get : Symbol(get, Decl(covariantCallbacks.ts, 100, 41)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 100, 14)) + +type SetLike2 = { set(value: T): void, get(): T } +>SetLike2 : Symbol(SetLike2, Decl(covariantCallbacks.ts, 100, 52)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 101, 14)) +>set : Symbol(set, Decl(covariantCallbacks.ts, 101, 20)) +>value : Symbol(value, Decl(covariantCallbacks.ts, 101, 25)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 101, 14)) +>get : Symbol(get, Decl(covariantCallbacks.ts, 101, 41)) +>T : Symbol(T, Decl(covariantCallbacks.ts, 101, 14)) + +declare let s1: SetLike1<(x: unknown) => void>; +>s1 : Symbol(s1, Decl(covariantCallbacks.ts, 103, 11)) +>SetLike1 : Symbol(SetLike1, Decl(covariantCallbacks.ts, 98, 8)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 103, 26)) + +declare let s2: SetLike2<(x: string) => void>; +>s2 : Symbol(s2, Decl(covariantCallbacks.ts, 104, 11)) +>SetLike2 : Symbol(SetLike2, Decl(covariantCallbacks.ts, 100, 52)) +>x : Symbol(x, Decl(covariantCallbacks.ts, 104, 26)) + +s1 = s2; // Error +>s1 : Symbol(s1, Decl(covariantCallbacks.ts, 103, 11)) +>s2 : Symbol(s2, Decl(covariantCallbacks.ts, 104, 11)) + +s2 = s1; +>s2 : Symbol(s2, Decl(covariantCallbacks.ts, 104, 11)) +>s1 : Symbol(s1, Decl(covariantCallbacks.ts, 103, 11)) + diff --git a/tests/baselines/reference/covariantCallbacks.types b/tests/baselines/reference/covariantCallbacks.types index 1b2f082da52..849ff661417 100644 --- a/tests/baselines/reference/covariantCallbacks.types +++ b/tests/baselines/reference/covariantCallbacks.types @@ -170,3 +170,126 @@ function f14(a: AList4, b: BList4) { >a : AList4 } +// Repro from #51620 + +type Bivar = { set(value: T): void } +>Bivar : Bivar +>set : (value: T) => void +>value : T + +declare let bu: Bivar; +>bu : Bivar + +declare let bs: Bivar; +>bs : Bivar + +bu = bs; +>bu = bs : Bivar +>bu : Bivar +>bs : Bivar + +bs = bu; +>bs = bu : Bivar +>bs : Bivar +>bu : Bivar + +declare let bfu: Bivar<(x: unknown) => void>; +>bfu : Bivar<(x: unknown) => void> +>x : unknown + +declare let bfs: Bivar<(x: string) => void>; +>bfs : Bivar<(x: string) => void> +>x : string + +bfu = bfs; +>bfu = bfs : Bivar<(x: string) => void> +>bfu : Bivar<(x: unknown) => void> +>bfs : Bivar<(x: string) => void> + +bfs = bfu; +>bfs = bfu : Bivar<(x: unknown) => void> +>bfs : Bivar<(x: string) => void> +>bfu : Bivar<(x: unknown) => void> + +type Bivar1 = { set(value: T): void } +>Bivar1 : Bivar1 +>set : (value: T) => void +>value : T + +type Bivar2 = { set(value: T): void } +>Bivar2 : Bivar2 +>set : (value: T) => void +>value : T + +declare let b1fu: Bivar1<(x: unknown) => void>; +>b1fu : Bivar1<(x: unknown) => void> +>x : unknown + +declare let b2fs: Bivar2<(x: string) => void>; +>b2fs : Bivar2<(x: string) => void> +>x : string + +b1fu = b2fs; +>b1fu = b2fs : Bivar2<(x: string) => void> +>b1fu : Bivar1<(x: unknown) => void> +>b2fs : Bivar2<(x: string) => void> + +b2fs = b1fu; +>b2fs = b1fu : Bivar1<(x: unknown) => void> +>b2fs : Bivar2<(x: string) => void> +>b1fu : Bivar1<(x: unknown) => void> + +type SetLike = { set(value: T): void, get(): T } +>SetLike : SetLike +>set : (value: T) => void +>value : T +>get : () => T + +declare let sx: SetLike1<(x: unknown) => void>; +>sx : SetLike1<(x: unknown) => void> +>x : unknown + +declare let sy: SetLike1<(x: string) => void>; +>sy : SetLike1<(x: string) => void> +>x : string + +sx = sy; // Error +>sx = sy : SetLike1<(x: string) => void> +>sx : SetLike1<(x: unknown) => void> +>sy : SetLike1<(x: string) => void> + +sy = sx; +>sy = sx : SetLike1<(x: unknown) => void> +>sy : SetLike1<(x: string) => void> +>sx : SetLike1<(x: unknown) => void> + +type SetLike1 = { set(value: T): void, get(): T } +>SetLike1 : SetLike1 +>set : (value: T) => void +>value : T +>get : () => T + +type SetLike2 = { set(value: T): void, get(): T } +>SetLike2 : SetLike2 +>set : (value: T) => void +>value : T +>get : () => T + +declare let s1: SetLike1<(x: unknown) => void>; +>s1 : SetLike1<(x: unknown) => void> +>x : unknown + +declare let s2: SetLike2<(x: string) => void>; +>s2 : SetLike2<(x: string) => void> +>x : string + +s1 = s2; // Error +>s1 = s2 : SetLike2<(x: string) => void> +>s1 : SetLike1<(x: unknown) => void> +>s2 : SetLike2<(x: string) => void> + +s2 = s1; +>s2 = s1 : SetLike1<(x: unknown) => void> +>s2 : SetLike2<(x: string) => void> +>s1 : SetLike1<(x: unknown) => void> + diff --git a/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.symbols b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.symbols new file mode 100644 index 00000000000..90a5600ec5d --- /dev/null +++ b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.symbols @@ -0,0 +1,138 @@ +//// [tests/cases/conformance/controlFlow/dependentDestructuredVariablesFromNestedPatterns.ts] //// + +=== dependentDestructuredVariablesFromNestedPatterns.ts === +function test1(arg: [[undefined, Error] | [number, undefined]]) { +>test1 : Symbol(test1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 0, 0)) +>arg : Symbol(arg, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 0, 15)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2022.error.d.ts, --, --)) + + const [[p1, p1Error]] = arg; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 1, 10)) +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 1, 13)) +>arg : Symbol(arg, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 0, 15)) + + if (p1Error) { +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 1, 13)) + + return; + } + + p1; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 1, 10)) +} + +function test2([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { +>test2 : Symbol(test2, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 8, 1)) +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 10, 17)) +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 10, 20)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2022.error.d.ts, --, --)) + + if (p1Error) { +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 10, 20)) + + return; + } + + p1; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 10, 17)) +} + +async function myAllSettled(fn: () => T) { +>myAllSettled : Symbol(myAllSettled, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 16, 1)) +>T : Symbol(T, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 28)) +>fn : Symbol(fn, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 58)) +>T : Symbol(T, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 28)) + + const promises = await Promise.allSettled(fn()); +>promises : Symbol(promises, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 19, 7)) +>Promise.allSettled : Symbol(PromiseConstructor.allSettled, Decl(lib.es2020.promise.d.ts, --, --), Decl(lib.es2020.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) +>allSettled : Symbol(PromiseConstructor.allSettled, Decl(lib.es2020.promise.d.ts, --, --), Decl(lib.es2020.promise.d.ts, --, --)) +>fn : Symbol(fn, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 58)) + + return promises.map((result) => +>promises.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>promises : Symbol(promises, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 19, 7)) +>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>result : Symbol(result, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 21, 23)) + + result.status === "fulfilled" +>result.status : Symbol(status, Decl(lib.es2020.promise.d.ts, --, --), Decl(lib.es2020.promise.d.ts, --, --)) +>result : Symbol(result, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 21, 23)) +>status : Symbol(status, Decl(lib.es2020.promise.d.ts, --, --), Decl(lib.es2020.promise.d.ts, --, --)) + + ? [result.value, undefined] +>result.value : Symbol(PromiseFulfilledResult.value, Decl(lib.es2020.promise.d.ts, --, --)) +>result : Symbol(result, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 21, 23)) +>value : Symbol(PromiseFulfilledResult.value, Decl(lib.es2020.promise.d.ts, --, --)) +>undefined : Symbol(undefined) + + : [undefined, new Error(String(result.reason))], +>undefined : Symbol(undefined) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2022.error.d.ts, --, --)) +>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --) ... and 6 more) +>result.reason : Symbol(PromiseRejectedResult.reason, Decl(lib.es2020.promise.d.ts, --, --)) +>result : Symbol(result, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 21, 23)) +>reason : Symbol(PromiseRejectedResult.reason, Decl(lib.es2020.promise.d.ts, --, --)) + + ) as { [K in keyof T]: [Awaited, undefined] | [undefined, Error] }; +>K : Symbol(K, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 25, 10)) +>T : Symbol(T, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 28)) +>Awaited : Symbol(Awaited, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 18, 28)) +>K : Symbol(K, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 25, 10)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2022.error.d.ts, --, --)) +} + +async function test3() { +>test3 : Symbol(test3, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 26, 1)) + + const [[p1, p1Error], _] = await myAllSettled( +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 29, 10)) +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 29, 13)) +>_ : Symbol(_, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 29, 23)) +>myAllSettled : Symbol(myAllSettled, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 16, 1)) + + () => [Promise.resolve(0), Promise.reject(1)] as const, +>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) +>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) +>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --)) +>const : Symbol(const) + + ); + + if (p1Error) return; +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 29, 13)) + + p1; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 29, 10)) +} + +function test4([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { +>test4 : Symbol(test4, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 36, 1)) +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 38, 17)) +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 38, 20)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2022.error.d.ts, --, --)) + + if (Math.random()) { +>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) + + p1 = undefined; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 38, 17)) +>undefined : Symbol(undefined) + } + if (p1Error) { +>p1Error : Symbol(p1Error, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 38, 20)) + + return; + } + + p1; +>p1 : Symbol(p1, Decl(dependentDestructuredVariablesFromNestedPatterns.ts, 38, 17)) +} + diff --git a/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types new file mode 100644 index 00000000000..f4b152b6b15 --- /dev/null +++ b/tests/baselines/reference/dependentDestructuredVariablesFromNestedPatterns.types @@ -0,0 +1,150 @@ +//// [tests/cases/conformance/controlFlow/dependentDestructuredVariablesFromNestedPatterns.ts] //// + +=== dependentDestructuredVariablesFromNestedPatterns.ts === +function test1(arg: [[undefined, Error] | [number, undefined]]) { +>test1 : (arg: [[undefined, Error] | [number, undefined]]) => void +>arg : [[undefined, Error] | [number, undefined]] + + const [[p1, p1Error]] = arg; +>p1 : number | undefined +>p1Error : Error | undefined +>arg : [[undefined, Error] | [number, undefined]] + + if (p1Error) { +>p1Error : Error | undefined + + return; + } + + p1; +>p1 : number +} + +function test2([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { +>test2 : ([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) => void +>p1 : number | undefined +>p1Error : Error | undefined + + if (p1Error) { +>p1Error : Error | undefined + + return; + } + + p1; +>p1 : number +} + +async function myAllSettled(fn: () => T) { +>myAllSettled : (fn: () => T) => Promise<{ [K in keyof T]: [undefined, Error] | [Awaited, undefined]; }> +>fn : () => T + + const promises = await Promise.allSettled(fn()); +>promises : { -readonly [P in keyof T]: PromiseSettledResult>; } +>await Promise.allSettled(fn()) : { -readonly [P in keyof T]: PromiseSettledResult>; } +>Promise.allSettled(fn()) : Promise<{ -readonly [P in keyof T]: PromiseSettledResult>; }> +>Promise.allSettled : { (values: T_1): Promise<{ -readonly [P in keyof T_1]: PromiseSettledResult>; }>; (values: Iterable>): Promise>[]>; } +>Promise : PromiseConstructor +>allSettled : { (values: T_1): Promise<{ -readonly [P in keyof T_1]: PromiseSettledResult>; }>; (values: Iterable>): Promise>[]>; } +>fn() : T +>fn : () => T + + return promises.map((result) => +>promises.map((result) => result.status === "fulfilled" ? [result.value, undefined] : [undefined, new Error(String(result.reason))], ) as { [K in keyof T]: [Awaited, undefined] | [undefined, Error] } : { [K in keyof T]: [undefined, Error] | [Awaited, undefined]; } +>promises.map((result) => result.status === "fulfilled" ? [result.value, undefined] : [undefined, new Error(String(result.reason))], ) : ([undefined, Error] | [unknown, undefined])[] +>promises.map : (callbackfn: (value: PromiseSettledResult, index: number, array: PromiseSettledResult[]) => U, thisArg?: any) => U[] +>promises : { -readonly [P in keyof T]: PromiseSettledResult>; } +>map : (callbackfn: (value: PromiseSettledResult, index: number, array: PromiseSettledResult[]) => U, thisArg?: any) => U[] +>(result) => result.status === "fulfilled" ? [result.value, undefined] : [undefined, new Error(String(result.reason))] : (result: PromiseSettledResult) => [undefined, Error] | [unknown, undefined] +>result : PromiseSettledResult + + result.status === "fulfilled" +>result.status === "fulfilled" ? [result.value, undefined] : [undefined, new Error(String(result.reason))] : [unknown, undefined] | [undefined, Error] +>result.status === "fulfilled" : boolean +>result.status : "rejected" | "fulfilled" +>result : PromiseSettledResult +>status : "rejected" | "fulfilled" +>"fulfilled" : "fulfilled" + + ? [result.value, undefined] +>[result.value, undefined] : [unknown, undefined] +>result.value : unknown +>result : PromiseFulfilledResult +>value : unknown +>undefined : undefined + + : [undefined, new Error(String(result.reason))], +>[undefined, new Error(String(result.reason))] : [undefined, Error] +>undefined : undefined +>new Error(String(result.reason)) : Error +>Error : ErrorConstructor +>String(result.reason) : string +>String : StringConstructor +>result.reason : any +>result : PromiseRejectedResult +>reason : any + + ) as { [K in keyof T]: [Awaited, undefined] | [undefined, Error] }; +} + +async function test3() { +>test3 : () => Promise + + const [[p1, p1Error], _] = await myAllSettled( +>p1 : number | undefined +>p1Error : Error | undefined +>_ : [undefined, Error] | [never, undefined] +>await myAllSettled( () => [Promise.resolve(0), Promise.reject(1)] as const, ) : [[undefined, Error] | [number, undefined], [undefined, Error] | [never, undefined]] +>myAllSettled( () => [Promise.resolve(0), Promise.reject(1)] as const, ) : Promise<[[undefined, Error] | [number, undefined], [undefined, Error] | [never, undefined]]> +>myAllSettled : (fn: () => T) => Promise<{ [K in keyof T]: [undefined, Error] | [Awaited, undefined]; }> + + () => [Promise.resolve(0), Promise.reject(1)] as const, +>() => [Promise.resolve(0), Promise.reject(1)] as const : () => [Promise, Promise] +>[Promise.resolve(0), Promise.reject(1)] as const : [Promise, Promise] +>[Promise.resolve(0), Promise.reject(1)] : [Promise, Promise] +>Promise.resolve(0) : Promise +>Promise.resolve : { (): Promise; (value: T): Promise>; (value: T_1 | PromiseLike): Promise>; } +>Promise : PromiseConstructor +>resolve : { (): Promise; (value: T): Promise>; (value: T_1 | PromiseLike): Promise>; } +>0 : 0 +>Promise.reject(1) : Promise +>Promise.reject : (reason?: any) => Promise +>Promise : PromiseConstructor +>reject : (reason?: any) => Promise +>1 : 1 + + ); + + if (p1Error) return; +>p1Error : Error | undefined + + p1; +>p1 : number +} + +function test4([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { +>test4 : ([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) => void +>p1 : number | undefined +>p1Error : Error | undefined + + if (Math.random()) { +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number + + p1 = undefined; +>p1 = undefined : undefined +>p1 : number | undefined +>undefined : undefined + } + if (p1Error) { +>p1Error : Error | undefined + + return; + } + + p1; +>p1 : number | undefined +} + diff --git a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.errors.txt b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.errors.txt index e2eccbd533a..dfe42cc9033 100644 --- a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.errors.txt +++ b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.errors.txt @@ -15,6 +15,6 @@ derivedTypeCallingBaseImplWithOptionalParams.ts(13,3): error TS2554: Expected 1 var y: MyClass = new MyClass(); y.myMethod(); // error - ~~~~~~~~~~ + ~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 derivedTypeCallingBaseImplWithOptionalParams.ts:5:14: An argument for 'myList' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/dissallowSymbolAsWeakType.errors.txt b/tests/baselines/reference/dissallowSymbolAsWeakType.errors.txt index bb5a8b0daf8..67c78efa8cc 100644 --- a/tests/baselines/reference/dissallowSymbolAsWeakType.errors.txt +++ b/tests/baselines/reference/dissallowSymbolAsWeakType.errors.txt @@ -1,4 +1,4 @@ -dissallowSymbolAsWeakType.ts(3,12): error TS2769: No overload matches this call. +dissallowSymbolAsWeakType.ts(3,16): error TS2769: No overload matches this call. Overload 1 of 2, '(iterable: Iterable): WeakSet', gave the following error. Argument of type 'symbol[]' is not assignable to parameter of type 'Iterable'. The types returned by '[Symbol.iterator]().next(...)' are incompatible between these types. @@ -11,7 +11,7 @@ dissallowSymbolAsWeakType.ts(3,12): error TS2769: No overload matches this call. dissallowSymbolAsWeakType.ts(4,8): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'object'. dissallowSymbolAsWeakType.ts(5,8): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'object'. dissallowSymbolAsWeakType.ts(6,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'object'. -dissallowSymbolAsWeakType.ts(8,12): error TS2769: No overload matches this call. +dissallowSymbolAsWeakType.ts(8,16): error TS2769: No overload matches this call. Overload 1 of 2, '(iterable: Iterable): WeakMap', gave the following error. Argument of type '[symbol, false][]' is not assignable to parameter of type 'Iterable'. The types returned by '[Symbol.iterator]().next(...)' are incompatible between these types. @@ -36,7 +36,7 @@ dissallowSymbolAsWeakType.ts(19,14): error TS2345: Argument of type 'symbol' is const s: symbol = Symbol('s'); const ws = new WeakSet([s]); - ~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(iterable: Iterable): WeakSet', gave the following error. !!! error TS2769: Argument of type 'symbol[]' is not assignable to parameter of type 'Iterable'. @@ -58,7 +58,7 @@ dissallowSymbolAsWeakType.ts(19,14): error TS2345: Argument of type 'symbol' is !!! error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'object'. const wm = new WeakMap([[s, false]]); - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(iterable: Iterable): WeakMap', gave the following error. !!! error TS2769: Argument of type '[symbol, false][]' is not assignable to parameter of type 'Iterable'. diff --git a/tests/baselines/reference/distributiveConditionalTypeConstraints.errors.txt b/tests/baselines/reference/distributiveConditionalTypeConstraints.errors.txt new file mode 100644 index 00000000000..dad1774d205 --- /dev/null +++ b/tests/baselines/reference/distributiveConditionalTypeConstraints.errors.txt @@ -0,0 +1,117 @@ +distributiveConditionalTypeConstraints.ts(4,9): error TS2322: Type 'boolean' is not assignable to type 'true'. +distributiveConditionalTypeConstraints.ts(5,9): error TS2322: Type 'boolean' is not assignable to type 'false'. +distributiveConditionalTypeConstraints.ts(10,9): error TS2322: Type 'IsArray' is not assignable to type 'false'. + Type 'true' is not assignable to type 'false'. +distributiveConditionalTypeConstraints.ts(15,9): error TS2322: Type 'IsArray' is not assignable to type 'false'. + Type 'true' is not assignable to type 'false'. +distributiveConditionalTypeConstraints.ts(19,9): error TS2322: Type 'IsArray' is not assignable to type 'true'. + Type 'false' is not assignable to type 'true'. +distributiveConditionalTypeConstraints.ts(38,9): error TS2322: Type 'boolean' is not assignable to type 'false'. + + +==== distributiveConditionalTypeConstraints.ts (6 errors) ==== + type IsArray = T extends unknown[] ? true : false; + + function f1(x: IsArray) { + let t: true = x; // Error + ~ +!!! error TS2322: Type 'boolean' is not assignable to type 'true'. + let f: false = x; // Error + ~ +!!! error TS2322: Type 'boolean' is not assignable to type 'false'. + } + + function f2(x: IsArray) { + let t: true = x; + let f: false = x; // Error + ~ +!!! error TS2322: Type 'IsArray' is not assignable to type 'false'. +!!! error TS2322: Type 'true' is not assignable to type 'false'. + } + + function f3(x: IsArray) { + let t: true = x; + let f: false = x; // Error + ~ +!!! error TS2322: Type 'IsArray' is not assignable to type 'false'. +!!! error TS2322: Type 'true' is not assignable to type 'false'. + } + + function f4(x: IsArray) { + let t: true = x; // Error + ~ +!!! error TS2322: Type 'IsArray' is not assignable to type 'true'. +!!! error TS2322: Type 'false' is not assignable to type 'true'. + let f: false = x; + } + + type ZeroOf = + T extends null ? null : + T extends undefined ? undefined : + T extends string ? "" : + T extends number ? 0 : + T extends boolean ? false : + never; + + function f10(x: ZeroOf) { + let t: "" | 0 | false = x; + } + + type Foo = T extends "abc" | 42 ? true : false; + + function f20(x: Foo) { + let t: false = x; // Error + ~ +!!! error TS2322: Type 'boolean' is not assignable to type 'false'. + } + + // Modified repro from #30152 + + interface A { foo(): void; } + interface B { bar(): void; } + interface C { foo(): void, bar(): void } + + function test1(y: T extends B ? number : string) { + if (typeof y == 'string') { + y; // T extends B ? number : string + } + else { + y; // never + } + const newY: string | number = y; + newY; // string + } + + function test2(y: T extends B ? string : number) { + if (typeof y == 'string') { + y; // never + } + else { + y; // T extends B ? string : number + } + const newY: string | number = y; + newY; // number + } + + function test3(y: T extends C ? number : string) { + if (typeof y == 'string') { + y; // (T extends C ? number : string) & string + } + else { + y; // T extends C ? number : string + } + const newY: string | number = y; + newY; // string | number + } + + function test4(y: T extends C ? string : number) { + if (typeof y == 'string') { + y; // (T extends C ? string : number) & string + } + else { + y; // T extends C ? string : number + } + const newY: string | number = y; + newY; // string | number + } + \ No newline at end of file diff --git a/tests/baselines/reference/distributiveConditionalTypeConstraints.symbols b/tests/baselines/reference/distributiveConditionalTypeConstraints.symbols new file mode 100644 index 00000000000..a94195dd074 --- /dev/null +++ b/tests/baselines/reference/distributiveConditionalTypeConstraints.symbols @@ -0,0 +1,242 @@ +//// [tests/cases/compiler/distributiveConditionalTypeConstraints.ts] //// + +=== distributiveConditionalTypeConstraints.ts === +type IsArray = T extends unknown[] ? true : false; +>IsArray : Symbol(IsArray, Decl(distributiveConditionalTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 0, 13)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 0, 13)) + +function f1(x: IsArray) { +>f1 : Symbol(f1, Decl(distributiveConditionalTypeConstraints.ts, 0, 53)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 2, 12)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 2, 30)) +>IsArray : Symbol(IsArray, Decl(distributiveConditionalTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 2, 12)) + + let t: true = x; // Error +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 3, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 2, 30)) + + let f: false = x; // Error +>f : Symbol(f, Decl(distributiveConditionalTypeConstraints.ts, 4, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 2, 30)) +} + +function f2(x: IsArray) { +>f2 : Symbol(f2, Decl(distributiveConditionalTypeConstraints.ts, 5, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 7, 12)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 7, 33)) +>IsArray : Symbol(IsArray, Decl(distributiveConditionalTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 7, 12)) + + let t: true = x; +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 8, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 7, 33)) + + let f: false = x; // Error +>f : Symbol(f, Decl(distributiveConditionalTypeConstraints.ts, 9, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 7, 33)) +} + +function f3(x: IsArray) { +>f3 : Symbol(f3, Decl(distributiveConditionalTypeConstraints.ts, 10, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 12, 12)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 12, 32)) +>IsArray : Symbol(IsArray, Decl(distributiveConditionalTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 12, 12)) + + let t: true = x; +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 13, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 12, 32)) + + let f: false = x; // Error +>f : Symbol(f, Decl(distributiveConditionalTypeConstraints.ts, 14, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 12, 32)) +} + +function f4(x: IsArray) { +>f4 : Symbol(f4, Decl(distributiveConditionalTypeConstraints.ts, 15, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 17, 12)) +>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 17, 32)) +>IsArray : Symbol(IsArray, Decl(distributiveConditionalTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 17, 12)) + + let t: true = x; // Error +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 18, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 17, 32)) + + let f: false = x; +>f : Symbol(f, Decl(distributiveConditionalTypeConstraints.ts, 19, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 17, 32)) +} + +type ZeroOf = +>ZeroOf : Symbol(ZeroOf, Decl(distributiveConditionalTypeConstraints.ts, 20, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + T extends null ? null : +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + T extends undefined ? undefined : +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + T extends string ? "" : +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + T extends number ? 0 : +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + T extends boolean ? false : +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 22, 12)) + + never; + +function f10(x: ZeroOf) { +>f10 : Symbol(f10, Decl(distributiveConditionalTypeConstraints.ts, 28, 10)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 30, 13)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 30, 27)) +>ZeroOf : Symbol(ZeroOf, Decl(distributiveConditionalTypeConstraints.ts, 20, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 30, 13)) + + let t: "" | 0 | false = x; +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 31, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 30, 27)) +} + +type Foo = T extends "abc" | 42 ? true : false; +>Foo : Symbol(Foo, Decl(distributiveConditionalTypeConstraints.ts, 32, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 34, 9)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 34, 9)) + +function f20(x: Foo) { +>f20 : Symbol(f20, Decl(distributiveConditionalTypeConstraints.ts, 34, 50)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 36, 13)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 36, 31)) +>Foo : Symbol(Foo, Decl(distributiveConditionalTypeConstraints.ts, 32, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 36, 13)) + + let t: false = x; // Error +>t : Symbol(t, Decl(distributiveConditionalTypeConstraints.ts, 37, 7)) +>x : Symbol(x, Decl(distributiveConditionalTypeConstraints.ts, 36, 31)) +} + +// Modified repro from #30152 + +interface A { foo(): void; } +>A : Symbol(A, Decl(distributiveConditionalTypeConstraints.ts, 38, 1)) +>foo : Symbol(A.foo, Decl(distributiveConditionalTypeConstraints.ts, 42, 13)) + +interface B { bar(): void; } +>B : Symbol(B, Decl(distributiveConditionalTypeConstraints.ts, 42, 28)) +>bar : Symbol(B.bar, Decl(distributiveConditionalTypeConstraints.ts, 43, 13)) + +interface C { foo(): void, bar(): void } +>C : Symbol(C, Decl(distributiveConditionalTypeConstraints.ts, 43, 28)) +>foo : Symbol(C.foo, Decl(distributiveConditionalTypeConstraints.ts, 44, 13)) +>bar : Symbol(C.bar, Decl(distributiveConditionalTypeConstraints.ts, 44, 26)) + +function test1(y: T extends B ? number : string) { +>test1 : Symbol(test1, Decl(distributiveConditionalTypeConstraints.ts, 44, 40)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 46, 15)) +>A : Symbol(A, Decl(distributiveConditionalTypeConstraints.ts, 38, 1)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 46, 28)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 46, 15)) +>B : Symbol(B, Decl(distributiveConditionalTypeConstraints.ts, 42, 28)) + + if (typeof y == 'string') { +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 46, 28)) + + y; // T extends B ? number : string +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 46, 28)) + } + else { + y; // never +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 46, 28)) + } + const newY: string | number = y; +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 53, 9)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 46, 28)) + + newY; // string +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 53, 9)) +} + +function test2(y: T extends B ? string : number) { +>test2 : Symbol(test2, Decl(distributiveConditionalTypeConstraints.ts, 55, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 57, 15)) +>A : Symbol(A, Decl(distributiveConditionalTypeConstraints.ts, 38, 1)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 57, 28)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 57, 15)) +>B : Symbol(B, Decl(distributiveConditionalTypeConstraints.ts, 42, 28)) + + if (typeof y == 'string') { +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 57, 28)) + + y; // never +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 57, 28)) + } + else { + y; // T extends B ? string : number +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 57, 28)) + } + const newY: string | number = y; +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 64, 9)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 57, 28)) + + newY; // number +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 64, 9)) +} + +function test3(y: T extends C ? number : string) { +>test3 : Symbol(test3, Decl(distributiveConditionalTypeConstraints.ts, 66, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 68, 15)) +>A : Symbol(A, Decl(distributiveConditionalTypeConstraints.ts, 38, 1)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 68, 28)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 68, 15)) +>C : Symbol(C, Decl(distributiveConditionalTypeConstraints.ts, 43, 28)) + + if (typeof y == 'string') { +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 68, 28)) + + y; // (T extends C ? number : string) & string +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 68, 28)) + } + else { + y; // T extends C ? number : string +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 68, 28)) + } + const newY: string | number = y; +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 75, 9)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 68, 28)) + + newY; // string | number +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 75, 9)) +} + +function test4(y: T extends C ? string : number) { +>test4 : Symbol(test4, Decl(distributiveConditionalTypeConstraints.ts, 77, 1)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 79, 15)) +>A : Symbol(A, Decl(distributiveConditionalTypeConstraints.ts, 38, 1)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 79, 28)) +>T : Symbol(T, Decl(distributiveConditionalTypeConstraints.ts, 79, 15)) +>C : Symbol(C, Decl(distributiveConditionalTypeConstraints.ts, 43, 28)) + + if (typeof y == 'string') { +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 79, 28)) + + y; // (T extends C ? string : number) & string +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 79, 28)) + } + else { + y; // T extends C ? string : number +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 79, 28)) + } + const newY: string | number = y; +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 86, 9)) +>y : Symbol(y, Decl(distributiveConditionalTypeConstraints.ts, 79, 28)) + + newY; // string | number +>newY : Symbol(newY, Decl(distributiveConditionalTypeConstraints.ts, 86, 9)) +} + diff --git a/tests/baselines/reference/distributiveConditionalTypeConstraints.types b/tests/baselines/reference/distributiveConditionalTypeConstraints.types new file mode 100644 index 00000000000..7cbcc3a69bb --- /dev/null +++ b/tests/baselines/reference/distributiveConditionalTypeConstraints.types @@ -0,0 +1,217 @@ +//// [tests/cases/compiler/distributiveConditionalTypeConstraints.ts] //// + +=== distributiveConditionalTypeConstraints.ts === +type IsArray = T extends unknown[] ? true : false; +>IsArray : IsArray +>true : true +>false : false + +function f1(x: IsArray) { +>f1 : (x: IsArray) => void +>x : IsArray + + let t: true = x; // Error +>t : true +>true : true +>x : boolean + + let f: false = x; // Error +>f : false +>false : false +>x : boolean +} + +function f2(x: IsArray) { +>f2 : (x: IsArray) => void +>x : IsArray + + let t: true = x; +>t : true +>true : true +>x : IsArray + + let f: false = x; // Error +>f : false +>false : false +>x : IsArray +} + +function f3(x: IsArray) { +>f3 : (x: IsArray) => void +>x : IsArray + + let t: true = x; +>t : true +>true : true +>x : IsArray + + let f: false = x; // Error +>f : false +>false : false +>x : IsArray +} + +function f4(x: IsArray) { +>f4 : (x: IsArray) => void +>x : IsArray + + let t: true = x; // Error +>t : true +>true : true +>x : IsArray + + let f: false = x; +>f : false +>false : false +>x : IsArray +} + +type ZeroOf = +>ZeroOf : ZeroOf + + T extends null ? null : + T extends undefined ? undefined : + T extends string ? "" : + T extends number ? 0 : + T extends boolean ? false : +>false : false + + never; + +function f10(x: ZeroOf) { +>f10 : (x: ZeroOf) => void +>x : ZeroOf + + let t: "" | 0 | false = x; +>t : false | "" | 0 +>false : false +>x : false | "" | 0 +} + +type Foo = T extends "abc" | 42 ? true : false; +>Foo : Foo +>true : true +>false : false + +function f20(x: Foo) { +>f20 : (x: Foo) => void +>x : Foo + + let t: false = x; // Error +>t : false +>false : false +>x : boolean +} + +// Modified repro from #30152 + +interface A { foo(): void; } +>foo : () => void + +interface B { bar(): void; } +>bar : () => void + +interface C { foo(): void, bar(): void } +>foo : () => void +>bar : () => void + +function test1(y: T extends B ? number : string) { +>test1 : (y: T extends B ? number : string) => void +>y : T extends B ? number : string + + if (typeof y == 'string') { +>typeof y == 'string' : boolean +>typeof y : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>y : T extends B ? number : string +>'string' : "string" + + y; // T extends B ? number : string +>y : T extends B ? number : string + } + else { + y; // never +>y : never + } + const newY: string | number = y; +>newY : string | number +>y : T extends B ? number : string + + newY; // string +>newY : string +} + +function test2(y: T extends B ? string : number) { +>test2 : (y: T extends B ? string : number) => void +>y : T extends B ? string : number + + if (typeof y == 'string') { +>typeof y == 'string' : boolean +>typeof y : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>y : T extends B ? string : number +>'string' : "string" + + y; // never +>y : never + } + else { + y; // T extends B ? string : number +>y : T extends B ? string : number + } + const newY: string | number = y; +>newY : string | number +>y : T extends B ? string : number + + newY; // number +>newY : number +} + +function test3(y: T extends C ? number : string) { +>test3 : (y: T extends C ? number : string) => void +>y : T extends C ? number : string + + if (typeof y == 'string') { +>typeof y == 'string' : boolean +>typeof y : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>y : T extends C ? number : string +>'string' : "string" + + y; // (T extends C ? number : string) & string +>y : (T extends C ? number : string) & string + } + else { + y; // T extends C ? number : string +>y : T extends C ? number : string + } + const newY: string | number = y; +>newY : string | number +>y : string | number + + newY; // string | number +>newY : string | number +} + +function test4(y: T extends C ? string : number) { +>test4 : (y: T extends C ? string : number) => void +>y : T extends C ? string : number + + if (typeof y == 'string') { +>typeof y == 'string' : boolean +>typeof y : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>y : T extends C ? string : number +>'string' : "string" + + y; // (T extends C ? string : number) & string +>y : (T extends C ? string : number) & string + } + else { + y; // T extends C ? string : number +>y : T extends C ? string : number + } + const newY: string | number = y; +>newY : string | number +>y : string | number + + newY; // string | number +>newY : string | number +} + diff --git a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types index ef5b52309ec..c24c8846bc1 100644 --- a/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types +++ b/tests/baselines/reference/doYouNeedToChangeYourTargetLibraryES2016Plus.types @@ -57,9 +57,9 @@ const testIntlFormatToParts = new Intl.DateTimeFormat("en-US").formatToParts(); >new Intl.DateTimeFormat("en-US").formatToParts() : any >new Intl.DateTimeFormat("en-US").formatToParts : any >new Intl.DateTimeFormat("en-US") : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >"en-US" : "en-US" >formatToParts : any @@ -150,9 +150,9 @@ const testNumberFormatFormatToParts = new Intl.NumberFormat("en-US").formatToPar >new Intl.NumberFormat("en-US").formatToParts() : any >new Intl.NumberFormat("en-US").formatToParts : any >new Intl.NumberFormat("en-US") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"en-US" : "en-US" >formatToParts : any diff --git a/tests/baselines/reference/dynamicImportsDeclaration.js b/tests/baselines/reference/dynamicImportsDeclaration.js new file mode 100644 index 00000000000..2892964db59 --- /dev/null +++ b/tests/baselines/reference/dynamicImportsDeclaration.js @@ -0,0 +1,70 @@ +//// [tests/cases/compiler/dynamicImportsDeclaration.ts] //// + +//// [case0.ts] +export default 0; + +//// [case1.ts] +export default 1; + +//// [caseFallback.ts] +export default 'fallback'; + +//// [index.ts] +export const mod = await (async () => { + const x: number = 0; + switch (x) { + case 0: + return await import("./case0.js"); + case 1: + return await import("./case1.js"); + default: + return await import("./caseFallback.js"); + } +})(); + +//// [case0.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = 0; +//// [case1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = 1; +//// [caseFallback.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = 'fallback'; +//// [index.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.mod = void 0; +exports.mod = await (async () => { + const x = 0; + switch (x) { + case 0: + return await import("./case0.js"); + case 1: + return await import("./case1.js"); + default: + return await import("./caseFallback.js"); + } +})(); + + +//// [case0.d.ts] +declare const _default: 0; +export default _default; +//// [case1.d.ts] +declare const _default: 1; +export default _default; +//// [caseFallback.d.ts] +declare const _default: "fallback"; +export default _default; +//// [index.d.ts] +export declare const mod: { + default: typeof import("./case0.js"); +} | { + default: typeof import("./case1.js"); +} | { + default: typeof import("./caseFallback.js"); +}; diff --git a/tests/baselines/reference/dynamicImportsDeclaration.symbols b/tests/baselines/reference/dynamicImportsDeclaration.symbols new file mode 100644 index 00000000000..6c9878c3b19 --- /dev/null +++ b/tests/baselines/reference/dynamicImportsDeclaration.symbols @@ -0,0 +1,37 @@ +//// [tests/cases/compiler/dynamicImportsDeclaration.ts] //// + +=== /case0.ts === + +export default 0; + +=== /case1.ts === + +export default 1; + +=== /caseFallback.ts === + +export default 'fallback'; + +=== /index.ts === +export const mod = await (async () => { +>mod : Symbol(mod, Decl(index.ts, 0, 12)) + + const x: number = 0; +>x : Symbol(x, Decl(index.ts, 1, 7)) + + switch (x) { +>x : Symbol(x, Decl(index.ts, 1, 7)) + + case 0: + return await import("./case0.js"); +>"./case0.js" : Symbol("/case0", Decl(case0.ts, 0, 0)) + + case 1: + return await import("./case1.js"); +>"./case1.js" : Symbol("/case1", Decl(case1.ts, 0, 0)) + + default: + return await import("./caseFallback.js"); +>"./caseFallback.js" : Symbol("/caseFallback", Decl(caseFallback.ts, 0, 0)) + } +})(); diff --git a/tests/baselines/reference/dynamicImportsDeclaration.types b/tests/baselines/reference/dynamicImportsDeclaration.types new file mode 100644 index 00000000000..c1ba0312437 --- /dev/null +++ b/tests/baselines/reference/dynamicImportsDeclaration.types @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/dynamicImportsDeclaration.ts] //// + +=== /case0.ts === + +export default 0; + +=== /case1.ts === + +export default 1; + +=== /caseFallback.ts === + +export default 'fallback'; + +=== /index.ts === +export const mod = await (async () => { +>mod : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); } +>await (async () => { const x: number = 0; switch (x) { case 0: return await import("./case0.js"); case 1: return await import("./case1.js"); default: return await import("./caseFallback.js"); }})() : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); } +>(async () => { const x: number = 0; switch (x) { case 0: return await import("./case0.js"); case 1: return await import("./case1.js"); default: return await import("./caseFallback.js"); }})() : Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }> +>(async () => { const x: number = 0; switch (x) { case 0: return await import("./case0.js"); case 1: return await import("./case1.js"); default: return await import("./caseFallback.js"); }}) : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }> +>async () => { const x: number = 0; switch (x) { case 0: return await import("./case0.js"); case 1: return await import("./case1.js"); default: return await import("./caseFallback.js"); }} : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }> + + const x: number = 0; +>x : number +>0 : 0 + + switch (x) { +>x : number + + case 0: +>0 : 0 + + return await import("./case0.js"); +>await import("./case0.js") : { default: typeof import("/case0"); } +>import("./case0.js") : Promise<{ default: typeof import("/case0"); }> +>"./case0.js" : "./case0.js" + + case 1: +>1 : 1 + + return await import("./case1.js"); +>await import("./case1.js") : { default: typeof import("/case1"); } +>import("./case1.js") : Promise<{ default: typeof import("/case1"); }> +>"./case1.js" : "./case1.js" + + default: + return await import("./caseFallback.js"); +>await import("./caseFallback.js") : { default: typeof import("/caseFallback"); } +>import("./caseFallback.js") : Promise<{ default: typeof import("/caseFallback"); }> +>"./caseFallback.js" : "./caseFallback.js" + } +})(); diff --git a/tests/baselines/reference/es2018IntlAPIs.symbols b/tests/baselines/reference/es2018IntlAPIs.symbols index c76cf73671b..56fe5b94adb 100644 --- a/tests/baselines/reference/es2018IntlAPIs.symbols +++ b/tests/baselines/reference/es2018IntlAPIs.symbols @@ -16,11 +16,11 @@ console.log(Intl.PluralRules.supportedLocalesOf(locales, options).join(', ')); >console : Symbol(console, Decl(lib.dom.d.ts, --, --)) >log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) >Intl.PluralRules.supportedLocalesOf(locales, options).join : Symbol(Array.join, Decl(lib.es5.d.ts, --, --)) ->Intl.PluralRules.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --)) +>Intl.PluralRules.supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --)) >Intl.PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) >Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) >PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) ->supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --)) >locales : Symbol(locales, Decl(es2018IntlAPIs.ts, 2, 5)) >options : Symbol(options, Decl(es2018IntlAPIs.ts, 3, 5)) >join : Symbol(Array.join, Decl(lib.es5.d.ts, --, --)) diff --git a/tests/baselines/reference/es2018IntlAPIs.types b/tests/baselines/reference/es2018IntlAPIs.types index 1de5c1cc79a..b9631962c97 100644 --- a/tests/baselines/reference/es2018IntlAPIs.types +++ b/tests/baselines/reference/es2018IntlAPIs.types @@ -26,9 +26,9 @@ console.log(Intl.PluralRules.supportedLocalesOf(locales, options).join(', ')); >Intl.PluralRules.supportedLocalesOf(locales, options).join : (separator?: string) => string >Intl.PluralRules.supportedLocalesOf(locales, options) : string[] >Intl.PluralRules.supportedLocalesOf : (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }) => string[] ->Intl.PluralRules : { (locales?: string | string[], options?: Intl.PluralRulesOptions): Intl.PluralRules; new (locales?: string | string[], options?: Intl.PluralRulesOptions): Intl.PluralRules; supportedLocalesOf(locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>Intl.PluralRules : Intl.PluralRulesConstructor >Intl : typeof Intl ->PluralRules : { (locales?: string | string[], options?: Intl.PluralRulesOptions): Intl.PluralRules; new (locales?: string | string[], options?: Intl.PluralRulesOptions): Intl.PluralRules; supportedLocalesOf(locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>PluralRules : Intl.PluralRulesConstructor >supportedLocalesOf : (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }) => string[] >locales : string[] >options : { readonly localeMatcher: "lookup"; } diff --git a/tests/baselines/reference/es2020IntlAPIs.types b/tests/baselines/reference/es2020IntlAPIs.types index 598446d7eda..686d7e1d137 100644 --- a/tests/baselines/reference/es2020IntlAPIs.types +++ b/tests/baselines/reference/es2020IntlAPIs.types @@ -27,18 +27,18 @@ function log(locale: string) { >new Intl.DateTimeFormat(locale).format(date) : string >new Intl.DateTimeFormat(locale).format : (date?: number | Date) => string >new Intl.DateTimeFormat(locale) : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >locale : string >format : (date?: number | Date) => string >date : Date >new Intl.NumberFormat(locale).format(count) : string >new Intl.NumberFormat(locale).format : { (value: number): string; (value: number | bigint): string; } >new Intl.NumberFormat(locale) : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >locale : string >format : { (value: number): string; (value: number | bigint): string; } >count : 26254.39 @@ -64,9 +64,9 @@ log("de-DE"); const rtf1 = new Intl.RelativeTimeFormat('en', { style: 'narrow' }); >rtf1 : Intl.RelativeTimeFormat >new Intl.RelativeTimeFormat('en', { style: 'narrow' }) : Intl.RelativeTimeFormat ->Intl.RelativeTimeFormat : { new (locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } >Intl : typeof Intl ->RelativeTimeFormat : { new (locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): string[]; } +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } >'en' : "en" >{ style: 'narrow' } : { style: "narrow"; } >style : "narrow" @@ -104,9 +104,9 @@ console.log(rtf1.format(-1, 'day')); const rtf2 = new Intl.RelativeTimeFormat('es', { numeric: 'auto' }); >rtf2 : Intl.RelativeTimeFormat >new Intl.RelativeTimeFormat('es', { numeric: 'auto' }) : Intl.RelativeTimeFormat ->Intl.RelativeTimeFormat : { new (locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } >Intl : typeof Intl ->RelativeTimeFormat : { new (locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: string | string[], options?: Intl.RelativeTimeFormatOptions): string[]; } +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } >'es' : "es" >{ numeric: 'auto' } : { numeric: "auto"; } >numeric : "auto" diff --git a/tests/baselines/reference/es2021LocalesObjectArgument.js b/tests/baselines/reference/es2021LocalesObjectArgument.js new file mode 100644 index 00000000000..4287c3f5347 --- /dev/null +++ b/tests/baselines/reference/es2021LocalesObjectArgument.js @@ -0,0 +1,21 @@ +//// [tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts] //// + +//// [es2021LocalesObjectArgument.ts] +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); + +new Intl.ListFormat(enUS); +new Intl.ListFormat([deDE, jaJP]); +Intl.ListFormat.supportedLocalesOf(enUS); +Intl.ListFormat.supportedLocalesOf([deDE, jaJP]); + + +//// [es2021LocalesObjectArgument.js] +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); +new Intl.ListFormat(enUS); +new Intl.ListFormat([deDE, jaJP]); +Intl.ListFormat.supportedLocalesOf(enUS); +Intl.ListFormat.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/baselines/reference/es2021LocalesObjectArgument.symbols b/tests/baselines/reference/es2021LocalesObjectArgument.symbols new file mode 100644 index 00000000000..877746c916e --- /dev/null +++ b/tests/baselines/reference/es2021LocalesObjectArgument.symbols @@ -0,0 +1,51 @@ +//// [tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts] //// + +=== es2021LocalesObjectArgument.ts === +const enUS = new Intl.Locale("en-US"); +>enUS : Symbol(enUS, Decl(es2021LocalesObjectArgument.ts, 0, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +const deDE = new Intl.Locale("de-DE"); +>deDE : Symbol(deDE, Decl(es2021LocalesObjectArgument.ts, 1, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +const jaJP = new Intl.Locale("ja-JP"); +>jaJP : Symbol(jaJP, Decl(es2021LocalesObjectArgument.ts, 2, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +new Intl.ListFormat(enUS); +>Intl.ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(es2021LocalesObjectArgument.ts, 0, 5)) + +new Intl.ListFormat([deDE, jaJP]); +>Intl.ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(es2021LocalesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(es2021LocalesObjectArgument.ts, 2, 5)) + +Intl.ListFormat.supportedLocalesOf(enUS); +>Intl.ListFormat.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2021.intl.d.ts, --, --)) +>Intl.ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2021.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(es2021LocalesObjectArgument.ts, 0, 5)) + +Intl.ListFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.ListFormat.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2021.intl.d.ts, --, --)) +>Intl.ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 3 more) +>ListFormat : Symbol(Intl.ListFormat, Decl(lib.es2021.intl.d.ts, --, --), Decl(lib.es2021.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2021.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(es2021LocalesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(es2021LocalesObjectArgument.ts, 2, 5)) + diff --git a/tests/baselines/reference/es2021LocalesObjectArgument.types b/tests/baselines/reference/es2021LocalesObjectArgument.types new file mode 100644 index 00000000000..85014f03fc5 --- /dev/null +++ b/tests/baselines/reference/es2021LocalesObjectArgument.types @@ -0,0 +1,63 @@ +//// [tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts] //// + +=== es2021LocalesObjectArgument.ts === +const enUS = new Intl.Locale("en-US"); +>enUS : Intl.Locale +>new Intl.Locale("en-US") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"en-US" : "en-US" + +const deDE = new Intl.Locale("de-DE"); +>deDE : Intl.Locale +>new Intl.Locale("de-DE") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"de-DE" : "de-DE" + +const jaJP = new Intl.Locale("ja-JP"); +>jaJP : Intl.Locale +>new Intl.Locale("ja-JP") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"ja-JP" : "ja-JP" + +new Intl.ListFormat(enUS); +>new Intl.ListFormat(enUS) : Intl.ListFormat +>Intl.ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>enUS : Intl.Locale + +new Intl.ListFormat([deDE, jaJP]); +>new Intl.ListFormat([deDE, jaJP]) : Intl.ListFormat +>Intl.ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.ListFormat.supportedLocalesOf(enUS); +>Intl.ListFormat.supportedLocalesOf(enUS) : string[] +>Intl.ListFormat.supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>Intl.ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>enUS : Intl.Locale + +Intl.ListFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.ListFormat.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.ListFormat.supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>Intl.ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>ListFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.ListFormatOptions): Intl.ListFormat; prototype: Intl.ListFormat; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + diff --git a/tests/baselines/reference/es2022IntlAPIs.types b/tests/baselines/reference/es2022IntlAPIs.types index 74d524e218f..ac0c770abeb 100644 --- a/tests/baselines/reference/es2022IntlAPIs.types +++ b/tests/baselines/reference/es2022IntlAPIs.types @@ -20,9 +20,9 @@ for (const zoneName of timezoneNames) { var formatter = new Intl.DateTimeFormat('en-US', { >formatter : Intl.DateTimeFormat >new Intl.DateTimeFormat('en-US', { timeZone: 'America/Los_Angeles', timeZoneName: zoneName, }) : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >'en-US' : "en-US" >{ timeZone: 'America/Los_Angeles', timeZoneName: zoneName, } : { timeZone: string; timeZoneName: "short" | "long" | "shortOffset" | "longOffset" | "shortGeneric" | "longGeneric"; } diff --git a/tests/baselines/reference/es2022LocalesObjectArgument.js b/tests/baselines/reference/es2022LocalesObjectArgument.js new file mode 100644 index 00000000000..335b921f822 --- /dev/null +++ b/tests/baselines/reference/es2022LocalesObjectArgument.js @@ -0,0 +1,21 @@ +//// [tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts] //// + +//// [es2022LocalesObjectArgument.ts] +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); + +new Intl.Segmenter(enUS); +new Intl.Segmenter([deDE, jaJP]); +Intl.Segmenter.supportedLocalesOf(enUS); +Intl.Segmenter.supportedLocalesOf([deDE, jaJP]); + + +//// [es2022LocalesObjectArgument.js] +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); +new Intl.Segmenter(enUS); +new Intl.Segmenter([deDE, jaJP]); +Intl.Segmenter.supportedLocalesOf(enUS); +Intl.Segmenter.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/baselines/reference/es2022LocalesObjectArgument.symbols b/tests/baselines/reference/es2022LocalesObjectArgument.symbols new file mode 100644 index 00000000000..41adb92a2ae --- /dev/null +++ b/tests/baselines/reference/es2022LocalesObjectArgument.symbols @@ -0,0 +1,51 @@ +//// [tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts] //// + +=== es2022LocalesObjectArgument.ts === +const enUS = new Intl.Locale("en-US"); +>enUS : Symbol(enUS, Decl(es2022LocalesObjectArgument.ts, 0, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +const deDE = new Intl.Locale("de-DE"); +>deDE : Symbol(deDE, Decl(es2022LocalesObjectArgument.ts, 1, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +const jaJP = new Intl.Locale("ja-JP"); +>jaJP : Symbol(jaJP, Decl(es2022LocalesObjectArgument.ts, 2, 5)) +>Intl.Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Locale : Symbol(Intl.Locale, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) + +new Intl.Segmenter(enUS); +>Intl.Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(es2022LocalesObjectArgument.ts, 0, 5)) + +new Intl.Segmenter([deDE, jaJP]); +>Intl.Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(es2022LocalesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(es2022LocalesObjectArgument.ts, 2, 5)) + +Intl.Segmenter.supportedLocalesOf(enUS); +>Intl.Segmenter.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2022.intl.d.ts, --, --)) +>Intl.Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2022.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(es2022LocalesObjectArgument.ts, 0, 5)) + +Intl.Segmenter.supportedLocalesOf([deDE, jaJP]); +>Intl.Segmenter.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2022.intl.d.ts, --, --)) +>Intl.Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 4 more) +>Segmenter : Symbol(Intl.Segmenter, Decl(lib.es2022.intl.d.ts, --, --), Decl(lib.es2022.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2022.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(es2022LocalesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(es2022LocalesObjectArgument.ts, 2, 5)) + diff --git a/tests/baselines/reference/es2022LocalesObjectArgument.types b/tests/baselines/reference/es2022LocalesObjectArgument.types new file mode 100644 index 00000000000..caf2b022316 --- /dev/null +++ b/tests/baselines/reference/es2022LocalesObjectArgument.types @@ -0,0 +1,63 @@ +//// [tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts] //// + +=== es2022LocalesObjectArgument.ts === +const enUS = new Intl.Locale("en-US"); +>enUS : Intl.Locale +>new Intl.Locale("en-US") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"en-US" : "en-US" + +const deDE = new Intl.Locale("de-DE"); +>deDE : Intl.Locale +>new Intl.Locale("de-DE") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"de-DE" : "de-DE" + +const jaJP = new Intl.Locale("ja-JP"); +>jaJP : Intl.Locale +>new Intl.Locale("ja-JP") : Intl.Locale +>Intl.Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>Intl : typeof Intl +>Locale : new (tag: string | Intl.Locale, options?: Intl.LocaleOptions) => Intl.Locale +>"ja-JP" : "ja-JP" + +new Intl.Segmenter(enUS); +>new Intl.Segmenter(enUS) : Intl.Segmenter +>Intl.Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>enUS : Intl.Locale + +new Intl.Segmenter([deDE, jaJP]); +>new Intl.Segmenter([deDE, jaJP]) : Intl.Segmenter +>Intl.Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.Segmenter.supportedLocalesOf(enUS); +>Intl.Segmenter.supportedLocalesOf(enUS) : string[] +>Intl.Segmenter.supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>Intl.Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>enUS : Intl.Locale + +Intl.Segmenter.supportedLocalesOf([deDE, jaJP]); +>Intl.Segmenter.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.Segmenter.supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>Intl.Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>Intl : typeof Intl +>Segmenter : { new (locales?: Intl.LocalesArgument, options?: Intl.SegmenterOptions): Intl.Segmenter; prototype: Intl.Segmenter; supportedLocalesOf(locales: Intl.LocalesArgument, options?: Pick): string[]; } +>supportedLocalesOf : (locales: Intl.LocalesArgument, options?: Pick) => string[] +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + diff --git a/tests/baselines/reference/es5DateAPIs.errors.txt b/tests/baselines/reference/es5DateAPIs.errors.txt index b761f66034b..a0e07eadf35 100644 --- a/tests/baselines/reference/es5DateAPIs.errors.txt +++ b/tests/baselines/reference/es5DateAPIs.errors.txt @@ -3,6 +3,6 @@ es5DateAPIs.ts(1,6): error TS2554: Expected 2-7 arguments, but got 1. ==== es5DateAPIs.ts (1 errors) ==== Date.UTC(2017); // should error - ~~~~~~~~~ + ~~~ !!! error TS2554: Expected 2-7 arguments, but got 1. !!! related TS6210 lib.es5.d.ts:--:--: An argument for 'monthIndex' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/expandoFunctionBlockShadowing.js b/tests/baselines/reference/expandoFunctionBlockShadowing.js new file mode 100644 index 00000000000..5937115a058 --- /dev/null +++ b/tests/baselines/reference/expandoFunctionBlockShadowing.js @@ -0,0 +1,51 @@ +//// [tests/cases/compiler/expandoFunctionBlockShadowing.ts] //// + +//// [expandoFunctionBlockShadowing.ts] +// https://github.com/microsoft/TypeScript/issues/56538 + +export function X() {} +if (Math.random()) { + const X: { test?: any } = {}; + X.test = 1; +} + +export function Y() {} +Y.test = "foo"; +const aliasTopY = Y; +if (Math.random()) { + const Y = function Y() {} + Y.test = 42; + + const topYcheck: { (): void; test: string } = aliasTopY; + const blockYcheck: { (): void; test: number } = Y; +} + +//// [expandoFunctionBlockShadowing.js] +"use strict"; +// https://github.com/microsoft/TypeScript/issues/56538 +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Y = exports.X = void 0; +function X() { } +exports.X = X; +if (Math.random()) { + var X_1 = {}; + X_1.test = 1; +} +function Y() { } +exports.Y = Y; +Y.test = "foo"; +var aliasTopY = Y; +if (Math.random()) { + var Y_1 = function Y() { }; + Y_1.test = 42; + var topYcheck = aliasTopY; + var blockYcheck = Y_1; +} + + +//// [expandoFunctionBlockShadowing.d.ts] +export declare function X(): void; +export declare function Y(): void; +export declare namespace Y { + var test: string; +} diff --git a/tests/baselines/reference/expandoFunctionBlockShadowing.symbols b/tests/baselines/reference/expandoFunctionBlockShadowing.symbols new file mode 100644 index 00000000000..d4e7f017fbc --- /dev/null +++ b/tests/baselines/reference/expandoFunctionBlockShadowing.symbols @@ -0,0 +1,59 @@ +//// [tests/cases/compiler/expandoFunctionBlockShadowing.ts] //// + +=== expandoFunctionBlockShadowing.ts === +// https://github.com/microsoft/TypeScript/issues/56538 + +export function X() {} +>X : Symbol(X, Decl(expandoFunctionBlockShadowing.ts, 0, 0)) + +if (Math.random()) { +>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) + + const X: { test?: any } = {}; +>X : Symbol(X, Decl(expandoFunctionBlockShadowing.ts, 4, 7)) +>test : Symbol(test, Decl(expandoFunctionBlockShadowing.ts, 4, 12)) + + X.test = 1; +>X.test : Symbol(test, Decl(expandoFunctionBlockShadowing.ts, 4, 12)) +>X : Symbol(X, Decl(expandoFunctionBlockShadowing.ts, 4, 7)) +>test : Symbol(test, Decl(expandoFunctionBlockShadowing.ts, 4, 12)) +} + +export function Y() {} +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 6, 1), Decl(expandoFunctionBlockShadowing.ts, 8, 22)) + +Y.test = "foo"; +>Y.test : Symbol(Y.test, Decl(expandoFunctionBlockShadowing.ts, 8, 22)) +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 6, 1), Decl(expandoFunctionBlockShadowing.ts, 8, 22)) +>test : Symbol(Y.test, Decl(expandoFunctionBlockShadowing.ts, 8, 22)) + +const aliasTopY = Y; +>aliasTopY : Symbol(aliasTopY, Decl(expandoFunctionBlockShadowing.ts, 10, 5)) +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 6, 1), Decl(expandoFunctionBlockShadowing.ts, 8, 22)) + +if (Math.random()) { +>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) + + const Y = function Y() {} +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 12, 7)) +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 12, 11)) + + Y.test = 42; +>Y.test : Symbol(Y.test, Decl(expandoFunctionBlockShadowing.ts, 12, 27)) +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 12, 7)) +>test : Symbol(Y.test, Decl(expandoFunctionBlockShadowing.ts, 12, 27)) + + const topYcheck: { (): void; test: string } = aliasTopY; +>topYcheck : Symbol(topYcheck, Decl(expandoFunctionBlockShadowing.ts, 15, 7)) +>test : Symbol(test, Decl(expandoFunctionBlockShadowing.ts, 15, 30)) +>aliasTopY : Symbol(aliasTopY, Decl(expandoFunctionBlockShadowing.ts, 10, 5)) + + const blockYcheck: { (): void; test: number } = Y; +>blockYcheck : Symbol(blockYcheck, Decl(expandoFunctionBlockShadowing.ts, 16, 7)) +>test : Symbol(test, Decl(expandoFunctionBlockShadowing.ts, 16, 32)) +>Y : Symbol(Y, Decl(expandoFunctionBlockShadowing.ts, 12, 7)) +} diff --git a/tests/baselines/reference/expandoFunctionBlockShadowing.types b/tests/baselines/reference/expandoFunctionBlockShadowing.types new file mode 100644 index 00000000000..b57e82c412e --- /dev/null +++ b/tests/baselines/reference/expandoFunctionBlockShadowing.types @@ -0,0 +1,69 @@ +//// [tests/cases/compiler/expandoFunctionBlockShadowing.ts] //// + +=== expandoFunctionBlockShadowing.ts === +// https://github.com/microsoft/TypeScript/issues/56538 + +export function X() {} +>X : () => void + +if (Math.random()) { +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number + + const X: { test?: any } = {}; +>X : { test?: any; } +>test : any +>{} : {} + + X.test = 1; +>X.test = 1 : 1 +>X.test : any +>X : { test?: any; } +>test : any +>1 : 1 +} + +export function Y() {} +>Y : typeof Y + +Y.test = "foo"; +>Y.test = "foo" : "foo" +>Y.test : string +>Y : typeof Y +>test : string +>"foo" : "foo" + +const aliasTopY = Y; +>aliasTopY : typeof Y +>Y : typeof Y + +if (Math.random()) { +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number + + const Y = function Y() {} +>Y : { (): void; test: number; } +>function Y() {} : { (): void; test: number; } +>Y : { (): void; test: number; } + + Y.test = 42; +>Y.test = 42 : 42 +>Y.test : number +>Y : { (): void; test: number; } +>test : number +>42 : 42 + + const topYcheck: { (): void; test: string } = aliasTopY; +>topYcheck : { (): void; test: string; } +>test : string +>aliasTopY : typeof import("expandoFunctionBlockShadowing").Y + + const blockYcheck: { (): void; test: number } = Y; +>blockYcheck : { (): void; test: number; } +>test : number +>Y : { (): void; test: number; } +} diff --git a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.symbols b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.symbols new file mode 100644 index 00000000000..a5f7446fd70 --- /dev/null +++ b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.symbols @@ -0,0 +1,42 @@ +//// [tests/cases/compiler/expandoFunctionExpressionsWithDynamicNames2.ts] //// + +=== expandoFunctionExpressionsWithDynamicNames2.ts === +const mySymbol = Symbol(); +>mySymbol : Symbol(mySymbol, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 0, 5)) +>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) + +interface Foo { +>Foo : Symbol(Foo, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 0, 26)) + + (): void; + [mySymbol]: true; +>[mySymbol] : Symbol(Foo[mySymbol], Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 2, 11)) +>mySymbol : Symbol(mySymbol, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 0, 5)) +} +const foo: Foo = () => {}; +>foo : Symbol(foo, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 5, 5), Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 5, 26)) +>Foo : Symbol(Foo, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 0, 26)) + +foo[mySymbol] = true; +>foo : Symbol(foo, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 5, 5), Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 5, 26)) +>mySymbol : Symbol(mySymbol, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 0, 5)) + +interface Bar { +>Bar : Symbol(Bar, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 6, 21)) + + (): void; + test: true; +>test : Symbol(Bar.test, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 9, 11)) +} +const t = "test" as const; +>t : Symbol(t, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 12, 5)) +>const : Symbol(const) + +const bar: Bar = () => {}; +>bar : Symbol(bar, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 13, 5), Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 13, 26)) +>Bar : Symbol(Bar, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 6, 21)) + +bar[t] = true; +>bar : Symbol(bar, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 13, 5), Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 13, 26)) +>t : Symbol(t, Decl(expandoFunctionExpressionsWithDynamicNames2.ts, 12, 5)) + diff --git a/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.types b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.types new file mode 100644 index 00000000000..0aedacb4d9e --- /dev/null +++ b/tests/baselines/reference/expandoFunctionExpressionsWithDynamicNames2.types @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/expandoFunctionExpressionsWithDynamicNames2.ts] //// + +=== expandoFunctionExpressionsWithDynamicNames2.ts === +const mySymbol = Symbol(); +>mySymbol : unique symbol +>Symbol() : unique symbol +>Symbol : SymbolConstructor + +interface Foo { + (): void; + [mySymbol]: true; +>[mySymbol] : true +>mySymbol : unique symbol +>true : true +} +const foo: Foo = () => {}; +>foo : Foo +>() => {} : { (): void; [mySymbol]: true; } + +foo[mySymbol] = true; +>foo[mySymbol] = true : true +>foo[mySymbol] : true +>foo : Foo +>mySymbol : unique symbol +>true : true + +interface Bar { + (): void; + test: true; +>test : true +>true : true +} +const t = "test" as const; +>t : "test" +>"test" as const : "test" +>"test" : "test" + +const bar: Bar = () => {}; +>bar : Bar +>() => {} : { (): void; test: true; } + +bar[t] = true; +>bar[t] = true : true +>bar[t] : true +>bar : Bar +>t : "test" +>true : true + diff --git a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt index 83a97758857..fee12ed4897 100644 --- a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt +++ b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt @@ -1,12 +1,7 @@ -flatArrayNoExcessiveStackDepth.ts(20,5): error TS2322: Type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr' is not assignable to type 'FlatArray'. - Type 'unknown' is not assignable to type 'FlatArray'. - Type 'unknown' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. - Type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. - Type 'unknown' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. - Type 'FlatArray' is not assignable to type 'FlatArray'. - Type 'InnerArr' is not assignable to type 'FlatArray'. - Type 'InnerArr' is not assignable to type '(InnerArr extends readonly (infer InnerArr)[] ? FlatArray : InnerArr) & InnerArr'. - Type 'InnerArr' is not assignable to type 'InnerArr extends readonly (infer InnerArr)[] ? FlatArray : InnerArr'. +flatArrayNoExcessiveStackDepth.ts(20,5): error TS2322: Type 'FlatArray' is not assignable to type 'FlatArray'. + Type 'Arr' is not assignable to type 'FlatArray'. + Type 'Arr' is not assignable to type '(Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr) & Arr'. + Type 'Arr' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. ==== flatArrayNoExcessiveStackDepth.ts (1 errors) ==== @@ -31,14 +26,9 @@ flatArrayNoExcessiveStackDepth.ts(20,5): error TS2322: Type 'Arr extends readonl x = y; y = x; // Error ~ -!!! error TS2322: Type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr' is not assignable to type 'FlatArray'. -!!! error TS2322: Type 'unknown' is not assignable to type 'FlatArray'. -!!! error TS2322: Type 'unknown' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. -!!! error TS2322: Type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. -!!! error TS2322: Type 'unknown' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. -!!! error TS2322: Type 'FlatArray' is not assignable to type 'FlatArray'. -!!! error TS2322: Type 'InnerArr' is not assignable to type 'FlatArray'. -!!! error TS2322: Type 'InnerArr' is not assignable to type '(InnerArr extends readonly (infer InnerArr)[] ? FlatArray : InnerArr) & InnerArr'. -!!! error TS2322: Type 'InnerArr' is not assignable to type 'InnerArr extends readonly (infer InnerArr)[] ? FlatArray : InnerArr'. +!!! error TS2322: Type 'FlatArray' is not assignable to type 'FlatArray'. +!!! error TS2322: Type 'Arr' is not assignable to type 'FlatArray'. +!!! error TS2322: Type 'Arr' is not assignable to type '(Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr) & Arr'. +!!! error TS2322: Type 'Arr' is not assignable to type 'Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr'. } \ No newline at end of file diff --git a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types index eef8873f0f8..118c4c736d5 100644 --- a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types +++ b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.types @@ -65,8 +65,8 @@ function f(x: FlatArray, y: FlatArray) >y : FlatArray y = x; // Error ->y = x : Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr +>y = x : FlatArray >y : FlatArray ->x : Arr extends readonly (infer InnerArr)[] ? FlatArray : Arr +>x : FlatArray } diff --git a/tests/baselines/reference/for-of39.errors.txt b/tests/baselines/reference/for-of39.errors.txt index 9f36eb6bd45..a59cb07da6b 100644 --- a/tests/baselines/reference/for-of39.errors.txt +++ b/tests/baselines/reference/for-of39.errors.txt @@ -1,4 +1,4 @@ -for-of39.ts(1,11): error TS2769: No overload matches this call. +for-of39.ts(1,15): error TS2769: No overload matches this call. Overload 1 of 4, '(iterable?: Iterable): Map', gave the following error. Argument of type '([string, number] | [string, true])[]' is not assignable to parameter of type 'Iterable'. The types returned by '[Symbol.iterator]().next(...)' are incompatible between these types. @@ -15,7 +15,7 @@ for-of39.ts(1,11): error TS2769: No overload matches this call. ==== for-of39.ts (1 errors) ==== var map = new Map([["", true], ["", 0]]); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 4, '(iterable?: Iterable): Map', gave the following error. !!! error TS2769: Argument of type '([string, number] | [string, true])[]' is not assignable to parameter of type 'Iterable'. diff --git a/tests/baselines/reference/formatToPartsBigInt.types b/tests/baselines/reference/formatToPartsBigInt.types index 57a175802cc..3b42619f102 100644 --- a/tests/baselines/reference/formatToPartsBigInt.types +++ b/tests/baselines/reference/formatToPartsBigInt.types @@ -8,9 +8,9 @@ new Intl.NumberFormat("fr").formatToParts(3000n); >new Intl.NumberFormat("fr").formatToParts(3000n) : Intl.NumberFormatPart[] >new Intl.NumberFormat("fr").formatToParts : (number?: number | bigint) => Intl.NumberFormatPart[] >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >formatToParts : (number?: number | bigint) => Intl.NumberFormatPart[] >3000n : 3000n @@ -19,9 +19,9 @@ new Intl.NumberFormat("fr").formatToParts(BigInt(123)); >new Intl.NumberFormat("fr").formatToParts(BigInt(123)) : Intl.NumberFormatPart[] >new Intl.NumberFormat("fr").formatToParts : (number?: number | bigint) => Intl.NumberFormatPart[] >new Intl.NumberFormat("fr") : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; new (locales?: string | string[], options?: Intl.NumberFormatOptions): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >"fr" : "fr" >formatToParts : (number?: number | bigint) => Intl.NumberFormatPart[] >BigInt(123) : bigint diff --git a/tests/baselines/reference/formatToPartsFractionalSecond.types b/tests/baselines/reference/formatToPartsFractionalSecond.types index 952d5c51447..f25c5d22c91 100644 --- a/tests/baselines/reference/formatToPartsFractionalSecond.types +++ b/tests/baselines/reference/formatToPartsFractionalSecond.types @@ -7,9 +7,9 @@ new Intl.DateTimeFormat().formatToParts().find((val) => val.type === 'fractional >new Intl.DateTimeFormat().formatToParts() : Intl.DateTimeFormatPart[] >new Intl.DateTimeFormat().formatToParts : (date?: number | Date) => Intl.DateTimeFormatPart[] >new Intl.DateTimeFormat() : Intl.DateTimeFormat ->Intl.DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor >Intl : typeof Intl ->DateTimeFormat : { (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; new (locales?: string | string[], options?: Intl.DateTimeFormatOptions): Intl.DateTimeFormat; supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; readonly prototype: Intl.DateTimeFormat; } +>DateTimeFormat : Intl.DateTimeFormatConstructor >formatToParts : (date?: number | Date) => Intl.DateTimeFormatPart[] >find : { (predicate: (value: Intl.DateTimeFormatPart, index: number, obj: Intl.DateTimeFormatPart[]) => value is S, thisArg?: any): S; (predicate: (value: Intl.DateTimeFormatPart, index: number, obj: Intl.DateTimeFormatPart[]) => unknown, thisArg?: any): Intl.DateTimeFormatPart; } >(val) => val.type === 'fractionalSecond' : (val: Intl.DateTimeFormatPart) => boolean diff --git a/tests/baselines/reference/functionCall11.errors.txt b/tests/baselines/reference/functionCall11.errors.txt index 36167f3210b..3688dc235fc 100644 --- a/tests/baselines/reference/functionCall11.errors.txt +++ b/tests/baselines/reference/functionCall11.errors.txt @@ -8,7 +8,7 @@ functionCall11.ts(6,15): error TS2554: Expected 1-2 arguments, but got 3. foo('foo', 1); foo('foo'); foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 functionCall11.ts:1:14: An argument for 'a' was not provided. foo(1, 'bar'); diff --git a/tests/baselines/reference/functionCall12.errors.txt b/tests/baselines/reference/functionCall12.errors.txt index 680d708b6f5..f9e905d4dbb 100644 --- a/tests/baselines/reference/functionCall12.errors.txt +++ b/tests/baselines/reference/functionCall12.errors.txt @@ -8,7 +8,7 @@ functionCall12.ts(7,15): error TS2345: Argument of type 'number' is not assignab foo('foo', 1); foo('foo'); foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1-3 arguments, but got 0. !!! related TS6210 functionCall12.ts:1:14: An argument for 'a' was not provided. foo(1, 'bar'); diff --git a/tests/baselines/reference/functionCall13.errors.txt b/tests/baselines/reference/functionCall13.errors.txt index 0b2bd703e27..04c7cb937cb 100644 --- a/tests/baselines/reference/functionCall13.errors.txt +++ b/tests/baselines/reference/functionCall13.errors.txt @@ -7,7 +7,7 @@ functionCall13.ts(5,5): error TS2345: Argument of type 'number' is not assignabl foo('foo', 1); foo('foo'); foo(); - ~~~~~ + ~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 functionCall13.ts:1:14: An argument for 'a' was not provided. foo(1, 'bar'); diff --git a/tests/baselines/reference/functionCall16.errors.txt b/tests/baselines/reference/functionCall16.errors.txt index c461889f4f5..6cc09bc1276 100644 --- a/tests/baselines/reference/functionCall16.errors.txt +++ b/tests/baselines/reference/functionCall16.errors.txt @@ -11,7 +11,7 @@ functionCall16.ts(6,5): error TS2345: Argument of type 'number' is not assignabl foo('foo'); foo('foo', 'bar'); foo(); - ~~~~~ + ~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 functionCall16.ts:1:14: An argument for 'a' was not provided. foo(1, 'bar'); diff --git a/tests/baselines/reference/functionCall17.errors.txt b/tests/baselines/reference/functionCall17.errors.txt index 62a728b2906..521bc847f48 100644 --- a/tests/baselines/reference/functionCall17.errors.txt +++ b/tests/baselines/reference/functionCall17.errors.txt @@ -11,7 +11,7 @@ functionCall17.ts(6,12): error TS2345: Argument of type 'number' is not assignab !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. foo('foo'); foo(); - ~~~~~ + ~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 functionCall17.ts:1:14: An argument for 'a' was not provided. foo(1, 'bar'); diff --git a/tests/baselines/reference/functionCall18.errors.txt b/tests/baselines/reference/functionCall18.errors.txt index 86698a6119b..884c2d3f904 100644 --- a/tests/baselines/reference/functionCall18.errors.txt +++ b/tests/baselines/reference/functionCall18.errors.txt @@ -6,7 +6,7 @@ functionCall18.ts(4,1): error TS2554: Expected 2 arguments, but got 1. declare function foo(a: T, b: T); declare function foo(a: {}); foo("hello"); - ~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 functionCall18.ts:2:31: An argument for 'b' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionCall6.errors.txt b/tests/baselines/reference/functionCall6.errors.txt index d186989e762..014d1f7d86c 100644 --- a/tests/baselines/reference/functionCall6.errors.txt +++ b/tests/baselines/reference/functionCall6.errors.txt @@ -13,7 +13,7 @@ functionCall6.ts(5,1): error TS2554: Expected 1 arguments, but got 0. ~~~~~ !!! error TS2554: Expected 1 arguments, but got 2. foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 functionCall6.ts:1:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionCall7.errors.txt b/tests/baselines/reference/functionCall7.errors.txt index 37beda0f15d..b1bfd014fd3 100644 --- a/tests/baselines/reference/functionCall7.errors.txt +++ b/tests/baselines/reference/functionCall7.errors.txt @@ -15,7 +15,7 @@ functionCall7.ts(7,1): error TS2554: Expected 1 arguments, but got 0. ~ !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'c1'. foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 functionCall7.ts:2:14: An argument for 'a' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads29.errors.txt b/tests/baselines/reference/functionOverloads29.errors.txt index e67257e1dce..e21ea49e1b5 100644 --- a/tests/baselines/reference/functionOverloads29.errors.txt +++ b/tests/baselines/reference/functionOverloads29.errors.txt @@ -6,7 +6,7 @@ functionOverloads29.ts(4,9): error TS2554: Expected 1 arguments, but got 0. function foo(bar:number):number; function foo(bar:any):any{ return bar } var x = foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 functionOverloads29.ts:1:14: An argument for 'bar' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads34.errors.txt b/tests/baselines/reference/functionOverloads34.errors.txt index 59b1192c89d..7aaebf1ea93 100644 --- a/tests/baselines/reference/functionOverloads34.errors.txt +++ b/tests/baselines/reference/functionOverloads34.errors.txt @@ -6,7 +6,7 @@ functionOverloads34.ts(4,9): error TS2554: Expected 1 arguments, but got 0. function foo(bar:{a:boolean;}):number; function foo(bar:{a:any;}):any{ return bar } var x = foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 functionOverloads34.ts:1:14: An argument for 'bar' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads37.errors.txt b/tests/baselines/reference/functionOverloads37.errors.txt index 655bef2e0bb..ee6d71b5fca 100644 --- a/tests/baselines/reference/functionOverloads37.errors.txt +++ b/tests/baselines/reference/functionOverloads37.errors.txt @@ -6,7 +6,7 @@ functionOverloads37.ts(4,9): error TS2554: Expected 1 arguments, but got 0. function foo(bar:{a:boolean;}[]):number; function foo(bar:{a:any;}[]):any{ return bar } var x = foo(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 functionOverloads37.ts:1:14: An argument for 'bar' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/functionParameterArityMismatch.errors.txt b/tests/baselines/reference/functionParameterArityMismatch.errors.txt index 8b7cea23207..1f4965f8c20 100644 --- a/tests/baselines/reference/functionParameterArityMismatch.errors.txt +++ b/tests/baselines/reference/functionParameterArityMismatch.errors.txt @@ -12,11 +12,11 @@ functionParameterArityMismatch.ts(15,19): error TS2554: Expected 0-6 arguments, declare function f1(a: number); declare function f1(a: number, b: number, c: number); f1(); - ~~~~ + ~~ !!! error TS2554: Expected 1-3 arguments, but got 0. !!! related TS6210 functionParameterArityMismatch.ts:1:21: An argument for 'a' was not provided. f1(1, 2); - ~~~~~~~~ + ~~ !!! error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or 3 arguments. f1(1, 2, 3, 4); ~ @@ -27,13 +27,13 @@ functionParameterArityMismatch.ts(15,19): error TS2554: Expected 0-6 arguments, declare function f2(a: number, b: number, c: number, d: number); declare function f2(a: number, b: number, c: number, d: number, e: number, f: number); f2(1); - ~~~~~ + ~~ !!! error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or 2 arguments. f2(1, 2, 3); - ~~~~~~~~~~~ + ~~ !!! error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or 4 arguments. f2(1, 2, 3, 4, 5); - ~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or 6 arguments. f2(1, 2, 3, 4, 5, 6, 7); ~ diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt index 6e9abea9199..5fd2927b274 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt @@ -1,6 +1,7 @@ genericCallWithGenericSignatureArguments3.ts(32,19): error TS2345: Argument of type '(a1: (y: string) => string) => (n: Object) => 1' is not assignable to parameter of type '(x: (a: string) => boolean) => (n: Object) => 1'. Types of parameters 'a1' and 'x' are incompatible. - Type 'boolean' is not assignable to type 'string'. + Type '(a: string) => boolean' is not assignable to type '(y: string) => string'. + Type 'boolean' is not assignable to type 'string'. genericCallWithGenericSignatureArguments3.ts(33,69): error TS2345: Argument of type '(a2: (z: string) => boolean) => number' is not assignable to parameter of type '(x: (z: string) => boolean) => (n: Object) => 1'. Type 'number' is not assignable to type '(n: Object) => 1'. @@ -41,7 +42,8 @@ genericCallWithGenericSignatureArguments3.ts(33,69): error TS2345: Argument of t ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2345: Argument of type '(a1: (y: string) => string) => (n: Object) => 1' is not assignable to parameter of type '(x: (a: string) => boolean) => (n: Object) => 1'. !!! error TS2345: Types of parameters 'a1' and 'x' are incompatible. -!!! error TS2345: Type 'boolean' is not assignable to type 'string'. +!!! error TS2345: Type '(a: string) => boolean' is not assignable to type '(y: string) => string'. +!!! error TS2345: Type 'boolean' is not assignable to type 'string'. var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2345: Argument of type '(a2: (z: string) => boolean) => number' is not assignable to parameter of type '(x: (z: string) => boolean) => (n: Object) => 1'. diff --git a/tests/baselines/reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt b/tests/baselines/reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt index 5fd7c145269..ad660643bd7 100644 --- a/tests/baselines/reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt +++ b/tests/baselines/reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt @@ -1,15 +1,10 @@ genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts(13,5): error TS2322: Type 'ReturnType' is not assignable to type 'A'. - Type 'unknown' is not assignable to type 'A'. - Type 'ReturnType' is not assignable to type 'A'. - Type 'unknown' is not assignable to type 'A'. - Type 'ReturnType' is not assignable to type 'A'. - Type 'unknown' is not assignable to type 'A'. - Type 'ReturnType | ReturnType | ReturnType' is not assignable to type 'A'. - Type 'ReturnType' is not assignable to type 'A'. - Type 'unknown' is not assignable to type 'A'. - Type 'ReturnType[string]>' is not assignable to type 'A'. - Type 'unknown' is not assignable to type 'A'. - Property 'x' is missing in type '{}' but required in type 'A'. + Type 'ReturnType' is not assignable to type 'A'. + Type 'ReturnType' is not assignable to type 'A'. + Type 'ReturnType | ReturnType | ReturnType' is not assignable to type 'A'. + Type 'ReturnType' is not assignable to type 'A'. + Type 'ReturnType[string]>' is not assignable to type 'A'. + Type 'unknown' is not assignable to type 'A'. ==== genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts (1 errors) ==== @@ -28,18 +23,12 @@ genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts(13,5): er x = a2; ~ !!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. -!!! error TS2322: Type 'unknown' is not assignable to type 'A'. -!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. -!!! error TS2322: Type 'unknown' is not assignable to type 'A'. -!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. -!!! error TS2322: Type 'unknown' is not assignable to type 'A'. -!!! error TS2322: Type 'ReturnType | ReturnType | ReturnType' is not assignable to type 'A'. -!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. -!!! error TS2322: Type 'unknown' is not assignable to type 'A'. -!!! error TS2322: Type 'ReturnType[string]>' is not assignable to type 'A'. -!!! error TS2322: Type 'unknown' is not assignable to type 'A'. -!!! error TS2322: Property 'x' is missing in type '{}' but required in type 'A'. -!!! related TS2728 genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts:1:15: 'x' is declared here. +!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. +!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. +!!! error TS2322: Type 'ReturnType | ReturnType | ReturnType' is not assignable to type 'A'. +!!! error TS2322: Type 'ReturnType' is not assignable to type 'A'. +!!! error TS2322: Type 'ReturnType[string]>' is not assignable to type 'A'. +!!! error TS2322: Type 'unknown' is not assignable to type 'A'. } // Original CFA report of the above issue diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt index b5a7e58f0c6..87e42423628 100644 --- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt +++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt @@ -9,7 +9,7 @@ genericFunctionsWithOptionalParameters2.ts(7,7): error TS2554: Expected 1-3 argu var utils: Utils; utils.fold(); // error - ~~~~~~ + ~~~~ !!! error TS2554: Expected 1-3 arguments, but got 0. !!! related TS6210 genericFunctionsWithOptionalParameters2.ts:2:15: An argument for 'c' was not provided. utils.fold(null); // no error diff --git a/tests/baselines/reference/genericRestArity.errors.txt b/tests/baselines/reference/genericRestArity.errors.txt index ae33c809077..e4e28ebcbe4 100644 --- a/tests/baselines/reference/genericRestArity.errors.txt +++ b/tests/baselines/reference/genericRestArity.errors.txt @@ -10,7 +10,7 @@ genericRestArity.ts(8,45): error TS2554: Expected 3 arguments, but got 8. ...args: TS): void; call((x: number, y: number) => x + y); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 1. !!! related TS6236 genericRestArity.ts:5:5: Arguments for the rest parameter 'args' were not provided. call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7); diff --git a/tests/baselines/reference/genericRestArityStrict.errors.txt b/tests/baselines/reference/genericRestArityStrict.errors.txt index bec9b46e176..55c916a26c0 100644 --- a/tests/baselines/reference/genericRestArityStrict.errors.txt +++ b/tests/baselines/reference/genericRestArityStrict.errors.txt @@ -10,7 +10,7 @@ genericRestArityStrict.ts(8,45): error TS2554: Expected 3 arguments, but got 8. ...args: TS): void; call((x: number, y: number) => x + y); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 1. !!! related TS6236 genericRestArityStrict.ts:5:5: Arguments for the rest parameter 'args' were not provided. call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7); diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt index 914a9f21240..5e072df85e9 100644 --- a/tests/baselines/reference/genericRestParameters3.errors.txt +++ b/tests/baselines/reference/genericRestParameters3.errors.txt @@ -90,7 +90,7 @@ genericRestParameters3.ts(59,5): error TS2345: Argument of type '["what"]' is no declare function foo(cb: (...args: T) => void): void; foo>(); // Error - ~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 genericRestParameters3.ts:33:39: An argument for 'cb' was not provided. foo>(100); // Error diff --git a/tests/baselines/reference/importDefaultNamedType3.js b/tests/baselines/reference/importDefaultNamedType3.js new file mode 100644 index 00000000000..cd26f18e846 --- /dev/null +++ b/tests/baselines/reference/importDefaultNamedType3.js @@ -0,0 +1,22 @@ +//// [tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts] //// + +//// [a.ts] +export class A {} + +//// [b.ts] +import type from = require('./a'); + + +//// [a.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.A = void 0; +var A = /** @class */ (function () { + function A() { + } + return A; +}()); +exports.A = A; +//// [b.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/importDefaultNamedType3.symbols b/tests/baselines/reference/importDefaultNamedType3.symbols new file mode 100644 index 00000000000..285c4db2596 --- /dev/null +++ b/tests/baselines/reference/importDefaultNamedType3.symbols @@ -0,0 +1,10 @@ +//// [tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts] //// + +=== /b.ts === +import type from = require('./a'); +>from : Symbol(from, Decl(b.ts, 0, 0)) + +=== /a.ts === +export class A {} +>A : Symbol(A, Decl(a.ts, 0, 0)) + diff --git a/tests/baselines/reference/importDefaultNamedType3.types b/tests/baselines/reference/importDefaultNamedType3.types new file mode 100644 index 00000000000..8dc3ddbfd40 --- /dev/null +++ b/tests/baselines/reference/importDefaultNamedType3.types @@ -0,0 +1,10 @@ +//// [tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts] //// + +=== /b.ts === +import type from = require('./a'); +>from : typeof from + +=== /a.ts === +export class A {} +>A : A + diff --git a/tests/baselines/reference/inKeywordAndUnknown.types b/tests/baselines/reference/inKeywordAndUnknown.types index a45017bd52d..81a24b27297 100644 --- a/tests/baselines/reference/inKeywordAndUnknown.types +++ b/tests/baselines/reference/inKeywordAndUnknown.types @@ -138,12 +138,12 @@ function f5(x: T & {}) { function f6(x: T & {}) { >f6 : (x: T & {}) => boolean ->x : T & {} +>x : T return x instanceof Object && 'a' in x; >x instanceof Object && 'a' in x : boolean >x instanceof Object : boolean ->x : T & {} +>x : T >Object : ObjectConstructor >'a' in x : boolean >'a' : "a" @@ -152,15 +152,15 @@ function f6(x: T & {}) { function f7(x: T & {}) { >f7 : (x: T & {}) => boolean ->x : T & {} +>x : T return x instanceof Object && 'a' in x; >x instanceof Object && 'a' in x : boolean >x instanceof Object : boolean ->x : T & {} +>x : T >Object : ObjectConstructor >'a' in x : boolean >'a' : "a" ->x : T & {} +>x : T } diff --git a/tests/baselines/reference/inKeywordTypeguard(strict=false).types b/tests/baselines/reference/inKeywordTypeguard(strict=false).types index 66ce2de68ee..2caf941deda 100644 --- a/tests/baselines/reference/inKeywordTypeguard(strict=false).types +++ b/tests/baselines/reference/inKeywordTypeguard(strict=false).types @@ -1078,12 +1078,12 @@ function isHTMLTable(table: T): boolean { const f =

(a: P & {}) => { >f :

(a: P & {}) => void >

(a: P & {}) => { "foo" in a;} :

(a: P & {}) => void ->a : P & {} +>a : P "foo" in a; >"foo" in a : boolean >"foo" : "foo" ->a : P & {} +>a : P }; diff --git a/tests/baselines/reference/inKeywordTypeguard(strict=true).types b/tests/baselines/reference/inKeywordTypeguard(strict=true).types index 4a2a2094181..004ea8e7e20 100644 --- a/tests/baselines/reference/inKeywordTypeguard(strict=true).types +++ b/tests/baselines/reference/inKeywordTypeguard(strict=true).types @@ -1078,12 +1078,12 @@ function isHTMLTable(table: T): boolean { const f =

(a: P & {}) => { >f :

(a: P & {}) => void >

(a: P & {}) => { "foo" in a;} :

(a: P & {}) => void ->a : P & {} +>a : P "foo" in a; >"foo" in a : boolean >"foo" : "foo" ->a : P & {} +>a : P }; diff --git a/tests/baselines/reference/indexSignatures1.errors.txt b/tests/baselines/reference/indexSignatures1.errors.txt index ae9b07b65ce..05d0436ca43 100644 --- a/tests/baselines/reference/indexSignatures1.errors.txt +++ b/tests/baselines/reference/indexSignatures1.errors.txt @@ -15,8 +15,10 @@ indexSignatures1.ts(73,5): error TS2374: Duplicate index signature for type '`fo indexSignatures1.ts(81,5): error TS2413: '`a${string}a`' index type '"c"' is not assignable to '`${string}a`' index type '"b"'. indexSignatures1.ts(81,5): error TS2413: '`a${string}a`' index type '"c"' is not assignable to '`a${string}`' index type '"a"'. indexSignatures1.ts(87,6): error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. +indexSignatures1.ts(88,5): error TS2374: Duplicate index signature for type 'T'. indexSignatures1.ts(88,6): error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. indexSignatures1.ts(89,6): error TS1268: An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type. +indexSignatures1.ts(90,5): error TS2374: Duplicate index signature for type 'T'. indexSignatures1.ts(90,6): error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. indexSignatures1.ts(117,1): error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type 'I1'. No index signature with a parameter of type 'string' was found on type 'I1'. @@ -69,7 +71,7 @@ indexSignatures1.ts(289,7): error TS2322: Type 'number' is not assignable to typ indexSignatures1.ts(312,43): error TS2353: Object literal may only specify known properties, and '[sym]' does not exist in type '{ [key: number]: string; }'. -==== indexSignatures1.ts (50 errors) ==== +==== indexSignatures1.ts (52 errors) ==== // Symbol index signature checking const sym = Symbol(); @@ -188,12 +190,16 @@ indexSignatures1.ts(312,43): error TS2353: Object literal may only specify known ~~~ !!! error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. [key: T | number]: string; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2374: Duplicate index signature for type 'T'. ~~~ !!! error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. [key: Error]: string; // Error ~~~ !!! error TS1268: An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type. [key: T & string]: string; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2374: Duplicate index signature for type 'T'. ~~~ !!! error TS1337: An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead. } diff --git a/tests/baselines/reference/indexSignatures1.types b/tests/baselines/reference/indexSignatures1.types index 4f7e248192f..144face6af9 100644 --- a/tests/baselines/reference/indexSignatures1.types +++ b/tests/baselines/reference/indexSignatures1.types @@ -261,7 +261,7 @@ type Invalid = { >key : Error [key: T & string]: string; // Error ->key : T & string +>key : T } // Intersections in index signatures diff --git a/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.symbols b/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.symbols new file mode 100644 index 00000000000..03e0bcb9f16 --- /dev/null +++ b/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.symbols @@ -0,0 +1,72 @@ +//// [tests/cases/compiler/inferenceGenericNestedCallReturningConstructor.ts] //// + +=== inferenceGenericNestedCallReturningConstructor.ts === +interface Action { +>Action : Symbol(Action, Decl(inferenceGenericNestedCallReturningConstructor.ts, 0, 0)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 0, 17)) + + new (ctx: TContext): void; +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 1, 7)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 0, 17)) +} + +declare class AssignAction { +>AssignAction : Symbol(AssignAction, Decl(inferenceGenericNestedCallReturningConstructor.ts, 2, 1)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 4, 27)) + + constructor(ctx: TContext); +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 5, 14)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 4, 27)) +} + +declare function assign( +>assign : Symbol(assign, Decl(inferenceGenericNestedCallReturningConstructor.ts, 6, 1)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 8, 24)) + + assigner: (ctx: TContext) => void +>assigner : Symbol(assigner, Decl(inferenceGenericNestedCallReturningConstructor.ts, 8, 34)) +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 9, 13)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 8, 24)) + +): { + new (ctx: TContext): AssignAction; +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 11, 7)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 8, 24)) +>AssignAction : Symbol(AssignAction, Decl(inferenceGenericNestedCallReturningConstructor.ts, 2, 1)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 8, 24)) +} + +declare function createMachine(config: { +>createMachine : Symbol(createMachine, Decl(inferenceGenericNestedCallReturningConstructor.ts, 12, 1)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 14, 31)) +>config : Symbol(config, Decl(inferenceGenericNestedCallReturningConstructor.ts, 14, 41)) + + context: TContext; +>context : Symbol(context, Decl(inferenceGenericNestedCallReturningConstructor.ts, 14, 50)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 14, 31)) + + entry: Action; +>entry : Symbol(entry, Decl(inferenceGenericNestedCallReturningConstructor.ts, 15, 20)) +>Action : Symbol(Action, Decl(inferenceGenericNestedCallReturningConstructor.ts, 0, 0)) +>TContext : Symbol(TContext, Decl(inferenceGenericNestedCallReturningConstructor.ts, 14, 31)) + +}): void; + +createMachine({ +>createMachine : Symbol(createMachine, Decl(inferenceGenericNestedCallReturningConstructor.ts, 12, 1)) + + context: { count: 0 }, +>context : Symbol(context, Decl(inferenceGenericNestedCallReturningConstructor.ts, 19, 15)) +>count : Symbol(count, Decl(inferenceGenericNestedCallReturningConstructor.ts, 20, 12)) + + entry: assign((ctx) => { +>entry : Symbol(entry, Decl(inferenceGenericNestedCallReturningConstructor.ts, 20, 24)) +>assign : Symbol(assign, Decl(inferenceGenericNestedCallReturningConstructor.ts, 6, 1)) +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 21, 17)) + + ctx // { count: number } +>ctx : Symbol(ctx, Decl(inferenceGenericNestedCallReturningConstructor.ts, 21, 17)) + + }), +}); + diff --git a/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.types b/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.types new file mode 100644 index 00000000000..ce6d09b4d32 --- /dev/null +++ b/tests/baselines/reference/inferenceGenericNestedCallReturningConstructor.types @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/inferenceGenericNestedCallReturningConstructor.ts] //// + +=== inferenceGenericNestedCallReturningConstructor.ts === +interface Action { + new (ctx: TContext): void; +>ctx : TContext +} + +declare class AssignAction { +>AssignAction : AssignAction + + constructor(ctx: TContext); +>ctx : TContext +} + +declare function assign( +>assign : (assigner: (ctx: TContext) => void) => new (ctx: TContext) => AssignAction + + assigner: (ctx: TContext) => void +>assigner : (ctx: TContext) => void +>ctx : TContext + +): { + new (ctx: TContext): AssignAction; +>ctx : TContext +} + +declare function createMachine(config: { +>createMachine : (config: { context: TContext; entry: Action;}) => void +>config : { context: TContext; entry: Action; } + + context: TContext; +>context : TContext + + entry: Action; +>entry : Action + +}): void; + +createMachine({ +>createMachine({ context: { count: 0 }, entry: assign((ctx) => { ctx // { count: number } }),}) : void +>createMachine : (config: { context: TContext; entry: Action; }) => void +>{ context: { count: 0 }, entry: assign((ctx) => { ctx // { count: number } }),} : { context: { count: number; }; entry: new (ctx: { count: number; }) => AssignAction<{ count: number; }>; } + + context: { count: 0 }, +>context : { count: number; } +>{ count: 0 } : { count: number; } +>count : number +>0 : 0 + + entry: assign((ctx) => { +>entry : new (ctx: { count: number; }) => AssignAction<{ count: number; }> +>assign((ctx) => { ctx // { count: number } }) : new (ctx: { count: number; }) => AssignAction<{ count: number; }> +>assign : (assigner: (ctx: TContext) => void) => new (ctx: TContext) => AssignAction +>(ctx) => { ctx // { count: number } } : (ctx: { count: number; }) => void +>ctx : { count: number; } + + ctx // { count: number } +>ctx : { count: number; } + + }), +}); + diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.errors.txt b/tests/baselines/reference/inheritedConstructorWithRestParams2.errors.txt index 72d61115a5c..1ab73825ea5 100644 --- a/tests/baselines/reference/inheritedConstructorWithRestParams2.errors.txt +++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.errors.txt @@ -1,10 +1,10 @@ inheritedConstructorWithRestParams2.ts(32,13): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. -inheritedConstructorWithRestParams2.ts(33,1): error TS2769: No overload matches this call. +inheritedConstructorWithRestParams2.ts(33,5): error TS2769: No overload matches this call. Overload 1 of 3, '(x: string, ...y: number[]): Derived', gave the following error. Argument of type 'string' is not assignable to parameter of type 'number'. Overload 2 of 3, '(x1: string, x2: string, ...y: number[]): Derived', gave the following error. Argument of type 'number' is not assignable to parameter of type 'string'. -inheritedConstructorWithRestParams2.ts(34,1): error TS2769: No overload matches this call. +inheritedConstructorWithRestParams2.ts(34,5): error TS2769: No overload matches this call. Overload 1 of 3, '(x: string, ...y: number[]): Derived', gave the following error. Argument of type 'string' is not assignable to parameter of type 'number'. Overload 2 of 3, '(x1: string, x2: string, ...y: number[]): Derived', gave the following error. @@ -47,14 +47,14 @@ inheritedConstructorWithRestParams2.ts(34,1): error TS2769: No overload matches ~ !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. new Derived("", 3, "", 3); - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(x: string, ...y: number[]): Derived', gave the following error. !!! error TS2769: Argument of type 'string' is not assignable to parameter of type 'number'. !!! error TS2769: Overload 2 of 3, '(x1: string, x2: string, ...y: number[]): Derived', gave the following error. !!! error TS2769: Argument of type 'number' is not assignable to parameter of type 'string'. new Derived("", 3, "", ""); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(x: string, ...y: number[]): Derived', gave the following error. !!! error TS2769: Argument of type 'string' is not assignable to parameter of type 'number'. diff --git a/tests/baselines/reference/inlayHintsInteractiveFunctionParameterTypes1.baseline b/tests/baselines/reference/inlayHintsInteractiveFunctionParameterTypes1.baseline index 4a361466288..e845d97ca77 100644 --- a/tests/baselines/reference/inlayHintsInteractiveFunctionParameterTypes1.baseline +++ b/tests/baselines/reference/inlayHintsInteractiveFunctionParameterTypes1.baseline @@ -262,6 +262,30 @@ { "text": "; " }, + { + "text": "[" + }, + { + "text": "i" + }, + { + "text": ": " + }, + { + "text": "string" + }, + { + "text": "]" + }, + { + "text": ": " + }, + { + "text": "number" + }, + { + "text": "; " + }, { "text": "a" }, @@ -464,7 +488,7 @@ "text": "}" } ], - "position": 646, + "position": 671, "kind": "Type", "whitespaceBefore": true } @@ -490,7 +514,7 @@ "text": "42" } ], - "position": 716, + "position": 741, "kind": "Type", "whitespaceBefore": true } @@ -506,13 +530,60 @@ foo4(p => {}) { "text": "Thing", "span": { - "start": 735, + "start": 760, "length": 5 }, "file": "/tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes1.ts" } ], - "position": 801, + "position": 826, + "kind": "Type", + "whitespaceBefore": true +} + + const foo5: F4 = (a) => { } + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "{" + }, + { + "text": " " + }, + { + "text": "[" + }, + { + "text": "x" + }, + { + "text": ": " + }, + { + "text": "string" + }, + { + "text": "]" + }, + { + "text": ": " + }, + { + "text": "number" + }, + { + "text": " " + }, + { + "text": "}" + } + ], + "position": 910, "kind": "Type", "whitespaceBefore": true } \ No newline at end of file diff --git a/tests/baselines/reference/inlayHintsInteractiveRestParameters3.baseline b/tests/baselines/reference/inlayHintsInteractiveRestParameters3.baseline new file mode 100644 index 00000000000..ff7ae302d2b --- /dev/null +++ b/tests/baselines/reference/inlayHintsInteractiveRestParameters3.baseline @@ -0,0 +1,27 @@ +// === Inlay Hints === +fn(...foo, 3, 4); + ^ +{ + "text": "x:", + "position": 133, + "kind": "Parameter", + "whitespaceAfter": true +} + +fn(...foo, 3, 4); + ^ +{ + "text": "a:", + "position": 141, + "kind": "Parameter", + "whitespaceAfter": true +} + +fn(...foo, 3, 4); + ^ +{ + "text": "b:", + "position": 144, + "kind": "Parameter", + "whitespaceAfter": true +} \ No newline at end of file diff --git a/tests/baselines/reference/inlayHintsInteractiveReturnType.baseline b/tests/baselines/reference/inlayHintsInteractiveReturnType.baseline index 62d9fe4979f..0b69fef7e67 100644 --- a/tests/baselines/reference/inlayHintsInteractiveReturnType.baseline +++ b/tests/baselines/reference/inlayHintsInteractiveReturnType.baseline @@ -33,6 +33,23 @@ function foo1 () { "whitespaceBefore": true } + bar() { + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "this" + } + ], + "position": 130, + "kind": "Type", + "whitespaceBefore": true +} + const a = () => 1 ^ { @@ -45,7 +62,7 @@ const a = () => 1 "text": "number" } ], - "position": 135, + "position": 173, "kind": "Type", "whitespaceBefore": true } @@ -62,7 +79,7 @@ const b = function () { return 1 } "text": "number" } ], - "position": 162, + "position": 200, "kind": "Type", "whitespaceBefore": true } @@ -79,7 +96,7 @@ const c = (b) => 1 "text": "number" } ], - "position": 189, + "position": 227, "kind": "Type", "whitespaceBefore": true } \ No newline at end of file diff --git a/tests/baselines/reference/inlayHintsInteractiveTemplateLiteralTypes.baseline b/tests/baselines/reference/inlayHintsInteractiveTemplateLiteralTypes.baseline new file mode 100644 index 00000000000..51e7aa59b93 --- /dev/null +++ b/tests/baselines/reference/inlayHintsInteractiveTemplateLiteralTypes.baseline @@ -0,0 +1,116 @@ +// === Inlay Hints === +const lit1 = getTemplateLiteral1(); + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "`${" + }, + { + "text": "string" + }, + { + "text": "},${" + }, + { + "text": "string" + }, + { + "text": "}`" + } + ], + "position": 73, + "kind": "Type", + "whitespaceBefore": true +} + +const lit2 = getTemplateLiteral2(); + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "`\\${${" + }, + { + "text": "string" + }, + { + "text": "},${" + }, + { + "text": "string" + }, + { + "text": "}`" + } + ], + "position": 175, + "kind": "Type", + "whitespaceBefore": true +} + +const lit3 = getTemplateLiteral3(); + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "`start${" + }, + { + "text": "string" + }, + { + "text": "}\\${,$${" + }, + { + "text": "string" + }, + { + "text": "}end`" + } + ], + "position": 286, + "kind": "Type", + "whitespaceBefore": true +} + +const lit4 = getTemplateLiteral4(); + ^ +{ + "text": "", + "displayParts": [ + { + "text": ": " + }, + { + "text": "`${" + }, + { + "text": "string" + }, + { + "text": "}\\`,${" + }, + { + "text": "string" + }, + { + "text": "}`" + } + ], + "position": 387, + "kind": "Type", + "whitespaceBefore": true +} \ No newline at end of file diff --git a/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.symbols b/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.symbols new file mode 100644 index 00000000000..034306a4d3a --- /dev/null +++ b/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.symbols @@ -0,0 +1,37 @@ +//// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/intersectionIncludingPropFromGlobalAugmentation.ts] //// + +=== intersectionIncludingPropFromGlobalAugmentation.ts === +// repro from https://github.com/microsoft/TypeScript/issues/54345 + +interface Test1 { toString: null | 'string'; } +>Test1 : Symbol(Test1, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 0, 0)) +>toString : Symbol(Test1.toString, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 2, 17)) + +type Test2 = Test1 & { optional?: unknown }; +>Test2 : Symbol(Test2, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 2, 46)) +>Test1 : Symbol(Test1, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 0, 0)) +>optional : Symbol(optional, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 3, 22)) + +declare const source: Test1; +>source : Symbol(source, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 4, 13)) +>Test1 : Symbol(Test1, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 0, 0)) + +const target: Test2 = { ...source }; +>target : Symbol(target, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 5, 5)) +>Test2 : Symbol(Test2, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 2, 46)) +>source : Symbol(source, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 4, 13)) + +const toString = target.toString; +>toString : Symbol(toString, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 7, 5)) +>target.toString : Symbol(Test1.toString, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 2, 17)) +>target : Symbol(target, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 5, 5)) +>toString : Symbol(Test1.toString, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 2, 17)) + +const hasOwn = target.hasOwnProperty; // not an own member but it should still be accessible +>hasOwn : Symbol(hasOwn, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 8, 5)) +>target.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --)) +>target : Symbol(target, Decl(intersectionIncludingPropFromGlobalAugmentation.ts, 5, 5)) +>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --)) + +export {} + diff --git a/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.types b/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.types new file mode 100644 index 00000000000..8133c1d8985 --- /dev/null +++ b/tests/baselines/reference/intersectionIncludingPropFromGlobalAugmentation.types @@ -0,0 +1,34 @@ +//// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/intersectionIncludingPropFromGlobalAugmentation.ts] //// + +=== intersectionIncludingPropFromGlobalAugmentation.ts === +// repro from https://github.com/microsoft/TypeScript/issues/54345 + +interface Test1 { toString: null | 'string'; } +>toString : "string" | null + +type Test2 = Test1 & { optional?: unknown }; +>Test2 : Test1 & { optional?: unknown; } +>optional : unknown + +declare const source: Test1; +>source : Test1 + +const target: Test2 = { ...source }; +>target : Test2 +>{ ...source } : { toString: "string" | null; } +>source : Test1 + +const toString = target.toString; +>toString : "string" | null +>target.toString : "string" | null +>target : Test2 +>toString : "string" | null + +const hasOwn = target.hasOwnProperty; // not an own member but it should still be accessible +>hasOwn : (v: PropertyKey) => boolean +>target.hasOwnProperty : (v: PropertyKey) => boolean +>target : Test2 +>hasOwnProperty : (v: PropertyKey) => boolean + +export {} + diff --git a/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.symbols b/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.symbols new file mode 100644 index 00000000000..a7673bd8bcd --- /dev/null +++ b/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.symbols @@ -0,0 +1,39 @@ +//// [tests/cases/compiler/intersectionWithConstructSignaturePrototypeResult.ts] //// + +=== intersectionWithConstructSignaturePrototypeResult.ts === +declare class EmberObject {} +>EmberObject : Symbol(EmberObject, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 0)) + +type PersonType = Readonly & +>PersonType : Symbol(PersonType, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 28)) +>Readonly : Symbol(Readonly, Decl(lib.es5.d.ts, --, --)) +>EmberObject : Symbol(EmberObject, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 0)) + + (new (properties?: object) => { +>properties : Symbol(properties, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 3, 8)) + + firstName: string; +>firstName : Symbol(firstName, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 3, 33)) + + lastName: string; +>lastName : Symbol(lastName, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 4, 22)) + + } & EmberObject) & +>EmberObject : Symbol(EmberObject, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 0)) + + (new (...args: any[]) => { +>args : Symbol(args, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 7, 8)) + + firstName: string; +>firstName : Symbol(firstName, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 7, 28)) + + lastName: string; +>lastName : Symbol(lastName, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 8, 22)) + + } & EmberObject); +>EmberObject : Symbol(EmberObject, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 0)) + +type PersonPrototype = PersonType["prototype"]; +>PersonPrototype : Symbol(PersonPrototype, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 10, 19)) +>PersonType : Symbol(PersonType, Decl(intersectionWithConstructSignaturePrototypeResult.ts, 0, 28)) + diff --git a/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.types b/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.types new file mode 100644 index 00000000000..1284561880a --- /dev/null +++ b/tests/baselines/reference/intersectionWithConstructSignaturePrototypeResult.types @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/intersectionWithConstructSignaturePrototypeResult.ts] //// + +=== intersectionWithConstructSignaturePrototypeResult.ts === +declare class EmberObject {} +>EmberObject : EmberObject + +type PersonType = Readonly & +>PersonType : Readonly & (new (properties?: object) => { firstName: string; lastName: string;} & EmberObject) & (new (...args: any[]) => { firstName: string; lastName: string;} & EmberObject) +>EmberObject : typeof EmberObject + + (new (properties?: object) => { +>properties : object | undefined + + firstName: string; +>firstName : string + + lastName: string; +>lastName : string + + } & EmberObject) & + (new (...args: any[]) => { +>args : any[] + + firstName: string; +>firstName : string + + lastName: string; +>lastName : string + + } & EmberObject); + +type PersonPrototype = PersonType["prototype"]; +>PersonPrototype : EmberObject + diff --git a/tests/baselines/reference/intersectionWithUnionConstraint.types b/tests/baselines/reference/intersectionWithUnionConstraint.types index d687036196c..86c318fe89b 100644 --- a/tests/baselines/reference/intersectionWithUnionConstraint.types +++ b/tests/baselines/reference/intersectionWithUnionConstraint.types @@ -45,7 +45,7 @@ type T1 = (string | number | undefined) & (string | null | undefined); // strin function f3(x: T & (number | object | undefined)) { >f3 : (x: T & (number | object | undefined)) => void ->x : T & (number | object | undefined) +>x : (T & undefined) | (T & number) const y: number | undefined = x; >y : number | undefined @@ -54,7 +54,7 @@ function f3(x: T & (number | object | und function f4(x: T & (number | object)) { >f4 : (x: T & (number | object)) => void ->x : T & (number | object) +>x : T & number const y: number = x; >y : number diff --git a/tests/baselines/reference/iterableArrayPattern25.errors.txt b/tests/baselines/reference/iterableArrayPattern25.errors.txt index ed6c97821e4..c6b51107ff9 100644 --- a/tests/baselines/reference/iterableArrayPattern25.errors.txt +++ b/tests/baselines/reference/iterableArrayPattern25.errors.txt @@ -4,5 +4,5 @@ iterableArrayPattern25.ts(2,1): error TS2554: Expected 2 arguments, but got 1. ==== iterableArrayPattern25.ts (1 errors) ==== function takeFirstTwoEntries(...[[k1, v1], [k2, v2]]) { } takeFirstTwoEntries(new Map([["", 0], ["hello", 1]])); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. \ No newline at end of file diff --git a/tests/baselines/reference/iterableArrayPattern28.errors.txt b/tests/baselines/reference/iterableArrayPattern28.errors.txt index 70bab6d9c7d..2949a043fed 100644 --- a/tests/baselines/reference/iterableArrayPattern28.errors.txt +++ b/tests/baselines/reference/iterableArrayPattern28.errors.txt @@ -1,4 +1,4 @@ -iterableArrayPattern28.ts(2,24): error TS2769: No overload matches this call. +iterableArrayPattern28.ts(2,28): error TS2769: No overload matches this call. Overload 1 of 4, '(iterable?: Iterable): Map', gave the following error. Argument of type '([string, number] | [string, boolean])[]' is not assignable to parameter of type 'Iterable'. The types returned by '[Symbol.iterator]().next(...)' are incompatible between these types. @@ -16,7 +16,7 @@ iterableArrayPattern28.ts(2,24): error TS2769: No overload matches this call. ==== iterableArrayPattern28.ts (1 errors) ==== function takeFirstTwoEntries(...[[k1, v1], [k2, v2]]: [string, number][]) { } takeFirstTwoEntries(...new Map([["", 0], ["hello", true]])); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 4, '(iterable?: Iterable): Map', gave the following error. !!! error TS2769: Argument of type '([string, number] | [string, boolean])[]' is not assignable to parameter of type 'Iterable'. diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt index 2bc8e0f4452..83cde6079b3 100644 --- a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt +++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt @@ -14,15 +14,15 @@ bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2. ==== bar.ts (3 errors) ==== f(); // Error - ~~~ + ~ !!! error TS2554: Expected 3 arguments, but got 0. !!! related TS6210 foo.js:6:12: An argument for 'a' was not provided. f(1); // Error - ~~~~ + ~ !!! error TS2554: Expected 3 arguments, but got 1. !!! related TS6210 foo.js:6:15: An argument for 'b' was not provided. f(1, 2); // Error - ~~~~~~~ + ~ !!! error TS2554: Expected 3 arguments, but got 2. !!! related TS6210 foo.js:6:18: An argument for 'c' was not provided. diff --git a/tests/baselines/reference/jsdocLinkTag7.symbols b/tests/baselines/reference/jsdocLinkTag7.symbols new file mode 100644 index 00000000000..1d37cb07a9d --- /dev/null +++ b/tests/baselines/reference/jsdocLinkTag7.symbols @@ -0,0 +1,26 @@ +//// [tests/cases/conformance/jsdoc/jsdocLinkTag7.ts] //// + +=== /a.js === +class Foo { +>Foo : Symbol(Foo, Decl(a.js, 0, 0)) + + /** + * {@linkcode this.a} + * {@linkcode this.#c} + * + * {@link this.a} + * {@link this.#c} + * + * {@linkplain this.a} + * {@linkplain this.#c} + */ + a() { } +>a : Symbol(Foo.a, Decl(a.js, 0, 11)) + + b() { } +>b : Symbol(Foo.b, Decl(a.js, 11, 11)) + + #c() { } +>#c : Symbol(Foo.#c, Decl(a.js, 12, 11)) +} + diff --git a/tests/baselines/reference/jsdocLinkTag7.types b/tests/baselines/reference/jsdocLinkTag7.types new file mode 100644 index 00000000000..ca6cd364fc5 --- /dev/null +++ b/tests/baselines/reference/jsdocLinkTag7.types @@ -0,0 +1,26 @@ +//// [tests/cases/conformance/jsdoc/jsdocLinkTag7.ts] //// + +=== /a.js === +class Foo { +>Foo : Foo + + /** + * {@linkcode this.a} + * {@linkcode this.#c} + * + * {@link this.a} + * {@link this.#c} + * + * {@linkplain this.a} + * {@linkplain this.#c} + */ + a() { } +>a : () => void + + b() { } +>b : () => void + + #c() { } +>#c : () => void +} + diff --git a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt index 75de95aa76e..3eaebfdd981 100644 --- a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt +++ b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt @@ -15,15 +15,15 @@ a.js(13,1): error TS2554: Expected 1 arguments, but got 0. } f() // should error - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 a.js:1:21: An argument for '0' was not provided. g() // should error - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 a.js:4:13: An argument for 's' was not provided. h() - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 a.js:7:14: An argument for 's' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/jsxChildrenArrayWrongType.errors.txt b/tests/baselines/reference/jsxChildrenArrayWrongType.errors.txt index 1024ee2d8ce..7ea707efe4d 100644 --- a/tests/baselines/reference/jsxChildrenArrayWrongType.errors.txt +++ b/tests/baselines/reference/jsxChildrenArrayWrongType.errors.txt @@ -1,4 +1,4 @@ -index.tsx(11,5): error TS2769: No overload matches this call. +index.tsx(11,6): error TS2769: No overload matches this call. Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. Type 'unknown' is not assignable to type 'string | boolean'. Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. @@ -17,7 +17,7 @@ index.tsx(11,5): error TS2769: No overload matches this call. declare class Foo extends React.Component {} const b = ( - ~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. !!! error TS2769: Type 'unknown' is not assignable to type 'string | boolean'. diff --git a/tests/baselines/reference/jsxChildrenWrongType.errors.txt b/tests/baselines/reference/jsxChildrenWrongType.errors.txt index e2e751bdda7..a57aa8ba9a2 100644 --- a/tests/baselines/reference/jsxChildrenWrongType.errors.txt +++ b/tests/baselines/reference/jsxChildrenWrongType.errors.txt @@ -1,4 +1,4 @@ -other.tsx(10,5): error TS2769: No overload matches this call. +other.tsx(10,6): error TS2769: No overload matches this call. Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. Type 'unknown' is not assignable to type 'string | boolean'. Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. @@ -16,7 +16,7 @@ other.tsx(10,5): error TS2769: No overload matches this call. declare class Foo extends React.Component {} const b = ( - ~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 2 of 2, '(props: PropsType, context: any): Foo', gave the following error. !!! error TS2769: Type 'unknown' is not assignable to type 'string | boolean'. diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt index 803940642b1..e19b848ab74 100644 --- a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt +++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt @@ -40,10 +40,8 @@ keyofAndIndexedAccessErrors.ts(87,5): error TS2322: Type 'keyof T | keyof U' is Type 'keyof T' is not assignable to type 'keyof T & keyof U'. keyofAndIndexedAccessErrors.ts(103,9): error TS2322: Type 'Extract' is not assignable to type 'K'. 'Extract' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. - Type 'string & keyof T' is not assignable to type 'K'. - 'string & keyof T' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. - Type 'string' is not assignable to type 'K'. - 'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. + Type 'string' is not assignable to type 'K'. + 'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. keyofAndIndexedAccessErrors.ts(105,9): error TS2322: Type 'T[Extract]' is not assignable to type 'T[K]'. Type 'Extract' is not assignable to type 'K'. 'Extract' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. @@ -247,10 +245,8 @@ keyofAndIndexedAccessErrors.ts(165,5): error TS2322: Type 'number' is not assign ~ !!! error TS2322: Type 'Extract' is not assignable to type 'K'. !!! error TS2322: 'Extract' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. -!!! error TS2322: Type 'string & keyof T' is not assignable to type 'K'. -!!! error TS2322: 'string & keyof T' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. -!!! error TS2322: Type 'string' is not assignable to type 'K'. -!!! error TS2322: 'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. +!!! error TS2322: Type 'string' is not assignable to type 'K'. +!!! error TS2322: 'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'. t[key] = tk; // ok, T[K] ==> T[keyof T] tk = t[key]; // error, T[keyof T] =/=> T[K] ~~ diff --git a/tests/baselines/reference/localesObjectArgument.js b/tests/baselines/reference/localesObjectArgument.js index 1136ea6364e..59a1ddaa9d3 100644 --- a/tests/baselines/reference/localesObjectArgument.js +++ b/tests/baselines/reference/localesObjectArgument.js @@ -8,6 +8,7 @@ const jaJP = new Intl.Locale("ja-JP"); const now = new Date(); const num = 1000; const bigint = 123456789123456789n; +const str = ""; now.toLocaleString(enUS); now.toLocaleDateString(enUS); @@ -21,6 +22,38 @@ num.toLocaleString([deDE, jaJP]); bigint.toLocaleString(enUS); bigint.toLocaleString([deDE, jaJP]); + +str.toLocaleLowerCase(enUS); +str.toLocaleLowerCase([deDE, jaJP]); +str.toLocaleUpperCase(enUS); +str.toLocaleUpperCase([deDE, jaJP]); +str.localeCompare(str, enUS); +str.localeCompare(str, [deDE, jaJP]); + +new Intl.PluralRules(enUS); +new Intl.PluralRules([deDE, jaJP]); +Intl.PluralRules.supportedLocalesOf(enUS); +Intl.PluralRules.supportedLocalesOf([deDE, jaJP]); + +new Intl.RelativeTimeFormat(enUS); +new Intl.RelativeTimeFormat([deDE, jaJP]); +Intl.RelativeTimeFormat.supportedLocalesOf(enUS); +Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]); + +new Intl.Collator(enUS); +new Intl.Collator([deDE, jaJP]); +Intl.Collator.supportedLocalesOf(enUS); +Intl.Collator.supportedLocalesOf([deDE, jaJP]); + +new Intl.DateTimeFormat(enUS); +new Intl.DateTimeFormat([deDE, jaJP]); +Intl.DateTimeFormat.supportedLocalesOf(enUS); +Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]); + +new Intl.NumberFormat(enUS); +new Intl.NumberFormat([deDE, jaJP]); +Intl.NumberFormat.supportedLocalesOf(enUS); +Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]); //// [localesObjectArgument.js] @@ -30,6 +63,7 @@ const jaJP = new Intl.Locale("ja-JP"); const now = new Date(); const num = 1000; const bigint = 123456789123456789n; +const str = ""; now.toLocaleString(enUS); now.toLocaleDateString(enUS); now.toLocaleTimeString(enUS); @@ -40,3 +74,29 @@ num.toLocaleString(enUS); num.toLocaleString([deDE, jaJP]); bigint.toLocaleString(enUS); bigint.toLocaleString([deDE, jaJP]); +str.toLocaleLowerCase(enUS); +str.toLocaleLowerCase([deDE, jaJP]); +str.toLocaleUpperCase(enUS); +str.toLocaleUpperCase([deDE, jaJP]); +str.localeCompare(str, enUS); +str.localeCompare(str, [deDE, jaJP]); +new Intl.PluralRules(enUS); +new Intl.PluralRules([deDE, jaJP]); +Intl.PluralRules.supportedLocalesOf(enUS); +Intl.PluralRules.supportedLocalesOf([deDE, jaJP]); +new Intl.RelativeTimeFormat(enUS); +new Intl.RelativeTimeFormat([deDE, jaJP]); +Intl.RelativeTimeFormat.supportedLocalesOf(enUS); +Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]); +new Intl.Collator(enUS); +new Intl.Collator([deDE, jaJP]); +Intl.Collator.supportedLocalesOf(enUS); +Intl.Collator.supportedLocalesOf([deDE, jaJP]); +new Intl.DateTimeFormat(enUS); +new Intl.DateTimeFormat([deDE, jaJP]); +Intl.DateTimeFormat.supportedLocalesOf(enUS); +Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]); +new Intl.NumberFormat(enUS); +new Intl.NumberFormat([deDE, jaJP]); +Intl.NumberFormat.supportedLocalesOf(enUS); +Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/baselines/reference/localesObjectArgument.symbols b/tests/baselines/reference/localesObjectArgument.symbols index 7b8e692cadf..c2c21e66824 100644 --- a/tests/baselines/reference/localesObjectArgument.symbols +++ b/tests/baselines/reference/localesObjectArgument.symbols @@ -29,6 +29,9 @@ const num = 1000; const bigint = 123456789123456789n; >bigint : Symbol(bigint, Decl(localesObjectArgument.ts, 6, 5)) +const str = ""; +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) + now.toLocaleString(enUS); >now.toLocaleString : Symbol(Date.toLocaleString, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.date.d.ts, --, --)) >now : Symbol(now, Decl(localesObjectArgument.ts, 4, 5)) @@ -94,3 +97,194 @@ bigint.toLocaleString([deDE, jaJP]); >deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) >jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) +str.toLocaleLowerCase(enUS); +>str.toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +str.toLocaleLowerCase([deDE, jaJP]); +>str.toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +str.toLocaleUpperCase(enUS); +>str.toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +str.toLocaleUpperCase([deDE, jaJP]); +>str.toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +str.localeCompare(str, enUS); +>str.localeCompare : Symbol(String.localeCompare, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>localeCompare : Symbol(String.localeCompare, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +str.localeCompare(str, [deDE, jaJP]); +>str.localeCompare : Symbol(String.localeCompare, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>localeCompare : Symbol(String.localeCompare, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.string.d.ts, --, --)) +>str : Symbol(str, Decl(localesObjectArgument.ts, 7, 5)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +new Intl.PluralRules(enUS); +>Intl.PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +new Intl.PluralRules([deDE, jaJP]); +>Intl.PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +Intl.PluralRules.supportedLocalesOf(enUS); +>Intl.PluralRules.supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +Intl.PluralRules.supportedLocalesOf([deDE, jaJP]); +>Intl.PluralRules.supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>PluralRules : Symbol(Intl.PluralRules, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.PluralRulesConstructor.supportedLocalesOf, Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +new Intl.RelativeTimeFormat(enUS); +>Intl.RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +new Intl.RelativeTimeFormat([deDE, jaJP]); +>Intl.RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +Intl.RelativeTimeFormat.supportedLocalesOf(enUS); +>Intl.RelativeTimeFormat.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.RelativeTimeFormat.supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>RelativeTimeFormat : Symbol(Intl.RelativeTimeFormat, Decl(lib.es2020.intl.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(supportedLocalesOf, Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +new Intl.Collator(enUS); +>Intl.Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +new Intl.Collator([deDE, jaJP]); +>Intl.Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +Intl.Collator.supportedLocalesOf(enUS); +>Intl.Collator.supportedLocalesOf : Symbol(Intl.CollatorConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.CollatorConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +Intl.Collator.supportedLocalesOf([deDE, jaJP]); +>Intl.Collator.supportedLocalesOf : Symbol(Intl.CollatorConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>Collator : Symbol(Intl.Collator, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.CollatorConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +new Intl.DateTimeFormat(enUS); +>Intl.DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +new Intl.DateTimeFormat([deDE, jaJP]); +>Intl.DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +Intl.DateTimeFormat.supportedLocalesOf(enUS); +>Intl.DateTimeFormat.supportedLocalesOf : Symbol(Intl.DateTimeFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.DateTimeFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.DateTimeFormat.supportedLocalesOf : Symbol(Intl.DateTimeFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>DateTimeFormat : Symbol(Intl.DateTimeFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.DateTimeFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +new Intl.NumberFormat(enUS); +>Intl.NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +new Intl.NumberFormat([deDE, jaJP]); +>Intl.NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + +Intl.NumberFormat.supportedLocalesOf(enUS); +>Intl.NumberFormat.supportedLocalesOf : Symbol(Intl.NumberFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.NumberFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>enUS : Symbol(enUS, Decl(localesObjectArgument.ts, 0, 5)) + +Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.NumberFormat.supportedLocalesOf : Symbol(Intl.NumberFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>Intl.NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2016.intl.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --) ... and 2 more) +>NumberFormat : Symbol(Intl.NumberFormat, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --)) +>supportedLocalesOf : Symbol(Intl.NumberFormatConstructor.supportedLocalesOf, Decl(lib.es5.d.ts, --, --), Decl(lib.es2020.intl.d.ts, --, --)) +>deDE : Symbol(deDE, Decl(localesObjectArgument.ts, 1, 5)) +>jaJP : Symbol(jaJP, Decl(localesObjectArgument.ts, 2, 5)) + diff --git a/tests/baselines/reference/localesObjectArgument.types b/tests/baselines/reference/localesObjectArgument.types index d7e428d1794..075b79567ff 100644 --- a/tests/baselines/reference/localesObjectArgument.types +++ b/tests/baselines/reference/localesObjectArgument.types @@ -38,6 +38,10 @@ const bigint = 123456789123456789n; >bigint : 123456789123456789n >123456789123456789n : 123456789123456789n +const str = ""; +>str : "" +>"" : "" + now.toLocaleString(enUS); >now.toLocaleString(enUS) : string >now.toLocaleString : { (): string; (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string; (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string; } @@ -118,3 +122,233 @@ bigint.toLocaleString([deDE, jaJP]); >deDE : Intl.Locale >jaJP : Intl.Locale +str.toLocaleLowerCase(enUS); +>str.toLocaleLowerCase(enUS) : string +>str.toLocaleLowerCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>str : "" +>toLocaleLowerCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>enUS : Intl.Locale + +str.toLocaleLowerCase([deDE, jaJP]); +>str.toLocaleLowerCase([deDE, jaJP]) : string +>str.toLocaleLowerCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>str : "" +>toLocaleLowerCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +str.toLocaleUpperCase(enUS); +>str.toLocaleUpperCase(enUS) : string +>str.toLocaleUpperCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>str : "" +>toLocaleUpperCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>enUS : Intl.Locale + +str.toLocaleUpperCase([deDE, jaJP]); +>str.toLocaleUpperCase([deDE, jaJP]) : string +>str.toLocaleUpperCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>str : "" +>toLocaleUpperCase : { (locales?: string | string[]): string; (locales?: Intl.LocalesArgument): string; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +str.localeCompare(str, enUS); +>str.localeCompare(str, enUS) : number +>str.localeCompare : { (that: string): number; (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number; (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number; } +>str : "" +>localeCompare : { (that: string): number; (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number; (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number; } +>str : "" +>enUS : Intl.Locale + +str.localeCompare(str, [deDE, jaJP]); +>str.localeCompare(str, [deDE, jaJP]) : number +>str.localeCompare : { (that: string): number; (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number; (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number; } +>str : "" +>localeCompare : { (that: string): number; (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number; (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number; } +>str : "" +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +new Intl.PluralRules(enUS); +>new Intl.PluralRules(enUS) : Intl.PluralRules +>Intl.PluralRules : Intl.PluralRulesConstructor +>Intl : typeof Intl +>PluralRules : Intl.PluralRulesConstructor +>enUS : Intl.Locale + +new Intl.PluralRules([deDE, jaJP]); +>new Intl.PluralRules([deDE, jaJP]) : Intl.PluralRules +>Intl.PluralRules : Intl.PluralRulesConstructor +>Intl : typeof Intl +>PluralRules : Intl.PluralRulesConstructor +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.PluralRules.supportedLocalesOf(enUS); +>Intl.PluralRules.supportedLocalesOf(enUS) : string[] +>Intl.PluralRules.supportedLocalesOf : { (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; (locales: Intl.LocalesArgument, options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>Intl.PluralRules : Intl.PluralRulesConstructor +>Intl : typeof Intl +>PluralRules : Intl.PluralRulesConstructor +>supportedLocalesOf : { (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; (locales: Intl.LocalesArgument, options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>enUS : Intl.Locale + +Intl.PluralRules.supportedLocalesOf([deDE, jaJP]); +>Intl.PluralRules.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.PluralRules.supportedLocalesOf : { (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; (locales: Intl.LocalesArgument, options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>Intl.PluralRules : Intl.PluralRulesConstructor +>Intl : typeof Intl +>PluralRules : Intl.PluralRulesConstructor +>supportedLocalesOf : { (locales: string | string[], options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; (locales: Intl.LocalesArgument, options?: { localeMatcher?: "lookup" | "best fit"; }): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +new Intl.RelativeTimeFormat(enUS); +>new Intl.RelativeTimeFormat(enUS) : Intl.RelativeTimeFormat +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl : typeof Intl +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>enUS : Intl.Locale + +new Intl.RelativeTimeFormat([deDE, jaJP]); +>new Intl.RelativeTimeFormat([deDE, jaJP]) : Intl.RelativeTimeFormat +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl : typeof Intl +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.RelativeTimeFormat.supportedLocalesOf(enUS); +>Intl.RelativeTimeFormat.supportedLocalesOf(enUS) : string[] +>Intl.RelativeTimeFormat.supportedLocalesOf : (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions) => string[] +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl : typeof Intl +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>supportedLocalesOf : (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions) => string[] +>enUS : Intl.Locale + +Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.RelativeTimeFormat.supportedLocalesOf : (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions) => string[] +>Intl.RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>Intl : typeof Intl +>RelativeTimeFormat : { new (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): Intl.RelativeTimeFormat; supportedLocalesOf(locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions): string[]; } +>supportedLocalesOf : (locales?: Intl.LocalesArgument, options?: Intl.RelativeTimeFormatOptions) => string[] +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +new Intl.Collator(enUS); +>new Intl.Collator(enUS) : Intl.Collator +>Intl.Collator : Intl.CollatorConstructor +>Intl : typeof Intl +>Collator : Intl.CollatorConstructor +>enUS : Intl.Locale + +new Intl.Collator([deDE, jaJP]); +>new Intl.Collator([deDE, jaJP]) : Intl.Collator +>Intl.Collator : Intl.CollatorConstructor +>Intl : typeof Intl +>Collator : Intl.CollatorConstructor +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.Collator.supportedLocalesOf(enUS); +>Intl.Collator.supportedLocalesOf(enUS) : string[] +>Intl.Collator.supportedLocalesOf : { (locales: string | string[], options?: Intl.CollatorOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.CollatorOptions): string[]; } +>Intl.Collator : Intl.CollatorConstructor +>Intl : typeof Intl +>Collator : Intl.CollatorConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.CollatorOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.CollatorOptions): string[]; } +>enUS : Intl.Locale + +Intl.Collator.supportedLocalesOf([deDE, jaJP]); +>Intl.Collator.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.Collator.supportedLocalesOf : { (locales: string | string[], options?: Intl.CollatorOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.CollatorOptions): string[]; } +>Intl.Collator : Intl.CollatorConstructor +>Intl : typeof Intl +>Collator : Intl.CollatorConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.CollatorOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.CollatorOptions): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +new Intl.DateTimeFormat(enUS); +>new Intl.DateTimeFormat(enUS) : Intl.DateTimeFormat +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor +>Intl : typeof Intl +>DateTimeFormat : Intl.DateTimeFormatConstructor +>enUS : Intl.Locale + +new Intl.DateTimeFormat([deDE, jaJP]); +>new Intl.DateTimeFormat([deDE, jaJP]) : Intl.DateTimeFormat +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor +>Intl : typeof Intl +>DateTimeFormat : Intl.DateTimeFormatConstructor +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.DateTimeFormat.supportedLocalesOf(enUS); +>Intl.DateTimeFormat.supportedLocalesOf(enUS) : string[] +>Intl.DateTimeFormat.supportedLocalesOf : { (locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string[]; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor +>Intl : typeof Intl +>DateTimeFormat : Intl.DateTimeFormatConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string[]; } +>enUS : Intl.Locale + +Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.DateTimeFormat.supportedLocalesOf : { (locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string[]; } +>Intl.DateTimeFormat : Intl.DateTimeFormatConstructor +>Intl : typeof Intl +>DateTimeFormat : Intl.DateTimeFormatConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.DateTimeFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +new Intl.NumberFormat(enUS); +>new Intl.NumberFormat(enUS) : Intl.NumberFormat +>Intl.NumberFormat : Intl.NumberFormatConstructor +>Intl : typeof Intl +>NumberFormat : Intl.NumberFormatConstructor +>enUS : Intl.Locale + +new Intl.NumberFormat([deDE, jaJP]); +>new Intl.NumberFormat([deDE, jaJP]) : Intl.NumberFormat +>Intl.NumberFormat : Intl.NumberFormatConstructor +>Intl : typeof Intl +>NumberFormat : Intl.NumberFormatConstructor +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + +Intl.NumberFormat.supportedLocalesOf(enUS); +>Intl.NumberFormat.supportedLocalesOf(enUS) : string[] +>Intl.NumberFormat.supportedLocalesOf : { (locales: string | string[], options?: Intl.NumberFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string[]; } +>Intl.NumberFormat : Intl.NumberFormatConstructor +>Intl : typeof Intl +>NumberFormat : Intl.NumberFormatConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.NumberFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string[]; } +>enUS : Intl.Locale + +Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]); +>Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]) : string[] +>Intl.NumberFormat.supportedLocalesOf : { (locales: string | string[], options?: Intl.NumberFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string[]; } +>Intl.NumberFormat : Intl.NumberFormatConstructor +>Intl : typeof Intl +>NumberFormat : Intl.NumberFormatConstructor +>supportedLocalesOf : { (locales: string | string[], options?: Intl.NumberFormatOptions): string[]; (locales: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string[]; } +>[deDE, jaJP] : Intl.Locale[] +>deDE : Intl.Locale +>jaJP : Intl.Locale + diff --git a/tests/baselines/reference/mappedTypeAsClauses.errors.txt b/tests/baselines/reference/mappedTypeAsClauses.errors.txt index 5f59683d955..2a8538e6860 100644 --- a/tests/baselines/reference/mappedTypeAsClauses.errors.txt +++ b/tests/baselines/reference/mappedTypeAsClauses.errors.txt @@ -1,4 +1,4 @@ -mappedTypeAsClauses.ts(130,3): error TS2345: Argument of type '"a"' is not assignable to parameter of type '"b"'. +mappedTypeAsClauses.ts(131,3): error TS2345: Argument of type '"a"' is not assignable to parameter of type '"b"'. ==== mappedTypeAsClauses.ts (1 errors) ==== @@ -30,7 +30,8 @@ mappedTypeAsClauses.ts(130,3): error TS2345: Argument of type '"a"' is not assig type DoubleProp = { [P in keyof T & string as `${P}1` | `${P}2`]: T[P] } type TD1 = DoubleProp<{ a: string, b: number }>; // { a1: string, a2: string, b1: number, b2: number } type TD2 = keyof TD1; // 'a1' | 'a2' | 'b1' | 'b2' - type TD3 = keyof DoubleProp; // `${keyof U & string}1` | `${keyof U & string}2` + type TD3 = keyof DoubleProp; // keyof DoubleProp + type TD4 = TD3<{ a: string, b: number }>; // 'a1' | 'a2' | 'b1' | 'b2' // Repro from #40619 @@ -155,4 +156,27 @@ mappedTypeAsClauses.ts(130,3): error TS2345: Argument of type '"a"' is not assig type TN3 = keyof { [P in keyof T as Exclude, 'b'>, 'a'>]: string }; type TN4 = keyof { [K in keyof T as (K extends U ? T[K] : never) extends T[K] ? K : never]: string }; type TN5 = keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K : never]: true }]: string }; + + // repro from https://github.com/microsoft/TypeScript/issues/55129 + type Fruit = + | { + name: "apple"; + color: "red"; + } + | { + name: "banana"; + color: "yellow"; + } + | { + name: "orange"; + color: "orange"; + }; + type Result1 = { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown + }; + type Result2 = keyof { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown + } + type Test1 = keyof Result1 // "apple:red" | "banana:yellow" | "orange:orange" + type Test2 = Result2 // "apple:red" | "banana:yellow" | "orange:orange" \ No newline at end of file diff --git a/tests/baselines/reference/mappedTypeAsClauses.js b/tests/baselines/reference/mappedTypeAsClauses.js index be8cfd61431..9f401c2f1ce 100644 --- a/tests/baselines/reference/mappedTypeAsClauses.js +++ b/tests/baselines/reference/mappedTypeAsClauses.js @@ -29,7 +29,8 @@ type TM1 = Methods<{ foo(): number, bar(x: string): boolean, baz: string | numbe type DoubleProp = { [P in keyof T & string as `${P}1` | `${P}2`]: T[P] } type TD1 = DoubleProp<{ a: string, b: number }>; // { a1: string, a2: string, b1: number, b2: number } type TD2 = keyof TD1; // 'a1' | 'a2' | 'b1' | 'b2' -type TD3 = keyof DoubleProp; // `${keyof U & string}1` | `${keyof U & string}2` +type TD3 = keyof DoubleProp; // keyof DoubleProp +type TD4 = TD3<{ a: string, b: number }>; // 'a1' | 'a2' | 'b1' | 'b2' // Repro from #40619 @@ -152,6 +153,29 @@ type TN2 = keyof { [P in keyof T as 'a' extends P ? 'x' : 'y']: string }; type TN3 = keyof { [P in keyof T as Exclude, 'b'>, 'a'>]: string }; type TN4 = keyof { [K in keyof T as (K extends U ? T[K] : never) extends T[K] ? K : never]: string }; type TN5 = keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K : never]: true }]: string }; + +// repro from https://github.com/microsoft/TypeScript/issues/55129 +type Fruit = + | { + name: "apple"; + color: "red"; + } + | { + name: "banana"; + color: "yellow"; + } + | { + name: "orange"; + color: "orange"; + }; +type Result1 = { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +}; +type Result2 = keyof { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +} +type Test1 = keyof Result1 // "apple:red" | "banana:yellow" | "orange:orange" +type Test2 = Result2 // "apple:red" | "banana:yellow" | "orange:orange" //// [mappedTypeAsClauses.js] @@ -217,6 +241,10 @@ type TD1 = DoubleProp<{ }>; type TD2 = keyof TD1; type TD3 = keyof DoubleProp; +type TD4 = TD3<{ + a: string; + b: number; +}>; type Lazyify = { [K in keyof T as `get${Capitalize}`]: () => T[K]; }; @@ -337,3 +365,27 @@ type TN5 = keyof { [P in K as T[P] extends U ? K : never]: true; }]: string; }; +type Fruit = { + name: "apple"; + color: "red"; +} | { + name: "banana"; + color: "yellow"; +} | { + name: "orange"; + color: "orange"; +}; +type Result1 = { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown; +}; +type Result2 = keyof { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown; +}; +type Test1 = keyof Result1; +type Test2 = Result2; diff --git a/tests/baselines/reference/mappedTypeAsClauses.symbols b/tests/baselines/reference/mappedTypeAsClauses.symbols index 6028775c7b3..ebb570f319e 100644 --- a/tests/baselines/reference/mappedTypeAsClauses.symbols +++ b/tests/baselines/reference/mappedTypeAsClauses.symbols @@ -105,440 +105,507 @@ type TD2 = keyof TD1; // 'a1' | 'a2' | 'b1' | 'b2' >TD2 : Symbol(TD2, Decl(mappedTypeAsClauses.ts, 26, 48)) >TD1 : Symbol(TD1, Decl(mappedTypeAsClauses.ts, 25, 75)) -type TD3 = keyof DoubleProp; // `${keyof U & string}1` | `${keyof U & string}2` +type TD3 = keyof DoubleProp; // keyof DoubleProp >TD3 : Symbol(TD3, Decl(mappedTypeAsClauses.ts, 27, 21)) >U : Symbol(U, Decl(mappedTypeAsClauses.ts, 28, 9)) >DoubleProp : Symbol(DoubleProp, Decl(mappedTypeAsClauses.ts, 21, 85)) >U : Symbol(U, Decl(mappedTypeAsClauses.ts, 28, 9)) +type TD4 = TD3<{ a: string, b: number }>; // 'a1' | 'a2' | 'b1' | 'b2' +>TD4 : Symbol(TD4, Decl(mappedTypeAsClauses.ts, 28, 34)) +>TD3 : Symbol(TD3, Decl(mappedTypeAsClauses.ts, 27, 21)) +>a : Symbol(a, Decl(mappedTypeAsClauses.ts, 29, 16)) +>b : Symbol(b, Decl(mappedTypeAsClauses.ts, 29, 27)) + // Repro from #40619 type Lazyify = { ->Lazyify : Symbol(Lazyify, Decl(mappedTypeAsClauses.ts, 28, 34)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 32, 13)) +>Lazyify : Symbol(Lazyify, Decl(mappedTypeAsClauses.ts, 29, 41)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 33, 13)) [K in keyof T as `get${Capitalize}`]: () => T[K] ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 33, 5)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 32, 13)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 34, 5)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 33, 13)) >Capitalize : Symbol(Capitalize, Decl(lib.es5.d.ts, --, --)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 33, 5)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 32, 13)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 33, 5)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 34, 5)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 33, 13)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 34, 5)) }; interface Person { ->Person : Symbol(Person, Decl(mappedTypeAsClauses.ts, 34, 2)) +>Person : Symbol(Person, Decl(mappedTypeAsClauses.ts, 35, 2)) readonly name: string; ->name : Symbol(Person.name, Decl(mappedTypeAsClauses.ts, 36, 18)) +>name : Symbol(Person.name, Decl(mappedTypeAsClauses.ts, 37, 18)) age: number; ->age : Symbol(Person.age, Decl(mappedTypeAsClauses.ts, 37, 26)) +>age : Symbol(Person.age, Decl(mappedTypeAsClauses.ts, 38, 26)) location?: string; ->location : Symbol(Person.location, Decl(mappedTypeAsClauses.ts, 38, 16)) +>location : Symbol(Person.location, Decl(mappedTypeAsClauses.ts, 39, 16)) } type LazyPerson = Lazyify; ->LazyPerson : Symbol(LazyPerson, Decl(mappedTypeAsClauses.ts, 40, 1)) ->Lazyify : Symbol(Lazyify, Decl(mappedTypeAsClauses.ts, 28, 34)) ->Person : Symbol(Person, Decl(mappedTypeAsClauses.ts, 34, 2)) +>LazyPerson : Symbol(LazyPerson, Decl(mappedTypeAsClauses.ts, 41, 1)) +>Lazyify : Symbol(Lazyify, Decl(mappedTypeAsClauses.ts, 29, 41)) +>Person : Symbol(Person, Decl(mappedTypeAsClauses.ts, 35, 2)) // Repro from #40833 type Example = {foo: string, bar: number}; ->Example : Symbol(Example, Decl(mappedTypeAsClauses.ts, 42, 34)) ->foo : Symbol(foo, Decl(mappedTypeAsClauses.ts, 46, 16)) ->bar : Symbol(bar, Decl(mappedTypeAsClauses.ts, 46, 28)) +>Example : Symbol(Example, Decl(mappedTypeAsClauses.ts, 43, 34)) +>foo : Symbol(foo, Decl(mappedTypeAsClauses.ts, 47, 16)) +>bar : Symbol(bar, Decl(mappedTypeAsClauses.ts, 47, 28)) type PickByValueType = { ->PickByValueType : Symbol(PickByValueType, Decl(mappedTypeAsClauses.ts, 46, 42)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 48, 21)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 48, 23)) +>PickByValueType : Symbol(PickByValueType, Decl(mappedTypeAsClauses.ts, 47, 42)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 49, 21)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 49, 23)) [K in keyof T as T[K] extends U ? K : never]: T[K] ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 49, 3)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 48, 21)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 48, 21)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 49, 3)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 48, 23)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 49, 3)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 48, 21)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 49, 3)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 50, 3)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 49, 21)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 49, 21)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 50, 3)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 49, 23)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 50, 3)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 49, 21)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 50, 3)) }; type T1 = PickByValueType; ->T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 50, 2)) ->PickByValueType : Symbol(PickByValueType, Decl(mappedTypeAsClauses.ts, 46, 42)) ->Example : Symbol(Example, Decl(mappedTypeAsClauses.ts, 42, 34)) +>T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 51, 2)) +>PickByValueType : Symbol(PickByValueType, Decl(mappedTypeAsClauses.ts, 47, 42)) +>Example : Symbol(Example, Decl(mappedTypeAsClauses.ts, 43, 34)) const e1: T1 = { ->e1 : Symbol(e1, Decl(mappedTypeAsClauses.ts, 53, 5)) ->T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 50, 2)) +>e1 : Symbol(e1, Decl(mappedTypeAsClauses.ts, 54, 5)) +>T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 51, 2)) foo: "hello" ->foo : Symbol(foo, Decl(mappedTypeAsClauses.ts, 53, 16)) +>foo : Symbol(foo, Decl(mappedTypeAsClauses.ts, 54, 16)) }; type T2 = keyof T1; ->T2 : Symbol(T2, Decl(mappedTypeAsClauses.ts, 55, 2)) ->T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 50, 2)) +>T2 : Symbol(T2, Decl(mappedTypeAsClauses.ts, 56, 2)) +>T1 : Symbol(T1, Decl(mappedTypeAsClauses.ts, 51, 2)) const e2: T2 = "foo"; ->e2 : Symbol(e2, Decl(mappedTypeAsClauses.ts, 57, 5)) ->T2 : Symbol(T2, Decl(mappedTypeAsClauses.ts, 55, 2)) +>e2 : Symbol(e2, Decl(mappedTypeAsClauses.ts, 58, 5)) +>T2 : Symbol(T2, Decl(mappedTypeAsClauses.ts, 56, 2)) // Repro from #41133 interface Car { ->Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 57, 21)) +>Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 58, 21)) name: string; ->name : Symbol(Car.name, Decl(mappedTypeAsClauses.ts, 61, 15)) +>name : Symbol(Car.name, Decl(mappedTypeAsClauses.ts, 62, 15)) seats: number; ->seats : Symbol(Car.seats, Decl(mappedTypeAsClauses.ts, 62, 17)) +>seats : Symbol(Car.seats, Decl(mappedTypeAsClauses.ts, 63, 17)) engine: Engine; ->engine : Symbol(Car.engine, Decl(mappedTypeAsClauses.ts, 63, 18)) ->Engine : Symbol(Engine, Decl(mappedTypeAsClauses.ts, 66, 1)) +>engine : Symbol(Car.engine, Decl(mappedTypeAsClauses.ts, 64, 18)) +>Engine : Symbol(Engine, Decl(mappedTypeAsClauses.ts, 67, 1)) wheels: Wheel[]; ->wheels : Symbol(Car.wheels, Decl(mappedTypeAsClauses.ts, 64, 19)) ->Wheel : Symbol(Wheel, Decl(mappedTypeAsClauses.ts, 71, 1)) +>wheels : Symbol(Car.wheels, Decl(mappedTypeAsClauses.ts, 65, 19)) +>Wheel : Symbol(Wheel, Decl(mappedTypeAsClauses.ts, 72, 1)) } interface Engine { ->Engine : Symbol(Engine, Decl(mappedTypeAsClauses.ts, 66, 1)) +>Engine : Symbol(Engine, Decl(mappedTypeAsClauses.ts, 67, 1)) manufacturer: string; ->manufacturer : Symbol(Engine.manufacturer, Decl(mappedTypeAsClauses.ts, 68, 18)) +>manufacturer : Symbol(Engine.manufacturer, Decl(mappedTypeAsClauses.ts, 69, 18)) horsepower: number; ->horsepower : Symbol(Engine.horsepower, Decl(mappedTypeAsClauses.ts, 69, 25)) +>horsepower : Symbol(Engine.horsepower, Decl(mappedTypeAsClauses.ts, 70, 25)) } interface Wheel { ->Wheel : Symbol(Wheel, Decl(mappedTypeAsClauses.ts, 71, 1)) +>Wheel : Symbol(Wheel, Decl(mappedTypeAsClauses.ts, 72, 1)) type: "summer" | "winter"; ->type : Symbol(Wheel.type, Decl(mappedTypeAsClauses.ts, 73, 17)) +>type : Symbol(Wheel.type, Decl(mappedTypeAsClauses.ts, 74, 17)) radius: number; ->radius : Symbol(Wheel.radius, Decl(mappedTypeAsClauses.ts, 74, 30)) +>radius : Symbol(Wheel.radius, Decl(mappedTypeAsClauses.ts, 75, 30)) } type Primitive = string | number | boolean; ->Primitive : Symbol(Primitive, Decl(mappedTypeAsClauses.ts, 76, 1)) +>Primitive : Symbol(Primitive, Decl(mappedTypeAsClauses.ts, 77, 1)) type OnlyPrimitives = { [K in keyof T as T[K] extends Primitive ? K : never]: T[K] }; ->OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 78, 43)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 79, 20)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 79, 28)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 79, 20)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 79, 20)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 79, 28)) ->Primitive : Symbol(Primitive, Decl(mappedTypeAsClauses.ts, 76, 1)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 79, 28)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 79, 20)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 79, 28)) +>OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 79, 43)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 80, 20)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 80, 28)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 80, 20)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 80, 20)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 80, 28)) +>Primitive : Symbol(Primitive, Decl(mappedTypeAsClauses.ts, 77, 1)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 80, 28)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 80, 20)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 80, 28)) let primitiveCar: OnlyPrimitives; // { name: string; seats: number; } ->primitiveCar : Symbol(primitiveCar, Decl(mappedTypeAsClauses.ts, 81, 3)) ->OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 78, 43)) ->Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 57, 21)) +>primitiveCar : Symbol(primitiveCar, Decl(mappedTypeAsClauses.ts, 82, 3)) +>OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 79, 43)) +>Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 58, 21)) let keys: keyof OnlyPrimitives; // "name" | "seats" ->keys : Symbol(keys, Decl(mappedTypeAsClauses.ts, 82, 3)) ->OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 78, 43)) ->Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 57, 21)) +>keys : Symbol(keys, Decl(mappedTypeAsClauses.ts, 83, 3)) +>OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 79, 43)) +>Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 58, 21)) type KeysOfPrimitives = keyof OnlyPrimitives; ->KeysOfPrimitives : Symbol(KeysOfPrimitives, Decl(mappedTypeAsClauses.ts, 82, 36)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 84, 22)) ->OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 78, 43)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 84, 22)) +>KeysOfPrimitives : Symbol(KeysOfPrimitives, Decl(mappedTypeAsClauses.ts, 83, 36)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 85, 22)) +>OnlyPrimitives : Symbol(OnlyPrimitives, Decl(mappedTypeAsClauses.ts, 79, 43)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 85, 22)) let carKeys: KeysOfPrimitives; // "name" | "seats" ->carKeys : Symbol(carKeys, Decl(mappedTypeAsClauses.ts, 86, 3)) ->KeysOfPrimitives : Symbol(KeysOfPrimitives, Decl(mappedTypeAsClauses.ts, 82, 36)) ->Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 57, 21)) +>carKeys : Symbol(carKeys, Decl(mappedTypeAsClauses.ts, 87, 3)) +>KeysOfPrimitives : Symbol(KeysOfPrimitives, Decl(mappedTypeAsClauses.ts, 83, 36)) +>Car : Symbol(Car, Decl(mappedTypeAsClauses.ts, 58, 21)) // Repro from #41453 type Equal = (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true : false; ->Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 86, 35)) ->A : Symbol(A, Decl(mappedTypeAsClauses.ts, 90, 11)) ->B : Symbol(B, Decl(mappedTypeAsClauses.ts, 90, 13)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 90, 21)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 90, 21)) ->A : Symbol(A, Decl(mappedTypeAsClauses.ts, 90, 11)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 90, 60)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 90, 60)) ->B : Symbol(B, Decl(mappedTypeAsClauses.ts, 90, 13)) +>Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 87, 35)) +>A : Symbol(A, Decl(mappedTypeAsClauses.ts, 91, 11)) +>B : Symbol(B, Decl(mappedTypeAsClauses.ts, 91, 13)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 91, 21)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 91, 21)) +>A : Symbol(A, Decl(mappedTypeAsClauses.ts, 91, 11)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 91, 60)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 91, 60)) +>B : Symbol(B, Decl(mappedTypeAsClauses.ts, 91, 13)) type If = Cond extends true ? Then : Else; ->If : Symbol(If, Decl(mappedTypeAsClauses.ts, 90, 104)) ->Cond : Symbol(Cond, Decl(mappedTypeAsClauses.ts, 92, 8)) ->Then : Symbol(Then, Decl(mappedTypeAsClauses.ts, 92, 29)) ->Else : Symbol(Else, Decl(mappedTypeAsClauses.ts, 92, 35)) ->Cond : Symbol(Cond, Decl(mappedTypeAsClauses.ts, 92, 8)) ->Then : Symbol(Then, Decl(mappedTypeAsClauses.ts, 92, 29)) ->Else : Symbol(Else, Decl(mappedTypeAsClauses.ts, 92, 35)) +>If : Symbol(If, Decl(mappedTypeAsClauses.ts, 91, 104)) +>Cond : Symbol(Cond, Decl(mappedTypeAsClauses.ts, 93, 8)) +>Then : Symbol(Then, Decl(mappedTypeAsClauses.ts, 93, 29)) +>Else : Symbol(Else, Decl(mappedTypeAsClauses.ts, 93, 35)) +>Cond : Symbol(Cond, Decl(mappedTypeAsClauses.ts, 93, 8)) +>Then : Symbol(Then, Decl(mappedTypeAsClauses.ts, 93, 29)) +>Else : Symbol(Else, Decl(mappedTypeAsClauses.ts, 93, 35)) type GetKey = keyof { [TP in keyof S as Equal extends true ? TP : never]: any }; ->GetKey : Symbol(GetKey, Decl(mappedTypeAsClauses.ts, 92, 76)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 94, 12)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 94, 14)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 94, 29)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 94, 12)) ->Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 86, 35)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 94, 12)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 94, 29)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 94, 14)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 94, 29)) +>GetKey : Symbol(GetKey, Decl(mappedTypeAsClauses.ts, 93, 76)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 95, 12)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 95, 14)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 95, 29)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 95, 12)) +>Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 87, 35)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 95, 12)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 95, 29)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 95, 14)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 95, 29)) type GetKeyWithIf = keyof { [TP in keyof S as If, TP, never>]: any }; ->GetKeyWithIf : Symbol(GetKeyWithIf, Decl(mappedTypeAsClauses.ts, 94, 96)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 96, 18)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 96, 20)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 96, 35)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 96, 18)) ->If : Symbol(If, Decl(mappedTypeAsClauses.ts, 90, 104)) ->Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 86, 35)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 96, 18)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 96, 35)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 96, 20)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 96, 35)) +>GetKeyWithIf : Symbol(GetKeyWithIf, Decl(mappedTypeAsClauses.ts, 95, 96)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 97, 18)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 97, 20)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 97, 35)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 97, 18)) +>If : Symbol(If, Decl(mappedTypeAsClauses.ts, 91, 104)) +>Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 87, 35)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 97, 18)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 97, 35)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 97, 20)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 97, 35)) type GetObjWithIf = { [TP in keyof S as If, TP, never>]: any }; ->GetObjWithIf : Symbol(GetObjWithIf, Decl(mappedTypeAsClauses.ts, 96, 91)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 98, 18)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 98, 20)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 98, 29)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 98, 18)) ->If : Symbol(If, Decl(mappedTypeAsClauses.ts, 90, 104)) ->Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 86, 35)) ->S : Symbol(S, Decl(mappedTypeAsClauses.ts, 98, 18)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 98, 29)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 98, 20)) ->TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 98, 29)) +>GetObjWithIf : Symbol(GetObjWithIf, Decl(mappedTypeAsClauses.ts, 97, 91)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 99, 18)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 99, 20)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 99, 29)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 99, 18)) +>If : Symbol(If, Decl(mappedTypeAsClauses.ts, 91, 104)) +>Equal : Symbol(Equal, Decl(mappedTypeAsClauses.ts, 87, 35)) +>S : Symbol(S, Decl(mappedTypeAsClauses.ts, 99, 18)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 99, 29)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 99, 20)) +>TP : Symbol(TP, Decl(mappedTypeAsClauses.ts, 99, 29)) type Task = { ->Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 98, 85)) +>Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 99, 85)) isDone: boolean; ->isDone : Symbol(isDone, Decl(mappedTypeAsClauses.ts, 100, 13)) +>isDone : Symbol(isDone, Decl(mappedTypeAsClauses.ts, 101, 13)) }; type Schema = { ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) root: { ->root : Symbol(root, Decl(mappedTypeAsClauses.ts, 104, 15)) +>root : Symbol(root, Decl(mappedTypeAsClauses.ts, 105, 15)) title: string; ->title : Symbol(title, Decl(mappedTypeAsClauses.ts, 105, 9)) +>title : Symbol(title, Decl(mappedTypeAsClauses.ts, 106, 9)) task: Task; ->task : Symbol(task, Decl(mappedTypeAsClauses.ts, 106, 18)) ->Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 98, 85)) +>task : Symbol(task, Decl(mappedTypeAsClauses.ts, 107, 18)) +>Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 99, 85)) } Task: Task; ->Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 108, 3)) ->Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 98, 85)) +>Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 109, 3)) +>Task : Symbol(Task, Decl(mappedTypeAsClauses.ts, 99, 85)) }; type Res1 = GetKey; // "Task" ->Res1 : Symbol(Res1, Decl(mappedTypeAsClauses.ts, 110, 2)) ->GetKey : Symbol(GetKey, Decl(mappedTypeAsClauses.ts, 92, 76)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) +>Res1 : Symbol(Res1, Decl(mappedTypeAsClauses.ts, 111, 2)) +>GetKey : Symbol(GetKey, Decl(mappedTypeAsClauses.ts, 93, 76)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) type Res2 = GetKeyWithIf; // "Task" ->Res2 : Symbol(Res2, Decl(mappedTypeAsClauses.ts, 112, 51)) ->GetKeyWithIf : Symbol(GetKeyWithIf, Decl(mappedTypeAsClauses.ts, 94, 96)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) +>Res2 : Symbol(Res2, Decl(mappedTypeAsClauses.ts, 113, 51)) +>GetKeyWithIf : Symbol(GetKeyWithIf, Decl(mappedTypeAsClauses.ts, 95, 96)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) type Res3 = keyof GetObjWithIf; // "Task" ->Res3 : Symbol(Res3, Decl(mappedTypeAsClauses.ts, 113, 57)) ->GetObjWithIf : Symbol(GetObjWithIf, Decl(mappedTypeAsClauses.ts, 96, 91)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) ->Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 102, 2)) +>Res3 : Symbol(Res3, Decl(mappedTypeAsClauses.ts, 114, 57)) +>GetObjWithIf : Symbol(GetObjWithIf, Decl(mappedTypeAsClauses.ts, 97, 91)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) +>Schema : Symbol(Schema, Decl(mappedTypeAsClauses.ts, 103, 2)) // Repro from #44019 type KeysExtendedBy = keyof { [K in keyof T as U extends T[K] ? K : never] : T[K] }; ->KeysExtendedBy : Symbol(KeysExtendedBy, Decl(mappedTypeAsClauses.ts, 114, 63)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 118, 20)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 118, 22)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 118, 37)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 118, 20)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 118, 22)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 118, 20)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 118, 37)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 118, 37)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 118, 20)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 118, 37)) +>KeysExtendedBy : Symbol(KeysExtendedBy, Decl(mappedTypeAsClauses.ts, 115, 63)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 119, 20)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 119, 22)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 119, 37)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 119, 20)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 119, 22)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 119, 20)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 119, 37)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 119, 37)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 119, 20)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 119, 37)) interface M { ->M : Symbol(M, Decl(mappedTypeAsClauses.ts, 118, 90)) +>M : Symbol(M, Decl(mappedTypeAsClauses.ts, 119, 90)) a: boolean; ->a : Symbol(M.a, Decl(mappedTypeAsClauses.ts, 120, 13)) +>a : Symbol(M.a, Decl(mappedTypeAsClauses.ts, 121, 13)) b: number; ->b : Symbol(M.b, Decl(mappedTypeAsClauses.ts, 121, 15)) +>b : Symbol(M.b, Decl(mappedTypeAsClauses.ts, 122, 15)) } function f(x: KeysExtendedBy) { ->f : Symbol(f, Decl(mappedTypeAsClauses.ts, 123, 1)) ->x : Symbol(x, Decl(mappedTypeAsClauses.ts, 125, 11)) ->KeysExtendedBy : Symbol(KeysExtendedBy, Decl(mappedTypeAsClauses.ts, 114, 63)) ->M : Symbol(M, Decl(mappedTypeAsClauses.ts, 118, 90)) +>f : Symbol(f, Decl(mappedTypeAsClauses.ts, 124, 1)) +>x : Symbol(x, Decl(mappedTypeAsClauses.ts, 126, 11)) +>KeysExtendedBy : Symbol(KeysExtendedBy, Decl(mappedTypeAsClauses.ts, 115, 63)) +>M : Symbol(M, Decl(mappedTypeAsClauses.ts, 119, 90)) return x; ->x : Symbol(x, Decl(mappedTypeAsClauses.ts, 125, 11)) +>x : Symbol(x, Decl(mappedTypeAsClauses.ts, 126, 11)) } f("a"); // Error, should allow only "b" ->f : Symbol(f, Decl(mappedTypeAsClauses.ts, 123, 1)) +>f : Symbol(f, Decl(mappedTypeAsClauses.ts, 124, 1)) type NameMap = { 'a': 'x', 'b': 'y', 'c': 'z' }; ->NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 129, 7)) ->'a' : Symbol('a', Decl(mappedTypeAsClauses.ts, 131, 16)) ->'b' : Symbol('b', Decl(mappedTypeAsClauses.ts, 131, 26)) ->'c' : Symbol('c', Decl(mappedTypeAsClauses.ts, 131, 36)) +>NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 130, 7)) +>'a' : Symbol('a', Decl(mappedTypeAsClauses.ts, 132, 16)) +>'b' : Symbol('b', Decl(mappedTypeAsClauses.ts, 132, 26)) +>'c' : Symbol('c', Decl(mappedTypeAsClauses.ts, 132, 36)) // Distributive, will be simplified type TS0 = keyof { [P in keyof T as keyof Record]: string }; ->TS0 : Symbol(TS0, Decl(mappedTypeAsClauses.ts, 131, 48)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 135, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 135, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 135, 9)) +>TS0 : Symbol(TS0, Decl(mappedTypeAsClauses.ts, 132, 48)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 136, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 136, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 136, 9)) >Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 135, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 136, 23)) type TS1 = keyof { [P in keyof T as Extract]: string }; ->TS1 : Symbol(TS1, Decl(mappedTypeAsClauses.ts, 135, 74)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 136, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 136, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 136, 9)) +>TS1 : Symbol(TS1, Decl(mappedTypeAsClauses.ts, 136, 74)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 137, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 137, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 137, 9)) >Extract : Symbol(Extract, Decl(lib.es5.d.ts, --, --)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 136, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 137, 23)) type TS2 = keyof { [P in keyof T as P & ('a' | 'b' | 'c')]: string }; ->TS2 : Symbol(TS2, Decl(mappedTypeAsClauses.ts, 136, 78)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 137, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 137, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 137, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 137, 23)) +>TS2 : Symbol(TS2, Decl(mappedTypeAsClauses.ts, 137, 78)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 138, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 138, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 138, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 138, 23)) type TS3 = keyof { [P in keyof T as Exclude]: string }; ->TS3 : Symbol(TS3, Decl(mappedTypeAsClauses.ts, 137, 72)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 138, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 138, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 138, 9)) +>TS3 : Symbol(TS3, Decl(mappedTypeAsClauses.ts, 138, 72)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 139, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 139, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 139, 9)) >Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 138, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 139, 23)) type TS4 = keyof { [P in keyof T as NameMap[P & keyof NameMap]]: string }; ->TS4 : Symbol(TS4, Decl(mappedTypeAsClauses.ts, 138, 78)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 139, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 139, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 139, 9)) ->NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 129, 7)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 139, 23)) ->NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 129, 7)) +>TS4 : Symbol(TS4, Decl(mappedTypeAsClauses.ts, 139, 78)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 140, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 140, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 140, 9)) +>NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 130, 7)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 140, 23)) +>NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 130, 7)) type TS5 = keyof { [P in keyof T & keyof NameMap as NameMap[P]]: string }; ->TS5 : Symbol(TS5, Decl(mappedTypeAsClauses.ts, 139, 77)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 140, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 140, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 140, 9)) ->NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 129, 7)) ->NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 129, 7)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 140, 23)) +>TS5 : Symbol(TS5, Decl(mappedTypeAsClauses.ts, 140, 77)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 141, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 141, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 141, 9)) +>NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 130, 7)) +>NameMap : Symbol(NameMap, Decl(mappedTypeAsClauses.ts, 130, 7)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 141, 23)) type TS6 = keyof { [ K in keyof T as V & (K extends U ? K : never)]: string }; ->TS6 : Symbol(TS6, Decl(mappedTypeAsClauses.ts, 140, 77)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 141, 9)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 141, 11)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 141, 14)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 141, 29)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 141, 9)) ->V : Symbol(V, Decl(mappedTypeAsClauses.ts, 141, 14)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 141, 29)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 141, 11)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 141, 29)) +>TS6 : Symbol(TS6, Decl(mappedTypeAsClauses.ts, 141, 77)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 142, 9)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 142, 11)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 142, 14)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 142, 29)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 142, 9)) +>V : Symbol(V, Decl(mappedTypeAsClauses.ts, 142, 14)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 142, 29)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 142, 11)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 142, 29)) // Non-distributive, won't be simplified type TN0 = keyof { [P in keyof T as T[P] extends number ? P : never]: string }; ->TN0 : Symbol(TN0, Decl(mappedTypeAsClauses.ts, 141, 87)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 145, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 145, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 145, 9)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 145, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 145, 23)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 145, 23)) +>TN0 : Symbol(TN0, Decl(mappedTypeAsClauses.ts, 142, 87)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) type TN1 = keyof { [P in keyof T as number extends T[P] ? P : never]: string }; ->TN1 : Symbol(TN1, Decl(mappedTypeAsClauses.ts, 145, 82)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 146, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 146, 23)) +>TN1 : Symbol(TN1, Decl(mappedTypeAsClauses.ts, 146, 82)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 147, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 147, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 147, 9)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 147, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 147, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 147, 23)) type TN2 = keyof { [P in keyof T as 'a' extends P ? 'x' : 'y']: string }; ->TN2 : Symbol(TN2, Decl(mappedTypeAsClauses.ts, 146, 82)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 147, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 147, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 147, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 147, 23)) +>TN2 : Symbol(TN2, Decl(mappedTypeAsClauses.ts, 147, 82)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 148, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 148, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 148, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 148, 23)) type TN3 = keyof { [P in keyof T as Exclude, 'b'>, 'a'>]: string }; ->TN3 : Symbol(TN3, Decl(mappedTypeAsClauses.ts, 147, 76)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 148, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 148, 23)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 148, 9)) +>TN3 : Symbol(TN3, Decl(mappedTypeAsClauses.ts, 148, 76)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 149, 23)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) >Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) >Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) >Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 148, 23)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 149, 23)) type TN4 = keyof { [K in keyof T as (K extends U ? T[K] : never) extends T[K] ? K : never]: string }; ->TN4 : Symbol(TN4, Decl(mappedTypeAsClauses.ts, 148, 94)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 149, 11)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 149, 26)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 149, 26)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 149, 11)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 149, 26)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 149, 9)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 149, 26)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 149, 26)) +>TN4 : Symbol(TN4, Decl(mappedTypeAsClauses.ts, 149, 94)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 150, 11)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 150, 11)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) type TN5 = keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K : never]: true }]: string }; ->TN5 : Symbol(TN5, Decl(mappedTypeAsClauses.ts, 149, 107)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 150, 11)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 150, 51)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) ->T : Symbol(T, Decl(mappedTypeAsClauses.ts, 150, 9)) ->P : Symbol(P, Decl(mappedTypeAsClauses.ts, 150, 51)) ->U : Symbol(U, Decl(mappedTypeAsClauses.ts, 150, 11)) ->K : Symbol(K, Decl(mappedTypeAsClauses.ts, 150, 26)) +>TN5 : Symbol(TN5, Decl(mappedTypeAsClauses.ts, 150, 107)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 151, 9)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 151, 11)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 151, 26)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 151, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 151, 51)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 151, 26)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 151, 9)) +>P : Symbol(P, Decl(mappedTypeAsClauses.ts, 151, 51)) +>U : Symbol(U, Decl(mappedTypeAsClauses.ts, 151, 11)) +>K : Symbol(K, Decl(mappedTypeAsClauses.ts, 151, 26)) + +// repro from https://github.com/microsoft/TypeScript/issues/55129 +type Fruit = +>Fruit : Symbol(Fruit, Decl(mappedTypeAsClauses.ts, 151, 108)) + + | { + name: "apple"; +>name : Symbol(name, Decl(mappedTypeAsClauses.ts, 155, 5)) + + color: "red"; +>color : Symbol(color, Decl(mappedTypeAsClauses.ts, 156, 20)) + } + | { + name: "banana"; +>name : Symbol(name, Decl(mappedTypeAsClauses.ts, 159, 5)) + + color: "yellow"; +>color : Symbol(color, Decl(mappedTypeAsClauses.ts, 160, 21)) + } + | { + name: "orange"; +>name : Symbol(name, Decl(mappedTypeAsClauses.ts, 163, 5)) + + color: "orange"; +>color : Symbol(color, Decl(mappedTypeAsClauses.ts, 164, 21)) + + }; +type Result1 = { +>Result1 : Symbol(Result1, Decl(mappedTypeAsClauses.ts, 166, 6)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 167, 13)) +>name : Symbol(name, Decl(mappedTypeAsClauses.ts, 167, 24)) +>color : Symbol(color, Decl(mappedTypeAsClauses.ts, 167, 46)) + + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 168, 3)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 167, 13)) +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 168, 3)) +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 168, 3)) + +}; +type Result2 = keyof { +>Result2 : Symbol(Result2, Decl(mappedTypeAsClauses.ts, 169, 2)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 170, 13)) +>name : Symbol(name, Decl(mappedTypeAsClauses.ts, 170, 24)) +>color : Symbol(color, Decl(mappedTypeAsClauses.ts, 170, 46)) + + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 171, 3)) +>T : Symbol(T, Decl(mappedTypeAsClauses.ts, 170, 13)) +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 171, 3)) +>Key : Symbol(Key, Decl(mappedTypeAsClauses.ts, 171, 3)) +} +type Test1 = keyof Result1 // "apple:red" | "banana:yellow" | "orange:orange" +>Test1 : Symbol(Test1, Decl(mappedTypeAsClauses.ts, 172, 1)) +>Result1 : Symbol(Result1, Decl(mappedTypeAsClauses.ts, 166, 6)) +>Fruit : Symbol(Fruit, Decl(mappedTypeAsClauses.ts, 151, 108)) + +type Test2 = Result2 // "apple:red" | "banana:yellow" | "orange:orange" +>Test2 : Symbol(Test2, Decl(mappedTypeAsClauses.ts, 173, 33)) +>Result2 : Symbol(Result2, Decl(mappedTypeAsClauses.ts, 169, 2)) +>Fruit : Symbol(Fruit, Decl(mappedTypeAsClauses.ts, 151, 108)) diff --git a/tests/baselines/reference/mappedTypeAsClauses.types b/tests/baselines/reference/mappedTypeAsClauses.types index 00323af7598..168e8bd6eaf 100644 --- a/tests/baselines/reference/mappedTypeAsClauses.types +++ b/tests/baselines/reference/mappedTypeAsClauses.types @@ -35,10 +35,10 @@ type TP1 = TypeFromDefs<{ name: 'a', type: string } | { name: 'b', type: number // No array or tuple type mapping when 'as N' clause present type TA1 = Getters; ->TA1 : { getConcat: () => { (...items: ConcatArray[]): string[]; (...items: (string | ConcatArray)[]): string[]; }; getIndexOf: () => (searchElement: string, fromIndex?: number | undefined) => number; getLastIndexOf: () => (searchElement: string, fromIndex?: number | undefined) => number; getSlice: () => (start?: number | undefined, end?: number | undefined) => string[]; getLength: () => number; getToString: () => () => string; getToLocaleString: () => () => string; getPop: () => () => string | undefined; getPush: () => (...items: string[]) => number; getJoin: () => (separator?: string | undefined) => string; getReverse: () => () => string[]; getShift: () => () => string | undefined; getSort: () => (compareFn?: ((a: string, b: string) => number) | undefined) => string[]; getSplice: () => { (start: number, deleteCount?: number | undefined): string[]; (start: number, deleteCount: number, ...items: string[]): string[]; }; getUnshift: () => (...items: string[]) => number; getEvery: () => { (predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean; }; getSome: () => (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any) => boolean; getForEach: () => (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void; getMap: () => (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]; getFilter: () => { (predicate: (value: string, index: number, array: string[]) => value is S_1, thisArg?: any): S_1[]; (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string[]; }; getReduce: () => { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; (callbackfn: (previousValue: U_1, currentValue: string, currentIndex: number, array: string[]) => U_1, initialValue: U_1): U_1; }; getReduceRight: () => { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; (callbackfn: (previousValue: U_2, currentValue: string, currentIndex: number, array: string[]) => U_2, initialValue: U_2): U_2; }; } +>TA1 : { getConcat: () => { (...items: ConcatArray[]): string[]; (...items: (string | ConcatArray)[]): string[]; }; getIndexOf: () => (searchElement: string, fromIndex?: number | undefined) => number; getLastIndexOf: () => (searchElement: string, fromIndex?: number | undefined) => number; getSlice: () => (start?: number | undefined, end?: number | undefined) => string[]; getLength: () => number; getToLocaleString: () => () => string; getToString: () => () => string; getPop: () => () => string | undefined; getPush: () => (...items: string[]) => number; getJoin: () => (separator?: string | undefined) => string; getReverse: () => () => string[]; getShift: () => () => string | undefined; getSort: () => (compareFn?: ((a: string, b: string) => number) | undefined) => string[]; getSplice: () => { (start: number, deleteCount?: number | undefined): string[]; (start: number, deleteCount: number, ...items: string[]): string[]; }; getUnshift: () => (...items: string[]) => number; getEvery: () => { (predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean; }; getSome: () => (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any) => boolean; getForEach: () => (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void; getMap: () => (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]; getFilter: () => { (predicate: (value: string, index: number, array: string[]) => value is S_1, thisArg?: any): S_1[]; (predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string[]; }; getReduce: () => { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; (callbackfn: (previousValue: U_1, currentValue: string, currentIndex: number, array: string[]) => U_1, initialValue: U_1): U_1; }; getReduceRight: () => { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; (callbackfn: (previousValue: U_2, currentValue: string, currentIndex: number, array: string[]) => U_2, initialValue: U_2): U_2; }; } type TA2 = Getters<[number, boolean]>; ->TA2 : { getConcat: () => { (...items: ConcatArray[]): (number | boolean)[]; (...items: (number | boolean | ConcatArray)[]): (number | boolean)[]; }; getIndexOf: () => (searchElement: number | boolean, fromIndex?: number | undefined) => number; getLastIndexOf: () => (searchElement: number | boolean, fromIndex?: number | undefined) => number; getSlice: () => (start?: number | undefined, end?: number | undefined) => (number | boolean)[]; getLength: () => 2; getToString: () => () => string; getToLocaleString: () => () => string; getPop: () => () => number | boolean | undefined; getPush: () => (...items: (number | boolean)[]) => number; getJoin: () => (separator?: string | undefined) => string; getReverse: () => () => (number | boolean)[]; getShift: () => () => number | boolean | undefined; getSort: () => (compareFn?: ((a: number | boolean, b: number | boolean) => number) | undefined) => [number, boolean]; getSplice: () => { (start: number, deleteCount?: number | undefined): (number | boolean)[]; (start: number, deleteCount: number, ...items: (number | boolean)[]): (number | boolean)[]; }; getUnshift: () => (...items: (number | boolean)[]) => number; getEvery: () => { (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any): boolean; }; getSome: () => (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any) => boolean; getForEach: () => (callbackfn: (value: number | boolean, index: number, array: (number | boolean)[]) => void, thisArg?: any) => void; getMap: () => (callbackfn: (value: number | boolean, index: number, array: (number | boolean)[]) => U, thisArg?: any) => U[]; getFilter: () => { (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => value is S_1, thisArg?: any): S_1[]; (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any): (number | boolean)[]; }; getReduce: () => { (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean): number | boolean; (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean, initialValue: number | boolean): number | boolean; (callbackfn: (previousValue: U_1, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => U_1, initialValue: U_1): U_1; }; getReduceRight: () => { (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean): number | boolean; (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean, initialValue: number | boolean): number | boolean; (callbackfn: (previousValue: U_2, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => U_2, initialValue: U_2): U_2; }; get0: () => number; get1: () => boolean; } +>TA2 : { getConcat: () => { (...items: ConcatArray[]): (number | boolean)[]; (...items: (number | boolean | ConcatArray)[]): (number | boolean)[]; }; getIndexOf: () => (searchElement: number | boolean, fromIndex?: number | undefined) => number; getLastIndexOf: () => (searchElement: number | boolean, fromIndex?: number | undefined) => number; getSlice: () => (start?: number | undefined, end?: number | undefined) => (number | boolean)[]; getLength: () => 2; getToLocaleString: () => () => string; getToString: () => () => string; getPop: () => () => number | boolean | undefined; getPush: () => (...items: (number | boolean)[]) => number; getJoin: () => (separator?: string | undefined) => string; getReverse: () => () => (number | boolean)[]; getShift: () => () => number | boolean | undefined; getSort: () => (compareFn?: ((a: number | boolean, b: number | boolean) => number) | undefined) => [number, boolean]; getSplice: () => { (start: number, deleteCount?: number | undefined): (number | boolean)[]; (start: number, deleteCount: number, ...items: (number | boolean)[]): (number | boolean)[]; }; getUnshift: () => (...items: (number | boolean)[]) => number; getEvery: () => { (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => value is S, thisArg?: any): this is S[]; (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any): boolean; }; getSome: () => (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any) => boolean; getForEach: () => (callbackfn: (value: number | boolean, index: number, array: (number | boolean)[]) => void, thisArg?: any) => void; getMap: () => (callbackfn: (value: number | boolean, index: number, array: (number | boolean)[]) => U, thisArg?: any) => U[]; getFilter: () => { (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => value is S_1, thisArg?: any): S_1[]; (predicate: (value: number | boolean, index: number, array: (number | boolean)[]) => unknown, thisArg?: any): (number | boolean)[]; }; getReduce: () => { (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean): number | boolean; (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean, initialValue: number | boolean): number | boolean; (callbackfn: (previousValue: U_1, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => U_1, initialValue: U_1): U_1; }; getReduceRight: () => { (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean): number | boolean; (callbackfn: (previousValue: number | boolean, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => number | boolean, initialValue: number | boolean): number | boolean; (callbackfn: (previousValue: U_2, currentValue: number | boolean, currentIndex: number, array: (number | boolean)[]) => U_2, initialValue: U_2): U_2; }; get0: () => number; get1: () => boolean; } // Filtering using 'as N' clause @@ -65,8 +65,13 @@ type TD1 = DoubleProp<{ a: string, b: number }>; // { a1: string, a2: string, b type TD2 = keyof TD1; // 'a1' | 'a2' | 'b1' | 'b2' >TD2 : "a1" | "b1" | "a2" | "b2" -type TD3 = keyof DoubleProp; // `${keyof U & string}1` | `${keyof U & string}2` ->TD3 : `${keyof U & string}1` | `${keyof U & string}2` +type TD3 = keyof DoubleProp; // keyof DoubleProp +>TD3 : keyof DoubleProp + +type TD4 = TD3<{ a: string, b: number }>; // 'a1' | 'a2' | 'b1' | 'b2' +>TD4 : "a1" | "b1" | "a2" | "b2" +>a : string +>b : number // Repro from #40619 @@ -277,7 +282,7 @@ type TS4 = keyof { [P in keyof T as NameMap[P & keyof NameMap]]: string }; >TS4 : keyof { [P in keyof T as NameMap[P & keyof NameMap]]: string; } type TS5 = keyof { [P in keyof T & keyof NameMap as NameMap[P]]: string }; ->TS5 : NameMap[keyof T & "a"] | NameMap[keyof T & "b"] | NameMap[keyof T & "c"] +>TS5 : keyof { [P in keyof T & keyof NameMap as NameMap[P]]: string; } type TS6 = keyof { [ K in keyof T as V & (K extends U ? K : never)]: string }; >TS6 : keyof { [K in keyof T as V & (K extends U ? K : never)]: string; } @@ -303,3 +308,49 @@ type TN5 = keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K >TN5 : keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K : never]: true; }]: string; } >true : true +// repro from https://github.com/microsoft/TypeScript/issues/55129 +type Fruit = +>Fruit : { name: "apple"; color: "red"; } | { name: "banana"; color: "yellow"; } | { name: "orange"; color: "orange"; } + + | { + name: "apple"; +>name : "apple" + + color: "red"; +>color : "red" + } + | { + name: "banana"; +>name : "banana" + + color: "yellow"; +>color : "yellow" + } + | { + name: "orange"; +>name : "orange" + + color: "orange"; +>color : "orange" + + }; +type Result1 = { +>Result1 : Result1 +>name : string | number +>color : string | number + + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +}; +type Result2 = keyof { +>Result2 : keyof { [Key in T as `${Key["name"]}:${Key["color"]}`]: unknown; } +>name : string | number +>color : string | number + + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +} +type Test1 = keyof Result1 // "apple:red" | "banana:yellow" | "orange:orange" +>Test1 : "apple:red" | "banana:yellow" | "orange:orange" + +type Test2 = Result2 // "apple:red" | "banana:yellow" | "orange:orange" +>Test2 : "apple:red" | "banana:yellow" | "orange:orange" + diff --git a/tests/baselines/reference/methodChainError.errors.txt b/tests/baselines/reference/methodChainError.errors.txt index d6286b3d7dc..474f440f7e3 100644 --- a/tests/baselines/reference/methodChainError.errors.txt +++ b/tests/baselines/reference/methodChainError.errors.txt @@ -14,7 +14,7 @@ methodChainError.ts(16,6): error TS2349: This expression is not callable. new Builder() .method("a") .method() - ~~~~~~~~ + ~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 methodChainError.ts:3:12: An argument for 'param' was not provided. .method("a"); diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.errors.txt b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.errors.txt index 4cf343ecbf2..0c0d26877bc 100644 --- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.errors.txt +++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.errors.txt @@ -6,7 +6,7 @@ a.js(4,6): error TS2554: Expected 1 arguments, but got 0. var mod1 = require('./mod1') mod1() mod1.f() // error, not enough arguments - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 mod1.js:4:30: An argument for 'a' was not provided. diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt b/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt index 393c2d1e35b..7c131d020aa 100644 --- a/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt +++ b/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt @@ -88,4 +88,29 @@ nestedExcessPropertyChecking.ts(40,9): error TS2559: Type 'false' has no propert }, }, }; + + // Repro from #53412 + + type BaseItem = { + id: number; + } + type ExtendedItem = BaseItem & { + description: string | null + }; + + type BaseValue = { + // there are other fields + items: BaseItem[]; + } + type ExtendedValue = BaseValue & { + // there are other fields + items: ExtendedItem[]; + } + + const TEST_VALUE: ExtendedValue = { + items: [ + {id: 1, description: null}, + {id: 2, description: 'wigglytubble'}, + ] + }; \ No newline at end of file diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.js b/tests/baselines/reference/nestedExcessPropertyChecking.js index 9d37f3d7542..bd52494fc3d 100644 --- a/tests/baselines/reference/nestedExcessPropertyChecking.js +++ b/tests/baselines/reference/nestedExcessPropertyChecking.js @@ -64,6 +64,31 @@ const response: Query = { }, }, }; + +// Repro from #53412 + +type BaseItem = { + id: number; +} +type ExtendedItem = BaseItem & { + description: string | null +}; + +type BaseValue = { + // there are other fields + items: BaseItem[]; +} +type ExtendedValue = BaseValue & { + // there are other fields + items: ExtendedItem[]; +} + +const TEST_VALUE: ExtendedValue = { + items: [ + {id: 1, description: null}, + {id: 2, description: 'wigglytubble'}, + ] +}; //// [nestedExcessPropertyChecking.js] @@ -90,3 +115,9 @@ var response = { }, }, }; +var TEST_VALUE = { + items: [ + { id: 1, description: null }, + { id: 2, description: 'wigglytubble' }, + ] +}; diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.symbols b/tests/baselines/reference/nestedExcessPropertyChecking.symbols index dbd83126cc5..1700d41c455 100644 --- a/tests/baselines/reference/nestedExcessPropertyChecking.symbols +++ b/tests/baselines/reference/nestedExcessPropertyChecking.symbols @@ -165,3 +165,56 @@ const response: Query = { }, }; +// Repro from #53412 + +type BaseItem = { +>BaseItem : Symbol(BaseItem, Decl(nestedExcessPropertyChecking.ts, 62, 2)) + + id: number; +>id : Symbol(id, Decl(nestedExcessPropertyChecking.ts, 66, 17)) +} +type ExtendedItem = BaseItem & { +>ExtendedItem : Symbol(ExtendedItem, Decl(nestedExcessPropertyChecking.ts, 68, 1)) +>BaseItem : Symbol(BaseItem, Decl(nestedExcessPropertyChecking.ts, 62, 2)) + + description: string | null +>description : Symbol(description, Decl(nestedExcessPropertyChecking.ts, 69, 32)) + +}; + +type BaseValue = { +>BaseValue : Symbol(BaseValue, Decl(nestedExcessPropertyChecking.ts, 71, 2)) + + // there are other fields + items: BaseItem[]; +>items : Symbol(items, Decl(nestedExcessPropertyChecking.ts, 73, 18)) +>BaseItem : Symbol(BaseItem, Decl(nestedExcessPropertyChecking.ts, 62, 2)) +} +type ExtendedValue = BaseValue & { +>ExtendedValue : Symbol(ExtendedValue, Decl(nestedExcessPropertyChecking.ts, 76, 1)) +>BaseValue : Symbol(BaseValue, Decl(nestedExcessPropertyChecking.ts, 71, 2)) + + // there are other fields + items: ExtendedItem[]; +>items : Symbol(items, Decl(nestedExcessPropertyChecking.ts, 77, 34)) +>ExtendedItem : Symbol(ExtendedItem, Decl(nestedExcessPropertyChecking.ts, 68, 1)) +} + +const TEST_VALUE: ExtendedValue = { +>TEST_VALUE : Symbol(TEST_VALUE, Decl(nestedExcessPropertyChecking.ts, 82, 5)) +>ExtendedValue : Symbol(ExtendedValue, Decl(nestedExcessPropertyChecking.ts, 76, 1)) + + items: [ +>items : Symbol(items, Decl(nestedExcessPropertyChecking.ts, 82, 35)) + + {id: 1, description: null}, +>id : Symbol(id, Decl(nestedExcessPropertyChecking.ts, 84, 9)) +>description : Symbol(description, Decl(nestedExcessPropertyChecking.ts, 84, 15)) + + {id: 2, description: 'wigglytubble'}, +>id : Symbol(id, Decl(nestedExcessPropertyChecking.ts, 85, 9)) +>description : Symbol(description, Decl(nestedExcessPropertyChecking.ts, 85, 15)) + + ] +}; + diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.types b/tests/baselines/reference/nestedExcessPropertyChecking.types index abed36ba6fa..f5f74489d22 100644 --- a/tests/baselines/reference/nestedExcessPropertyChecking.types +++ b/tests/baselines/reference/nestedExcessPropertyChecking.types @@ -160,3 +160,58 @@ const response: Query = { }, }; +// Repro from #53412 + +type BaseItem = { +>BaseItem : { id: number; } + + id: number; +>id : number +} +type ExtendedItem = BaseItem & { +>ExtendedItem : BaseItem & { description: string | null; } + + description: string | null +>description : string | null + +}; + +type BaseValue = { +>BaseValue : { items: BaseItem[]; } + + // there are other fields + items: BaseItem[]; +>items : BaseItem[] +} +type ExtendedValue = BaseValue & { +>ExtendedValue : BaseValue & { items: ExtendedItem[]; } + + // there are other fields + items: ExtendedItem[]; +>items : ExtendedItem[] +} + +const TEST_VALUE: ExtendedValue = { +>TEST_VALUE : ExtendedValue +>{ items: [ {id: 1, description: null}, {id: 2, description: 'wigglytubble'}, ]} : { items: ({ id: number; description: null; } | { id: number; description: string; })[]; } + + items: [ +>items : ({ id: number; description: null; } | { id: number; description: string; })[] +>[ {id: 1, description: null}, {id: 2, description: 'wigglytubble'}, ] : ({ id: number; description: null; } | { id: number; description: string; })[] + + {id: 1, description: null}, +>{id: 1, description: null} : { id: number; description: null; } +>id : number +>1 : 1 +>description : null + + {id: 2, description: 'wigglytubble'}, +>{id: 2, description: 'wigglytubble'} : { id: number; description: string; } +>id : number +>2 : 2 +>description : string +>'wigglytubble' : "wigglytubble" + + ] +}; + diff --git a/tests/baselines/reference/numberFormatCurrencySign.types b/tests/baselines/reference/numberFormatCurrencySign.types index 50d198deb85..b61cddf872e 100644 --- a/tests/baselines/reference/numberFormatCurrencySign.types +++ b/tests/baselines/reference/numberFormatCurrencySign.types @@ -6,9 +6,9 @@ const str = new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }).format(999999) : string >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }).format : { (value: number): string; (value: number | bigint): string; } >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }) : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >'en-NZ' : "en-NZ" >{ style: 'currency', currency: 'NZD', currencySign: 'accounting' } : { style: string; currency: string; currencySign: string; } >style : string diff --git a/tests/baselines/reference/numberFormatCurrencySignResolved.types b/tests/baselines/reference/numberFormatCurrencySignResolved.types index 054866c57f4..75102f726cb 100644 --- a/tests/baselines/reference/numberFormatCurrencySignResolved.types +++ b/tests/baselines/reference/numberFormatCurrencySignResolved.types @@ -6,9 +6,9 @@ const options = new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'N >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }).resolvedOptions() : Intl.ResolvedNumberFormatOptions >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }).resolvedOptions : { (): Intl.ResolvedNumberFormatOptions; (): Intl.ResolvedNumberFormatOptions; } >new Intl.NumberFormat('en-NZ', { style: 'currency', currency: 'NZD', currencySign: 'accounting' }) : Intl.NumberFormat ->Intl.NumberFormat : { (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[]; readonly prototype: Intl.NumberFormat; } +>Intl.NumberFormat : Intl.NumberFormatConstructor >Intl : typeof Intl ->NumberFormat : { (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat; supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[]; readonly prototype: Intl.NumberFormat; } +>NumberFormat : Intl.NumberFormatConstructor >'en-NZ' : "en-NZ" >{ style: 'currency', currency: 'NZD', currencySign: 'accounting' } : { style: string; currency: string; currencySign: string; } >style : string diff --git a/tests/baselines/reference/optionalParamArgsTest.errors.txt b/tests/baselines/reference/optionalParamArgsTest.errors.txt index 9cd5817c77a..676817d2873 100644 --- a/tests/baselines/reference/optionalParamArgsTest.errors.txt +++ b/tests/baselines/reference/optionalParamArgsTest.errors.txt @@ -137,19 +137,19 @@ optionalParamArgsTest.ts(117,1): error TS2554: Expected 1-2 arguments, but got 0 ~ !!! error TS2554: Expected 0 arguments, but got 1. c1o1.C1M2(); - ~~~~~~ + ~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:23:17: An argument for 'C1M2A1' was not provided. i1o1.C1M2(); - ~~~~~~ + ~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:11:10: An argument for 'C1M2A1' was not provided. F2(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:45:13: An argument for 'F2A1' was not provided. L2(); - ~~~~ + ~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:50:20: An argument for 'L2A1' was not provided. c1o1.C1M2(1,2); @@ -177,19 +177,19 @@ optionalParamArgsTest.ts(117,1): error TS2554: Expected 1-2 arguments, but got 0 ~ !!! error TS2554: Expected 0-2 arguments, but got 3. c1o1.C1M4(); - ~~~~~~ + ~~~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:29:17: An argument for 'C1M4A1' was not provided. i1o1.C1M4(); - ~~~~~~ + ~~~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:13:10: An argument for 'C1M4A1' was not provided. F4(); - ~~~~ + ~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:47:13: An argument for 'F4A1' was not provided. L4(); - ~~~~ + ~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 optionalParamArgsTest.ts:52:20: An argument for 'L4A1' was not provided. diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt index 0cfe46d258b..cf8453f2e87 100644 --- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt +++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt @@ -33,7 +33,7 @@ orderMattersForSignatureGroupIdentity.ts(24,20): error TS2339: Property 'toLower var v: B; v({ s: "", n: 0 }).toLowerCase(); - ~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(x: { s: string; }): string', gave the following error. !!! error TS2769: Object literal may only specify known properties, and 'n' does not exist in type '{ s: string; }'. @@ -49,7 +49,7 @@ orderMattersForSignatureGroupIdentity.ts(24,20): error TS2339: Property 'toLower !!! related TS6203 orderMattersForSignatureGroupIdentity.ts:21:5: 'w' was also declared here. w({ s: "", n: 0 }).toLowerCase(); - ~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(x: { s: string; }): string', gave the following error. !!! error TS2769: Object literal may only specify known properties, and 'n' does not exist in type '{ s: string; }'. diff --git a/tests/baselines/reference/overload1.errors.txt b/tests/baselines/reference/overload1.errors.txt index c64ba5a8086..5a000bae8bd 100644 --- a/tests/baselines/reference/overload1.errors.txt +++ b/tests/baselines/reference/overload1.errors.txt @@ -3,7 +3,7 @@ overload1.ts(29,1): error TS2322: Type 'number' is not assignable to type 'strin overload1.ts(31,11): error TS2554: Expected 1-2 arguments, but got 3. overload1.ts(32,5): error TS2554: Expected 1-2 arguments, but got 0. overload1.ts(33,1): error TS2322: Type 'C' is not assignable to type 'string'. -overload1.ts(34,3): error TS2769: No overload matches this call. +overload1.ts(34,5): error TS2769: No overload matches this call. Overload 1 of 2, '(s1: string, s2: number): string', gave the following error. Argument of type 'number' is not assignable to parameter of type 'string'. Overload 2 of 2, '(s1: number, s2: string): number', gave the following error. @@ -49,14 +49,14 @@ overload1.ts(34,3): error TS2769: No overload matches this call. ~ !!! error TS2554: Expected 1-2 arguments, but got 3. z=x.g(); // no match - ~~~ + ~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 overload1.ts:17:11: An argument for 'n' was not provided. z=x.g(new O.B()); // ambiguous (up and down conversion) ~ !!! error TS2322: Type 'C' is not assignable to type 'string'. z=x.h(2,2); // no match - ~~~~~~~~ + ~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(s1: string, s2: number): string', gave the following error. !!! error TS2769: Argument of type 'number' is not assignable to parameter of type 'string'. diff --git a/tests/baselines/reference/overloadTag1.errors.txt b/tests/baselines/reference/overloadTag1.errors.txt index 78a78aa2cd4..980b91d636d 100644 --- a/tests/baselines/reference/overloadTag1.errors.txt +++ b/tests/baselines/reference/overloadTag1.errors.txt @@ -40,7 +40,7 @@ overloadTag1.js(43,1): error TS2769: No overload matches this call. } var o1 = overloaded(1,2) var o2 = overloaded("zero", "one") - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(a: number, b: number): number', gave the following error. !!! error TS2769: Argument of type 'string' is not assignable to parameter of type 'number'. @@ -64,7 +64,7 @@ overloadTag1.js(43,1): error TS2769: No overload matches this call. } uncheckedInternally(1,2) uncheckedInternally("zero", "one") - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(a: number, b: number): number', gave the following error. !!! error TS2769: Argument of type 'string' is not assignable to parameter of type 'number'. diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt index c8be3890f63..d6f3cd897e6 100644 --- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt +++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt @@ -53,7 +53,7 @@ overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type ' declare function foo(arg: (x: B) => any): number; var result: number = foo(x => new G(x)); // x has type D, new G(x) fails, so first overload is picked. - ~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(arg: (x: D) => number): string', gave the following error. !!! error TS2769: Type 'G' is not assignable to type 'number'. @@ -74,7 +74,7 @@ overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type ' !!! related TS2728 overloadresolutionWithConstraintCheckingDeferred.ts:1:15: 'x' is declared here. var result2: number = foo(x => new G(x)); // x has type D, new G(x) fails, so first overload is picked. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(arg: (x: D) => number): string', gave the following error. !!! error TS2769: Type 'G' is not assignable to type 'number'. diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt index 36ed4551a5f..1f17771cec3 100644 --- a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt +++ b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt @@ -17,7 +17,7 @@ overloadsAndTypeArgumentArityErrors.ts(9,1): error TS2554: Expected 1 arguments, declare function f(arg: number): void; f(); // wrong number of arguments (#25683) - ~~~~~~~~~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 overloadsAndTypeArgumentArityErrors.ts:8:31: An argument for 'arg' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt index a8b097b9f4f..2cbb7768d07 100644 --- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt +++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt @@ -19,7 +19,7 @@ overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'. }; func(s => ({})); // Error for no applicable overload (object type is missing a and b) - ~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(s: string): number', gave the following error. !!! error TS2769: Argument of type '(s: string) => {}' is not assignable to parameter of type 'string'. @@ -30,7 +30,7 @@ overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'. ~~~~ !!! error TS2304: Cannot find name 'blah'. func(s => ({ a: blah })); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(s: string): number', gave the following error. !!! error TS2769: Argument of type '(s: string) => { a: any; }' is not assignable to parameter of type 'string'. diff --git a/tests/baselines/reference/privateNameMethod.errors.txt b/tests/baselines/reference/privateNameMethod.errors.txt index 6def39fc175..5467ab6f149 100644 --- a/tests/baselines/reference/privateNameMethod.errors.txt +++ b/tests/baselines/reference/privateNameMethod.errors.txt @@ -13,7 +13,7 @@ privateNameMethod.ts(8,14): error TS2554: Expected 1 arguments, but got 0. ~ !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. this.#method() // Error - ~~~~~~~~~ + ~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 privateNameMethod.ts:2:13: An argument for 'param' was not provided. diff --git a/tests/baselines/reference/privateNameStaticMethod.errors.txt b/tests/baselines/reference/privateNameStaticMethod.errors.txt index 4487678ba5a..7df027b211e 100644 --- a/tests/baselines/reference/privateNameStaticMethod.errors.txt +++ b/tests/baselines/reference/privateNameStaticMethod.errors.txt @@ -13,7 +13,7 @@ privateNameStaticMethod.ts(8,12): error TS2554: Expected 1 arguments, but got 0. ~ !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. A1.#method() // Error - ~~~~~~~~~ + ~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 privateNameStaticMethod.ts:2:20: An argument for 'param' was not provided. diff --git a/tests/baselines/reference/promiseWithResolvers.js b/tests/baselines/reference/promiseWithResolvers.js new file mode 100644 index 00000000000..889227b0e85 --- /dev/null +++ b/tests/baselines/reference/promiseWithResolvers.js @@ -0,0 +1,9 @@ +//// [tests/cases/compiler/promiseWithResolvers.ts] //// + +//// [promiseWithResolvers.ts] +type T = {}; +const { promise, resolve, reject } = Promise.withResolvers(); + + +//// [promiseWithResolvers.js] +const { promise, resolve, reject } = Promise.withResolvers(); diff --git a/tests/baselines/reference/promiseWithResolvers.symbols b/tests/baselines/reference/promiseWithResolvers.symbols new file mode 100644 index 00000000000..3a67e16387f --- /dev/null +++ b/tests/baselines/reference/promiseWithResolvers.symbols @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/promiseWithResolvers.ts] //// + +=== promiseWithResolvers.ts === +type T = {}; +>T : Symbol(T, Decl(promiseWithResolvers.ts, 0, 0)) + +const { promise, resolve, reject } = Promise.withResolvers(); +>promise : Symbol(promise, Decl(promiseWithResolvers.ts, 1, 7)) +>resolve : Symbol(resolve, Decl(promiseWithResolvers.ts, 1, 16)) +>reject : Symbol(reject, Decl(promiseWithResolvers.ts, 1, 25)) +>Promise.withResolvers : Symbol(PromiseConstructor.withResolvers, Decl(lib.esnext.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) +>withResolvers : Symbol(PromiseConstructor.withResolvers, Decl(lib.esnext.promise.d.ts, --, --)) +>T : Symbol(T, Decl(promiseWithResolvers.ts, 0, 0)) + diff --git a/tests/baselines/reference/promiseWithResolvers.types b/tests/baselines/reference/promiseWithResolvers.types new file mode 100644 index 00000000000..9eea54879d6 --- /dev/null +++ b/tests/baselines/reference/promiseWithResolvers.types @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/promiseWithResolvers.ts] //// + +=== promiseWithResolvers.ts === +type T = {}; +>T : {} + +const { promise, resolve, reject } = Promise.withResolvers(); +>promise : Promise +>resolve : (value: T | PromiseLike) => void +>reject : (reason?: any) => void +>Promise.withResolvers() : PromiseWithResolvers +>Promise.withResolvers : () => PromiseWithResolvers +>Promise : PromiseConstructor +>withResolvers : () => PromiseWithResolvers + diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt index 1da209dad92..73e20f3dce2 100644 --- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt +++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt @@ -1,31 +1,12 @@ reactReduxLikeDeferredInferenceAllowsAssignment.ts(76,50): error TS2344: Type 'GetProps' does not satisfy the constraint 'Shared>'. - Type 'unknown' is not assignable to type 'Shared>'. - Type 'Matching>' is not assignable to type 'Shared>'. - Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[P] | (TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>] | (TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>] | GetProps[Extract>] | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]) | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & Extract>] | TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type '(TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]) | GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & keyof GetProps & string] | TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. - Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Matching>' is not assignable to type 'Shared>'. + Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. + Type '(TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string]) | GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. ==== reactReduxLikeDeferredInferenceAllowsAssignment.ts (1 errors) ==== @@ -107,33 +88,14 @@ reactReduxLikeDeferredInferenceAllowsAssignment.ts(76,50): error TS2344: Type 'G Omit, keyof Shared>> & TNeedsProps ~~~~~~~~~~~ !!! error TS2344: Type 'GetProps' does not satisfy the constraint 'Shared>'. -!!! error TS2344: Type 'unknown' is not assignable to type 'Shared>'. -!!! error TS2344: Type 'Matching>' is not assignable to type 'Shared>'. -!!! error TS2344: Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[P] | (TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>] | (TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>] | GetProps[Extract>] | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]) | GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & Extract>] | TInjectedProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]) | GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & keyof GetProps & string] | TInjectedProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[keyof TInjectedProps & keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. -!!! error TS2344: Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Matching>' is not assignable to type 'Shared>'. +!!! error TS2344: Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps[P] ? GetProps[P] : TInjectedProps[P] : GetProps[P]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[Extract>] extends GetProps[Extract>] ? GetProps[Extract>] : TInjectedProps[Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type '(Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]) | (Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>])' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'Extract> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract>] extends GetProps[keyof TInjectedProps & Extract>] ? GetProps[keyof TInjectedProps & Extract>] : TInjectedProps[keyof TInjectedProps & Extract>] : GetProps[Extract>]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'keyof GetProps & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps & string] extends GetProps[keyof TInjectedProps & keyof GetProps & string] ? GetProps[keyof TInjectedProps & keyof GetProps & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps & string] : GetProps[keyof GetProps & string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. +!!! error TS2344: Type '(TInjectedProps[keyof TInjectedProps & string] extends GetProps[keyof TInjectedProps & string] ? GetProps[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string]) | GetProps[string]' is not assignable to type '(TInjectedProps[P] extends GetProps[P] ? GetProps[P] : never) | undefined'. >; declare const connect: { diff --git a/tests/baselines/reference/renameStringLiteralTypes4.baseline.jsonc b/tests/baselines/reference/renameStringLiteralTypes4.baseline.jsonc new file mode 100644 index 00000000000..d6095159aed --- /dev/null +++ b/tests/baselines/reference/renameStringLiteralTypes4.baseline.jsonc @@ -0,0 +1,9 @@ +// === findRenameLocations === +// === /tests/cases/fourslash/renameStringLiteralTypes4.ts === +// interface I { +// <|"[|Prop 1RENAME|]": string;|> +// } +// +// declare const fn: (p: K) => void +// +// fn("[|Prop 1RENAME|]"/*RENAME*/) \ No newline at end of file diff --git a/tests/baselines/reference/renameStringLiteralTypes5.baseline.jsonc b/tests/baselines/reference/renameStringLiteralTypes5.baseline.jsonc new file mode 100644 index 00000000000..3cb3e208e34 --- /dev/null +++ b/tests/baselines/reference/renameStringLiteralTypes5.baseline.jsonc @@ -0,0 +1,9 @@ +// === findRenameLocations === +// === /tests/cases/fourslash/renameStringLiteralTypes5.ts === +// type T = { +// <|"[|Prop 1RENAME|]": string;|> +// } +// +// declare const fn: (p: K) => void +// +// fn("[|Prop 1RENAME|]"/*RENAME*/) \ No newline at end of file diff --git a/tests/baselines/reference/requiredInitializedParameter1.errors.txt b/tests/baselines/reference/requiredInitializedParameter1.errors.txt index 88a0bcc1099..15e8abe82c0 100644 --- a/tests/baselines/reference/requiredInitializedParameter1.errors.txt +++ b/tests/baselines/reference/requiredInitializedParameter1.errors.txt @@ -14,7 +14,7 @@ requiredInitializedParameter1.ts(16,1): error TS2554: Expected 3 arguments, but f4(0, 1, 2); f1(0, 1); - ~~~~~~~~ + ~~ !!! error TS2554: Expected 3 arguments, but got 2. !!! related TS6210 requiredInitializedParameter1.ts:1:23: An argument for 'c' was not provided. f2(0, 1); @@ -22,7 +22,7 @@ requiredInitializedParameter1.ts(16,1): error TS2554: Expected 3 arguments, but f4(0, 1); f1(0); - ~~~~~ + ~~ !!! error TS2554: Expected 3 arguments, but got 1. !!! related TS6210 requiredInitializedParameter1.ts:1:16: An argument for 'b' was not provided. f2(0); diff --git a/tests/baselines/reference/restParamsWithNonRestParams.errors.txt b/tests/baselines/reference/restParamsWithNonRestParams.errors.txt index 1898739529d..71e2ddaa978 100644 --- a/tests/baselines/reference/restParamsWithNonRestParams.errors.txt +++ b/tests/baselines/reference/restParamsWithNonRestParams.errors.txt @@ -6,7 +6,7 @@ restParamsWithNonRestParams.ts(4,1): error TS2555: Expected at least 1 arguments foo(); // ok function foo2(a:string, ...b:number[]){} foo2(); // should be an error - ~~~~~~ + ~~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 restParamsWithNonRestParams.ts:3:15: An argument for 'a' was not provided. function foo3(a?:string, ...b:number[]){} diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.errors.txt b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.errors.txt new file mode 100644 index 00000000000..ec7eab991b0 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.errors.txt @@ -0,0 +1,225 @@ +reverseMappedTypeIntersectionConstraint.ts(19,7): error TS2322: Type '"bar"' is not assignable to type '"foo"'. +reverseMappedTypeIntersectionConstraint.ts(32,3): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ entry: "foo"; states: { a: { entry: "foo"; }; }; }'. +reverseMappedTypeIntersectionConstraint.ts(43,3): error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: "y"; }'. +reverseMappedTypeIntersectionConstraint.ts(59,7): error TS2322: Type '{ [K in keyof T & keyof Stuff]: T[K]; }' is not assignable to type 'T'. + '{ [K in keyof T & keyof Stuff]: T[K]; }' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Stuff'. +reverseMappedTypeIntersectionConstraint.ts(63,49): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ field: 1; anotherField: "a"; }'. +reverseMappedTypeIntersectionConstraint.ts(69,7): error TS2322: Type '{ [K in keyof T & keyof Stuff]: T[K]; }[]' is not assignable to type 'T[]'. + Type '{ [K in keyof T & keyof Stuff]: T[K]; }' is not assignable to type 'T'. + '{ [K in keyof T & keyof Stuff]: T[K]; }' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Stuff'. +reverseMappedTypeIntersectionConstraint.ts(74,36): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ field: 1; anotherField: "a"; }'. +reverseMappedTypeIntersectionConstraint.ts(87,12): error TS2353: Object literal may only specify known properties, and 'y' does not exist in type '{ x: 1; }'. +reverseMappedTypeIntersectionConstraint.ts(98,12): error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: 1; }'. +reverseMappedTypeIntersectionConstraint.ts(100,22): error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: 1; y: "foo"; }'. +reverseMappedTypeIntersectionConstraint.ts(113,67): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ prop: "foo"; nested: { prop: string; }; }'. +reverseMappedTypeIntersectionConstraint.ts(152,21): error TS2585: 'Promise' only refers to a type, but is being used as a value here. Do you need to change your target library? Try changing the 'lib' compiler option to es2015 or later. +reverseMappedTypeIntersectionConstraint.ts(164,3): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ types: { actors: { src: "str"; logic: () => any; }; }; invoke: { readonly src: "str"; }; }'. +reverseMappedTypeIntersectionConstraint.ts(171,3): error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ invoke: { readonly src: "whatever"; }; }'. + + +==== reverseMappedTypeIntersectionConstraint.ts (14 errors) ==== + type StateConfig = { + entry?: TAction + states?: Record>; + }; + + type StateSchema = { + states?: Record; + }; + + declare function createMachine< + TConfig extends StateConfig, + TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string, + >(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K] }): [TAction, TConfig]; + + const inferredParams1 = createMachine({ + entry: "foo", + states: { + a: { + entry: "bar", + ~~~~~ +!!! error TS2322: Type '"bar"' is not assignable to type '"foo"'. +!!! related TS6500 reverseMappedTypeIntersectionConstraint.ts:2:3: The expected type comes from property 'entry' which is declared here on type 'StateConfig<"foo">' + }, + }, + extra: 12, + }); + + const inferredParams2 = createMachine({ + entry: "foo", + states: { + a: { + entry: "foo", + }, + }, + extra: 12, + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ entry: "foo"; states: { a: { entry: "foo"; }; }; }'. + }); + + + // ----------------------------------------------------------------------------------------- + + const checkType = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + + const checked = checkType<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", // undesirable property z is *not* allowed + ~ +!!! error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: "y"; }'. + }); + + checked; + + // ----------------------------------------------------------------------------------------- + + interface Stuff { + field: number; + anotherField: string; + } + + function doStuffWithStuff(s: { [K in keyof T & keyof Stuff]: T[K] } ): T { + if(Math.random() > 0.5) { + return s as T + } else { + return s + ~~~~~~ +!!! error TS2322: Type '{ [K in keyof T & keyof Stuff]: T[K]; }' is not assignable to type 'T'. +!!! error TS2322: '{ [K in keyof T & keyof Stuff]: T[K]; }' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Stuff'. + } + } + + doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ field: 1; anotherField: "a"; }'. + + function doStuffWithStuffArr(arr: { [K in keyof T & keyof Stuff]: T[K] }[]): T[] { + if(Math.random() > 0.5) { + return arr as T[] + } else { + return arr + ~~~~~~ +!!! error TS2322: Type '{ [K in keyof T & keyof Stuff]: T[K]; }[]' is not assignable to type 'T[]'. +!!! error TS2322: Type '{ [K in keyof T & keyof Stuff]: T[K]; }' is not assignable to type 'T'. +!!! error TS2322: '{ [K in keyof T & keyof Stuff]: T[K]; }' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Stuff'. + } + } + + doStuffWithStuffArr([ + { field: 1, anotherField: 'a', extra: 123 }, + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ field: 1; anotherField: "a"; }'. + ]) + + // ----------------------------------------------------------------------------------------- + + type XNumber = { x: number } + + declare function foo(props: {[K in keyof T & keyof XNumber]: T[K]}): void; + + function bar(props: {x: number, y: string}) { + return foo(props); // no error because lack of excess property check by design + } + + foo({x: 1, y: 'foo'}); + ~ +!!! error TS2353: Object literal may only specify known properties, and 'y' does not exist in type '{ x: 1; }'. + + foo({...{x: 1, y: 'foo'}}); // no error because lack of excess property check by design + + // ----------------------------------------------------------------------------------------- + + type NoErrWithOptProps = { x: number, y?: string } + + declare function baz(props: {[K in keyof T & keyof NoErrWithOptProps]: T[K]}): void; + + baz({x: 1}); + baz({x: 1, z: 123}); + ~ +!!! error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: 1; }'. + baz({x: 1, y: 'foo'}); + baz({x: 1, y: 'foo', z: 123}); + ~ +!!! error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: 1; y: "foo"; }'. + + // ----------------------------------------------------------------------------------------- + + interface WithNestedProp { + prop: string; + nested: { + prop: string; + } + } + + declare function withNestedProp(props: {[K in keyof T & keyof WithNestedProp]: T[K]}): T; + + const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ prop: "foo"; nested: { prop: string; }; }'. + + // ----------------------------------------------------------------------------------------- + + type IsLiteralString = string extends T ? false : true; + + type DeepWritable = T extends Function ? T : { -readonly [K in keyof T]: DeepWritable } + + interface ProvidedActor { + src: string; + logic: () => Promise; + } + + type DistributeActors = TActor extends { src: infer TSrc } + ? { + src: TSrc; + } + : never; + + interface MachineConfig { + types?: { + actors?: TActor; + }; + invoke: IsLiteralString extends true + ? DistributeActors + : { + src: string; + }; + } + + type NoExtra = { + [K in keyof T]: K extends keyof MachineConfig ? T[K] : never + } + + declare function createXMachine< + const TConfig extends MachineConfig, + TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor} } ? TConfig["types"]["actors"] : ProvidedActor, + >(config: {[K in keyof MachineConfig & keyof TConfig]: TConfig[K] }): TConfig; + + const child = () => Promise.resolve("foo"); + ~~~~~~~ +!!! error TS2585: 'Promise' only refers to a type, but is being used as a value here. Do you need to change your target library? Try changing the 'lib' compiler option to es2015 or later. + + const config = createXMachine({ + types: {} as { + actors: { + src: "str"; + logic: typeof child; + }; + }, + invoke: { + src: "str", + }, + extra: 10 + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ types: { actors: { src: "str"; logic: () => any; }; }; invoke: { readonly src: "str"; }; }'. + }); + + const config2 = createXMachine({ + invoke: { + src: "whatever", + }, + extra: 10 + ~~~~~ +!!! error TS2353: Object literal may only specify known properties, and 'extra' does not exist in type '{ invoke: { readonly src: "whatever"; }; }'. + }); + \ No newline at end of file diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js new file mode 100644 index 00000000000..a68576c793b --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js @@ -0,0 +1,260 @@ +//// [tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts] //// + +//// [reverseMappedTypeIntersectionConstraint.ts] +type StateConfig = { + entry?: TAction + states?: Record>; +}; + +type StateSchema = { + states?: Record; +}; + +declare function createMachine< + TConfig extends StateConfig, + TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string, +>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K] }): [TAction, TConfig]; + +const inferredParams1 = createMachine({ + entry: "foo", + states: { + a: { + entry: "bar", + }, + }, + extra: 12, +}); + +const inferredParams2 = createMachine({ + entry: "foo", + states: { + a: { + entry: "foo", + }, + }, + extra: 12, +}); + + +// ----------------------------------------------------------------------------------------- + +const checkType = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + +const checked = checkType<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", // undesirable property z is *not* allowed +}); + +checked; + +// ----------------------------------------------------------------------------------------- + +interface Stuff { + field: number; + anotherField: string; +} + +function doStuffWithStuff(s: { [K in keyof T & keyof Stuff]: T[K] } ): T { + if(Math.random() > 0.5) { + return s as T + } else { + return s + } +} + +doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) + +function doStuffWithStuffArr(arr: { [K in keyof T & keyof Stuff]: T[K] }[]): T[] { + if(Math.random() > 0.5) { + return arr as T[] + } else { + return arr + } +} + +doStuffWithStuffArr([ + { field: 1, anotherField: 'a', extra: 123 }, +]) + +// ----------------------------------------------------------------------------------------- + +type XNumber = { x: number } + +declare function foo(props: {[K in keyof T & keyof XNumber]: T[K]}): void; + +function bar(props: {x: number, y: string}) { + return foo(props); // no error because lack of excess property check by design +} + +foo({x: 1, y: 'foo'}); + +foo({...{x: 1, y: 'foo'}}); // no error because lack of excess property check by design + +// ----------------------------------------------------------------------------------------- + +type NoErrWithOptProps = { x: number, y?: string } + +declare function baz(props: {[K in keyof T & keyof NoErrWithOptProps]: T[K]}): void; + +baz({x: 1}); +baz({x: 1, z: 123}); +baz({x: 1, y: 'foo'}); +baz({x: 1, y: 'foo', z: 123}); + +// ----------------------------------------------------------------------------------------- + +interface WithNestedProp { + prop: string; + nested: { + prop: string; + } +} + +declare function withNestedProp(props: {[K in keyof T & keyof WithNestedProp]: T[K]}): T; + +const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); + +// ----------------------------------------------------------------------------------------- + +type IsLiteralString = string extends T ? false : true; + +type DeepWritable = T extends Function ? T : { -readonly [K in keyof T]: DeepWritable } + +interface ProvidedActor { + src: string; + logic: () => Promise; +} + +type DistributeActors = TActor extends { src: infer TSrc } + ? { + src: TSrc; + } + : never; + +interface MachineConfig { + types?: { + actors?: TActor; + }; + invoke: IsLiteralString extends true + ? DistributeActors + : { + src: string; + }; +} + +type NoExtra = { + [K in keyof T]: K extends keyof MachineConfig ? T[K] : never +} + +declare function createXMachine< + const TConfig extends MachineConfig, + TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor} } ? TConfig["types"]["actors"] : ProvidedActor, +>(config: {[K in keyof MachineConfig & keyof TConfig]: TConfig[K] }): TConfig; + +const child = () => Promise.resolve("foo"); + +const config = createXMachine({ + types: {} as { + actors: { + src: "str"; + logic: typeof child; + }; + }, + invoke: { + src: "str", + }, + extra: 10 +}); + +const config2 = createXMachine({ + invoke: { + src: "whatever", + }, + extra: 10 +}); + + +//// [reverseMappedTypeIntersectionConstraint.js] +"use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var inferredParams1 = createMachine({ + entry: "foo", + states: { + a: { + entry: "bar", + }, + }, + extra: 12, +}); +var inferredParams2 = createMachine({ + entry: "foo", + states: { + a: { + entry: "foo", + }, + }, + extra: 12, +}); +// ----------------------------------------------------------------------------------------- +var checkType = function () { return function (value) { return value; }; }; +var checked = checkType()({ + x: 1, + y: "y", + z: "z", // undesirable property z is *not* allowed +}); +checked; +function doStuffWithStuff(s) { + if (Math.random() > 0.5) { + return s; + } + else { + return s; + } +} +doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }); +function doStuffWithStuffArr(arr) { + if (Math.random() > 0.5) { + return arr; + } + else { + return arr; + } +} +doStuffWithStuffArr([ + { field: 1, anotherField: 'a', extra: 123 }, +]); +function bar(props) { + return foo(props); // no error because lack of excess property check by design +} +foo({ x: 1, y: 'foo' }); +foo(__assign({ x: 1, y: 'foo' })); // no error because lack of excess property check by design +baz({ x: 1 }); +baz({ x: 1, z: 123 }); +baz({ x: 1, y: 'foo' }); +baz({ x: 1, y: 'foo', z: 123 }); +var wnp = withNestedProp({ prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); +var child = function () { return Promise.resolve("foo"); }; +var config = createXMachine({ + types: {}, + invoke: { + src: "str", + }, + extra: 10 +}); +var config2 = createXMachine({ + invoke: { + src: "whatever", + }, + extra: 10 +}); diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.symbols b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.symbols new file mode 100644 index 00000000000..12cb8664c84 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.symbols @@ -0,0 +1,491 @@ +//// [tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts] //// + +=== reverseMappedTypeIntersectionConstraint.ts === +type StateConfig = { +>StateConfig : Symbol(StateConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 0)) +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 17)) + + entry?: TAction +>entry : Symbol(entry, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 44)) +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 17)) + + states?: Record>; +>states : Symbol(states, Decl(reverseMappedTypeIntersectionConstraint.ts, 1, 17)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>StateConfig : Symbol(StateConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 0)) +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 17)) + +}; + +type StateSchema = { +>StateSchema : Symbol(StateSchema, Decl(reverseMappedTypeIntersectionConstraint.ts, 3, 2)) + + states?: Record; +>states : Symbol(states, Decl(reverseMappedTypeIntersectionConstraint.ts, 5, 20)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>StateSchema : Symbol(StateSchema, Decl(reverseMappedTypeIntersectionConstraint.ts, 3, 2)) + +}; + +declare function createMachine< +>createMachine : Symbol(createMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 7, 2)) + + TConfig extends StateConfig, +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) +>StateConfig : Symbol(StateConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 0)) +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 10, 39)) + + TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string, +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 10, 39)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) + +>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K] }): [TAction, TConfig]; +>config : Symbol(config, Decl(reverseMappedTypeIntersectionConstraint.ts, 12, 2)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 12, 13)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) +>StateConfig : Symbol(StateConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 0, 0)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 12, 13)) +>TAction : Symbol(TAction, Decl(reverseMappedTypeIntersectionConstraint.ts, 10, 39)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 9, 31)) + +const inferredParams1 = createMachine({ +>inferredParams1 : Symbol(inferredParams1, Decl(reverseMappedTypeIntersectionConstraint.ts, 14, 5)) +>createMachine : Symbol(createMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 7, 2)) + + entry: "foo", +>entry : Symbol(entry, Decl(reverseMappedTypeIntersectionConstraint.ts, 14, 39)) + + states: { +>states : Symbol(states, Decl(reverseMappedTypeIntersectionConstraint.ts, 15, 15)) + + a: { +>a : Symbol(a, Decl(reverseMappedTypeIntersectionConstraint.ts, 16, 11)) + + entry: "bar", +>entry : Symbol(entry, Decl(reverseMappedTypeIntersectionConstraint.ts, 17, 8)) + + }, + }, + extra: 12, +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 20, 4)) + +}); + +const inferredParams2 = createMachine({ +>inferredParams2 : Symbol(inferredParams2, Decl(reverseMappedTypeIntersectionConstraint.ts, 24, 5)) +>createMachine : Symbol(createMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 7, 2)) + + entry: "foo", +>entry : Symbol(entry, Decl(reverseMappedTypeIntersectionConstraint.ts, 24, 39)) + + states: { +>states : Symbol(states, Decl(reverseMappedTypeIntersectionConstraint.ts, 25, 15)) + + a: { +>a : Symbol(a, Decl(reverseMappedTypeIntersectionConstraint.ts, 26, 11)) + + entry: "foo", +>entry : Symbol(entry, Decl(reverseMappedTypeIntersectionConstraint.ts, 27, 8)) + + }, + }, + extra: 12, +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 30, 4)) + +}); + + +// ----------------------------------------------------------------------------------------- + +const checkType = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; +>checkType : Symbol(checkType, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 5)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 19)) +>U : Symbol(U, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 28)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 19)) +>value : Symbol(value, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 41)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 51)) +>U : Symbol(U, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 28)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 19)) +>U : Symbol(U, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 28)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 51)) +>value : Symbol(value, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 41)) + +const checked = checkType<{x: number, y: string}>()({ +>checked : Symbol(checked, Decl(reverseMappedTypeIntersectionConstraint.ts, 39, 5)) +>checkType : Symbol(checkType, Decl(reverseMappedTypeIntersectionConstraint.ts, 37, 5)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 39, 27)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 39, 37)) + + x: 1 as number, +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 39, 53)) + + y: "y", +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 40, 17)) + + z: "z", // undesirable property z is *not* allowed +>z : Symbol(z, Decl(reverseMappedTypeIntersectionConstraint.ts, 41, 9)) + +}); + +checked; +>checked : Symbol(checked, Decl(reverseMappedTypeIntersectionConstraint.ts, 39, 5)) + +// ----------------------------------------------------------------------------------------- + +interface Stuff { +>Stuff : Symbol(Stuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 45, 8)) + + field: number; +>field : Symbol(Stuff.field, Decl(reverseMappedTypeIntersectionConstraint.ts, 49, 17)) + + anotherField: string; +>anotherField : Symbol(Stuff.anotherField, Decl(reverseMappedTypeIntersectionConstraint.ts, 50, 18)) +} + +function doStuffWithStuff(s: { [K in keyof T & keyof Stuff]: T[K] } ): T { +>doStuffWithStuff : Symbol(doStuffWithStuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 52, 1)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 26)) +>Stuff : Symbol(Stuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 45, 8)) +>s : Symbol(s, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 43)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 49)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 26)) +>Stuff : Symbol(Stuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 45, 8)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 26)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 49)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 26)) + + if(Math.random() > 0.5) { +>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) + + return s as T +>s : Symbol(s, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 43)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 26)) + + } else { + return s +>s : Symbol(s, Decl(reverseMappedTypeIntersectionConstraint.ts, 54, 43)) + } +} + +doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) +>doStuffWithStuff : Symbol(doStuffWithStuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 52, 1)) +>field : Symbol(field, Decl(reverseMappedTypeIntersectionConstraint.ts, 62, 18)) +>anotherField : Symbol(anotherField, Decl(reverseMappedTypeIntersectionConstraint.ts, 62, 28)) +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 62, 47)) + +function doStuffWithStuffArr(arr: { [K in keyof T & keyof Stuff]: T[K] }[]): T[] { +>doStuffWithStuffArr : Symbol(doStuffWithStuffArr, Decl(reverseMappedTypeIntersectionConstraint.ts, 62, 61)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 29)) +>Stuff : Symbol(Stuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 45, 8)) +>arr : Symbol(arr, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 46)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 54)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 29)) +>Stuff : Symbol(Stuff, Decl(reverseMappedTypeIntersectionConstraint.ts, 45, 8)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 29)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 54)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 29)) + + if(Math.random() > 0.5) { +>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) + + return arr as T[] +>arr : Symbol(arr, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 46)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 29)) + + } else { + return arr +>arr : Symbol(arr, Decl(reverseMappedTypeIntersectionConstraint.ts, 64, 46)) + } +} + +doStuffWithStuffArr([ +>doStuffWithStuffArr : Symbol(doStuffWithStuffArr, Decl(reverseMappedTypeIntersectionConstraint.ts, 62, 61)) + + { field: 1, anotherField: 'a', extra: 123 }, +>field : Symbol(field, Decl(reverseMappedTypeIntersectionConstraint.ts, 73, 5)) +>anotherField : Symbol(anotherField, Decl(reverseMappedTypeIntersectionConstraint.ts, 73, 15)) +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 73, 34)) + +]) + +// ----------------------------------------------------------------------------------------- + +type XNumber = { x: number } +>XNumber : Symbol(XNumber, Decl(reverseMappedTypeIntersectionConstraint.ts, 74, 2)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 78, 16)) + +declare function foo(props: {[K in keyof T & keyof XNumber]: T[K]}): void; +>foo : Symbol(foo, Decl(reverseMappedTypeIntersectionConstraint.ts, 78, 28)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 21)) +>XNumber : Symbol(XNumber, Decl(reverseMappedTypeIntersectionConstraint.ts, 74, 2)) +>props : Symbol(props, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 40)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 49)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 21)) +>XNumber : Symbol(XNumber, Decl(reverseMappedTypeIntersectionConstraint.ts, 74, 2)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 21)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 49)) + +function bar(props: {x: number, y: string}) { +>bar : Symbol(bar, Decl(reverseMappedTypeIntersectionConstraint.ts, 80, 93)) +>props : Symbol(props, Decl(reverseMappedTypeIntersectionConstraint.ts, 82, 13)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 82, 21)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 82, 31)) + + return foo(props); // no error because lack of excess property check by design +>foo : Symbol(foo, Decl(reverseMappedTypeIntersectionConstraint.ts, 78, 28)) +>props : Symbol(props, Decl(reverseMappedTypeIntersectionConstraint.ts, 82, 13)) +} + +foo({x: 1, y: 'foo'}); +>foo : Symbol(foo, Decl(reverseMappedTypeIntersectionConstraint.ts, 78, 28)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 86, 5)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 86, 10)) + +foo({...{x: 1, y: 'foo'}}); // no error because lack of excess property check by design +>foo : Symbol(foo, Decl(reverseMappedTypeIntersectionConstraint.ts, 78, 28)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 88, 9)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 88, 14)) + +// ----------------------------------------------------------------------------------------- + +type NoErrWithOptProps = { x: number, y?: string } +>NoErrWithOptProps : Symbol(NoErrWithOptProps, Decl(reverseMappedTypeIntersectionConstraint.ts, 88, 27)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 26)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 37)) + +declare function baz(props: {[K in keyof T & keyof NoErrWithOptProps]: T[K]}): void; +>baz : Symbol(baz, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 50)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 21)) +>NoErrWithOptProps : Symbol(NoErrWithOptProps, Decl(reverseMappedTypeIntersectionConstraint.ts, 88, 27)) +>props : Symbol(props, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 50)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 59)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 21)) +>NoErrWithOptProps : Symbol(NoErrWithOptProps, Decl(reverseMappedTypeIntersectionConstraint.ts, 88, 27)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 21)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 94, 59)) + +baz({x: 1}); +>baz : Symbol(baz, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 50)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 96, 5)) + +baz({x: 1, z: 123}); +>baz : Symbol(baz, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 50)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 97, 5)) +>z : Symbol(z, Decl(reverseMappedTypeIntersectionConstraint.ts, 97, 10)) + +baz({x: 1, y: 'foo'}); +>baz : Symbol(baz, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 50)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 98, 5)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 98, 10)) + +baz({x: 1, y: 'foo', z: 123}); +>baz : Symbol(baz, Decl(reverseMappedTypeIntersectionConstraint.ts, 92, 50)) +>x : Symbol(x, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 5)) +>y : Symbol(y, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 10)) +>z : Symbol(z, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 20)) + +// ----------------------------------------------------------------------------------------- + +interface WithNestedProp { +>WithNestedProp : Symbol(WithNestedProp, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 30)) + + prop: string; +>prop : Symbol(WithNestedProp.prop, Decl(reverseMappedTypeIntersectionConstraint.ts, 103, 26)) + + nested: { +>nested : Symbol(WithNestedProp.nested, Decl(reverseMappedTypeIntersectionConstraint.ts, 104, 15)) + + prop: string; +>prop : Symbol(prop, Decl(reverseMappedTypeIntersectionConstraint.ts, 105, 11)) + } +} + +declare function withNestedProp(props: {[K in keyof T & keyof WithNestedProp]: T[K]}): T; +>withNestedProp : Symbol(withNestedProp, Decl(reverseMappedTypeIntersectionConstraint.ts, 108, 1)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 32)) +>WithNestedProp : Symbol(WithNestedProp, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 30)) +>props : Symbol(props, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 58)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 67)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 32)) +>WithNestedProp : Symbol(WithNestedProp, Decl(reverseMappedTypeIntersectionConstraint.ts, 99, 30)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 32)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 67)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 110, 32)) + +const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); +>wnp : Symbol(wnp, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 5)) +>withNestedProp : Symbol(withNestedProp, Decl(reverseMappedTypeIntersectionConstraint.ts, 108, 1)) +>prop : Symbol(prop, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 28)) +>nested : Symbol(nested, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 40)) +>prop : Symbol(prop, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 50)) +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 65)) + +// ----------------------------------------------------------------------------------------- + +type IsLiteralString = string extends T ? false : true; +>IsLiteralString : Symbol(IsLiteralString, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 79)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 116, 21)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 116, 21)) + +type DeepWritable = T extends Function ? T : { -readonly [K in keyof T]: DeepWritable } +>DeepWritable : Symbol(DeepWritable, Decl(reverseMappedTypeIntersectionConstraint.ts, 116, 73)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 18)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 18)) +>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 18)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 61)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 18)) +>DeepWritable : Symbol(DeepWritable, Decl(reverseMappedTypeIntersectionConstraint.ts, 116, 73)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 18)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 61)) + +interface ProvidedActor { +>ProvidedActor : Symbol(ProvidedActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 96)) + + src: string; +>src : Symbol(ProvidedActor.src, Decl(reverseMappedTypeIntersectionConstraint.ts, 120, 25)) + + logic: () => Promise; +>logic : Symbol(ProvidedActor.logic, Decl(reverseMappedTypeIntersectionConstraint.ts, 121, 14)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --)) +} + +type DistributeActors = TActor extends { src: infer TSrc } +>DistributeActors : Symbol(DistributeActors, Decl(reverseMappedTypeIntersectionConstraint.ts, 123, 1)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 125, 22)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 125, 22)) +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 125, 48)) +>TSrc : Symbol(TSrc, Decl(reverseMappedTypeIntersectionConstraint.ts, 125, 59)) + + ? { + src: TSrc; +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 126, 5)) +>TSrc : Symbol(TSrc, Decl(reverseMappedTypeIntersectionConstraint.ts, 125, 59)) + } + : never; + +interface MachineConfig { +>MachineConfig : Symbol(MachineConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 129, 10)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 131, 24)) +>ProvidedActor : Symbol(ProvidedActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 96)) + + types?: { +>types : Symbol(MachineConfig.types, Decl(reverseMappedTypeIntersectionConstraint.ts, 131, 55)) + + actors?: TActor; +>actors : Symbol(actors, Decl(reverseMappedTypeIntersectionConstraint.ts, 132, 11)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 131, 24)) + + }; + invoke: IsLiteralString extends true +>invoke : Symbol(MachineConfig.invoke, Decl(reverseMappedTypeIntersectionConstraint.ts, 134, 4)) +>IsLiteralString : Symbol(IsLiteralString, Decl(reverseMappedTypeIntersectionConstraint.ts, 112, 79)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 131, 24)) + + ? DistributeActors +>DistributeActors : Symbol(DistributeActors, Decl(reverseMappedTypeIntersectionConstraint.ts, 123, 1)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 131, 24)) + + : { + src: string; +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 137, 7)) + + }; +} + +type NoExtra = { +>NoExtra : Symbol(NoExtra, Decl(reverseMappedTypeIntersectionConstraint.ts, 140, 1)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 142, 13)) + + [K in keyof T]: K extends keyof MachineConfig ? T[K] : never +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 143, 3)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 142, 13)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 143, 3)) +>MachineConfig : Symbol(MachineConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 129, 10)) +>T : Symbol(T, Decl(reverseMappedTypeIntersectionConstraint.ts, 142, 13)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 143, 3)) +} + +declare function createXMachine< +>createXMachine : Symbol(createXMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 144, 1)) + + const TConfig extends MachineConfig, +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) +>MachineConfig : Symbol(MachineConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 129, 10)) +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 147, 46)) + + TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor} } ? TConfig["types"]["actors"] : ProvidedActor, +>TActor : Symbol(TActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 147, 46)) +>ProvidedActor : Symbol(ProvidedActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 96)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) +>types : Symbol(types, Decl(reverseMappedTypeIntersectionConstraint.ts, 148, 50)) +>actors : Symbol(actors, Decl(reverseMappedTypeIntersectionConstraint.ts, 148, 59)) +>ProvidedActor : Symbol(ProvidedActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 96)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) +>ProvidedActor : Symbol(ProvidedActor, Decl(reverseMappedTypeIntersectionConstraint.ts, 118, 96)) + +>(config: {[K in keyof MachineConfig & keyof TConfig]: TConfig[K] }): TConfig; +>config : Symbol(config, Decl(reverseMappedTypeIntersectionConstraint.ts, 149, 2)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 149, 12)) +>MachineConfig : Symbol(MachineConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 129, 10)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) +>K : Symbol(K, Decl(reverseMappedTypeIntersectionConstraint.ts, 149, 12)) +>TConfig : Symbol(TConfig, Decl(reverseMappedTypeIntersectionConstraint.ts, 146, 32)) + +const child = () => Promise.resolve("foo"); +>child : Symbol(child, Decl(reverseMappedTypeIntersectionConstraint.ts, 151, 5)) + +const config = createXMachine({ +>config : Symbol(config, Decl(reverseMappedTypeIntersectionConstraint.ts, 153, 5)) +>createXMachine : Symbol(createXMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 144, 1)) + + types: {} as { +>types : Symbol(types, Decl(reverseMappedTypeIntersectionConstraint.ts, 153, 31)) + + actors: { +>actors : Symbol(actors, Decl(reverseMappedTypeIntersectionConstraint.ts, 154, 16)) + + src: "str"; +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 155, 13)) + + logic: typeof child; +>logic : Symbol(logic, Decl(reverseMappedTypeIntersectionConstraint.ts, 156, 17)) +>child : Symbol(child, Decl(reverseMappedTypeIntersectionConstraint.ts, 151, 5)) + + }; + }, + invoke: { +>invoke : Symbol(invoke, Decl(reverseMappedTypeIntersectionConstraint.ts, 159, 4)) + + src: "str", +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 160, 11)) + + }, + extra: 10 +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 162, 4)) + +}); + +const config2 = createXMachine({ +>config2 : Symbol(config2, Decl(reverseMappedTypeIntersectionConstraint.ts, 166, 5)) +>createXMachine : Symbol(createXMachine, Decl(reverseMappedTypeIntersectionConstraint.ts, 144, 1)) + + invoke: { +>invoke : Symbol(invoke, Decl(reverseMappedTypeIntersectionConstraint.ts, 166, 32)) + + src: "whatever", +>src : Symbol(src, Decl(reverseMappedTypeIntersectionConstraint.ts, 167, 11)) + + }, + extra: 10 +>extra : Symbol(extra, Decl(reverseMappedTypeIntersectionConstraint.ts, 169, 4)) + +}); + diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types new file mode 100644 index 00000000000..43b568dd83d --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.types @@ -0,0 +1,461 @@ +//// [tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts] //// + +=== reverseMappedTypeIntersectionConstraint.ts === +type StateConfig = { +>StateConfig : StateConfig + + entry?: TAction +>entry : TAction | undefined + + states?: Record>; +>states : Record> | undefined + +}; + +type StateSchema = { +>StateSchema : { states?: Record | undefined; } + + states?: Record; +>states : Record | undefined + +}; + +declare function createMachine< +>createMachine : , TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K]; }) => [TAction, TConfig] + + TConfig extends StateConfig, + TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string, +>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K] }): [TAction, TConfig]; +>config : { [K in keyof TConfig & keyof StateConfig]: TConfig[K]; } + +const inferredParams1 = createMachine({ +>inferredParams1 : ["foo", StateConfig<"foo">] +>createMachine({ entry: "foo", states: { a: { entry: "bar", }, }, extra: 12,}) : ["foo", StateConfig<"foo">] +>createMachine : , TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K]; }) => [TAction, TConfig] +>{ entry: "foo", states: { a: { entry: "bar", }, }, extra: 12,} : { entry: "foo"; states: { a: { entry: "bar"; }; }; extra: number; } + + entry: "foo", +>entry : "foo" +>"foo" : "foo" + + states: { +>states : { a: { entry: "bar"; }; } +>{ a: { entry: "bar", }, } : { a: { entry: "bar"; }; } + + a: { +>a : { entry: "bar"; } +>{ entry: "bar", } : { entry: "bar"; } + + entry: "bar", +>entry : "bar" +>"bar" : "bar" + + }, + }, + extra: 12, +>extra : number +>12 : 12 + +}); + +const inferredParams2 = createMachine({ +>inferredParams2 : ["foo", { entry: "foo"; states: { a: { entry: "foo"; }; }; }] +>createMachine({ entry: "foo", states: { a: { entry: "foo", }, }, extra: 12,}) : ["foo", { entry: "foo"; states: { a: { entry: "foo"; }; }; }] +>createMachine : , TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K]; }) => [TAction, TConfig] +>{ entry: "foo", states: { a: { entry: "foo", }, }, extra: 12,} : { entry: "foo"; states: { a: { entry: "foo"; }; }; extra: number; } + + entry: "foo", +>entry : "foo" +>"foo" : "foo" + + states: { +>states : { a: { entry: "foo"; }; } +>{ a: { entry: "foo", }, } : { a: { entry: "foo"; }; } + + a: { +>a : { entry: "foo"; } +>{ entry: "foo", } : { entry: "foo"; } + + entry: "foo", +>entry : "foo" +>"foo" : "foo" + + }, + }, + extra: 12, +>extra : number +>12 : 12 + +}); + + +// ----------------------------------------------------------------------------------------- + +const checkType = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; +>checkType : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>() => (value: { [K in keyof U & keyof T]: U[K] }) => value : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>(value: { [K in keyof U & keyof T]: U[K] }) => value : (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>value : { [K in keyof U & keyof T]: U[K]; } +>value : { [K in keyof U & keyof T]: U[K]; } + +const checked = checkType<{x: number, y: string}>()({ +>checked : { x: number; y: "y"; } +>checkType<{x: number, y: string}>()({ x: 1 as number, y: "y", z: "z", // undesirable property z is *not* allowed}) : { x: number; y: "y"; } +>checkType<{x: number, y: string}>() : (value: { [K in keyof U & ("x" | "y")]: U[K]; }) => { [K in keyof U & ("x" | "y")]: U[K]; } +>checkType : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>x : number +>y : string +>{ x: 1 as number, y: "y", z: "z", // undesirable property z is *not* allowed} : { x: number; y: "y"; z: string; } + + x: 1 as number, +>x : number +>1 as number : number +>1 : 1 + + y: "y", +>y : "y" +>"y" : "y" + + z: "z", // undesirable property z is *not* allowed +>z : string +>"z" : "z" + +}); + +checked; +>checked : { x: number; y: "y"; } + +// ----------------------------------------------------------------------------------------- + +interface Stuff { + field: number; +>field : number + + anotherField: string; +>anotherField : string +} + +function doStuffWithStuff(s: { [K in keyof T & keyof Stuff]: T[K] } ): T { +>doStuffWithStuff : (s: { [K in keyof T & keyof Stuff]: T[K]; }) => T +>s : { [K in keyof T & keyof Stuff]: T[K]; } + + if(Math.random() > 0.5) { +>Math.random() > 0.5 : boolean +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number +>0.5 : 0.5 + + return s as T +>s as T : T +>s : { [K in keyof T & keyof Stuff]: T[K]; } + + } else { + return s +>s : { [K in keyof T & keyof Stuff]: T[K]; } + } +} + +doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) +>doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) : { field: 1; anotherField: "a"; } +>doStuffWithStuff : (s: { [K in keyof T & keyof Stuff]: T[K]; }) => T +>{ field: 1, anotherField: 'a', extra: 123 } : { field: 1; anotherField: "a"; extra: number; } +>field : 1 +>1 : 1 +>anotherField : "a" +>'a' : "a" +>extra : number +>123 : 123 + +function doStuffWithStuffArr(arr: { [K in keyof T & keyof Stuff]: T[K] }[]): T[] { +>doStuffWithStuffArr : (arr: { [K in keyof T & keyof Stuff]: T[K]; }[]) => T[] +>arr : { [K in keyof T & keyof Stuff]: T[K]; }[] + + if(Math.random() > 0.5) { +>Math.random() > 0.5 : boolean +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number +>0.5 : 0.5 + + return arr as T[] +>arr as T[] : T[] +>arr : { [K in keyof T & keyof Stuff]: T[K]; }[] + + } else { + return arr +>arr : { [K in keyof T & keyof Stuff]: T[K]; }[] + } +} + +doStuffWithStuffArr([ +>doStuffWithStuffArr([ { field: 1, anotherField: 'a', extra: 123 },]) : { field: 1; anotherField: "a"; }[] +>doStuffWithStuffArr : (arr: { [K in keyof T & keyof Stuff]: T[K]; }[]) => T[] +>[ { field: 1, anotherField: 'a', extra: 123 },] : { field: 1; anotherField: "a"; extra: number; }[] + + { field: 1, anotherField: 'a', extra: 123 }, +>{ field: 1, anotherField: 'a', extra: 123 } : { field: 1; anotherField: "a"; extra: number; } +>field : 1 +>1 : 1 +>anotherField : "a" +>'a' : "a" +>extra : number +>123 : 123 + +]) + +// ----------------------------------------------------------------------------------------- + +type XNumber = { x: number } +>XNumber : { x: number; } +>x : number + +declare function foo(props: {[K in keyof T & keyof XNumber]: T[K]}): void; +>foo : (props: { [K in keyof T & "x"]: T[K]; }) => void +>props : { [K in keyof T & "x"]: T[K]; } + +function bar(props: {x: number, y: string}) { +>bar : (props: { x: number; y: string;}) => void +>props : { x: number; y: string; } +>x : number +>y : string + + return foo(props); // no error because lack of excess property check by design +>foo(props) : void +>foo : (props: { [K in keyof T & "x"]: T[K]; }) => void +>props : { x: number; y: string; } +} + +foo({x: 1, y: 'foo'}); +>foo({x: 1, y: 'foo'}) : void +>foo : (props: { [K in keyof T & "x"]: T[K]; }) => void +>{x: 1, y: 'foo'} : { x: 1; y: string; } +>x : 1 +>1 : 1 +>y : string +>'foo' : "foo" + +foo({...{x: 1, y: 'foo'}}); // no error because lack of excess property check by design +>foo({...{x: 1, y: 'foo'}}) : void +>foo : (props: { [K in keyof T & "x"]: T[K]; }) => void +>{...{x: 1, y: 'foo'}} : { x: 1; y: string; } +>{x: 1, y: 'foo'} : { x: 1; y: string; } +>x : 1 +>1 : 1 +>y : string +>'foo' : "foo" + +// ----------------------------------------------------------------------------------------- + +type NoErrWithOptProps = { x: number, y?: string } +>NoErrWithOptProps : { x: number; y?: string | undefined; } +>x : number +>y : string | undefined + +declare function baz(props: {[K in keyof T & keyof NoErrWithOptProps]: T[K]}): void; +>baz : (props: { [K in keyof T & keyof NoErrWithOptProps]: T[K]; }) => void +>props : { [K in keyof T & keyof NoErrWithOptProps]: T[K]; } + +baz({x: 1}); +>baz({x: 1}) : void +>baz : (props: { [K in keyof T & keyof NoErrWithOptProps]: T[K]; }) => void +>{x: 1} : { x: 1; } +>x : 1 +>1 : 1 + +baz({x: 1, z: 123}); +>baz({x: 1, z: 123}) : void +>baz : (props: { [K in keyof T & keyof NoErrWithOptProps]: T[K]; }) => void +>{x: 1, z: 123} : { x: 1; z: number; } +>x : 1 +>1 : 1 +>z : number +>123 : 123 + +baz({x: 1, y: 'foo'}); +>baz({x: 1, y: 'foo'}) : void +>baz : (props: { [K in keyof T & keyof NoErrWithOptProps]: T[K]; }) => void +>{x: 1, y: 'foo'} : { x: 1; y: "foo"; } +>x : 1 +>1 : 1 +>y : "foo" +>'foo' : "foo" + +baz({x: 1, y: 'foo', z: 123}); +>baz({x: 1, y: 'foo', z: 123}) : void +>baz : (props: { [K in keyof T & keyof NoErrWithOptProps]: T[K]; }) => void +>{x: 1, y: 'foo', z: 123} : { x: 1; y: "foo"; z: number; } +>x : 1 +>1 : 1 +>y : "foo" +>'foo' : "foo" +>z : number +>123 : 123 + +// ----------------------------------------------------------------------------------------- + +interface WithNestedProp { + prop: string; +>prop : string + + nested: { +>nested : { prop: string; } + + prop: string; +>prop : string + } +} + +declare function withNestedProp(props: {[K in keyof T & keyof WithNestedProp]: T[K]}): T; +>withNestedProp : (props: { [K in keyof T & keyof WithNestedProp]: T[K]; }) => T +>props : { [K in keyof T & keyof WithNestedProp]: T[K]; } + +const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); +>wnp : { prop: "foo"; nested: { prop: string; }; } +>withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }) : { prop: "foo"; nested: { prop: string; }; } +>withNestedProp : (props: { [K in keyof T & keyof WithNestedProp]: T[K]; }) => T +>{prop: 'foo', nested: { prop: 'bar' }, extra: 10 } : { prop: "foo"; nested: { prop: string; }; extra: number; } +>prop : "foo" +>'foo' : "foo" +>nested : { prop: string; } +>{ prop: 'bar' } : { prop: string; } +>prop : string +>'bar' : "bar" +>extra : number +>10 : 10 + +// ----------------------------------------------------------------------------------------- + +type IsLiteralString = string extends T ? false : true; +>IsLiteralString : IsLiteralString +>false : false +>true : true + +type DeepWritable = T extends Function ? T : { -readonly [K in keyof T]: DeepWritable } +>DeepWritable : DeepWritable + +interface ProvidedActor { + src: string; +>src : string + + logic: () => Promise; +>logic : () => Promise +} + +type DistributeActors = TActor extends { src: infer TSrc } +>DistributeActors : DistributeActors +>src : TSrc + + ? { + src: TSrc; +>src : TSrc + } + : never; + +interface MachineConfig { + types?: { +>types : { actors?: TActor | undefined; } | undefined + + actors?: TActor; +>actors : TActor | undefined + + }; + invoke: IsLiteralString extends true +>invoke : IsLiteralString extends true ? DistributeActors : { src: string; } +>true : true + + ? DistributeActors + : { + src: string; +>src : string + + }; +} + +type NoExtra = { +>NoExtra : NoExtra + + [K in keyof T]: K extends keyof MachineConfig ? T[K] : never +} + +declare function createXMachine< +>createXMachine : , TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor;}; } ? TConfig["types"]["actors"] : ProvidedActor>(config: { [K in keyof MachineConfig & keyof TConfig]: TConfig[K]; }) => TConfig + + const TConfig extends MachineConfig, + TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor} } ? TConfig["types"]["actors"] : ProvidedActor, +>types : { actors: ProvidedActor; } +>actors : ProvidedActor + +>(config: {[K in keyof MachineConfig & keyof TConfig]: TConfig[K] }): TConfig; +>config : { [K in keyof MachineConfig & keyof TConfig]: TConfig[K]; } + +const child = () => Promise.resolve("foo"); +>child : () => any +>() => Promise.resolve("foo") : () => any +>Promise.resolve("foo") : any +>Promise.resolve : any +>Promise : any +>resolve : any +>"foo" : "foo" + +const config = createXMachine({ +>config : { types: { actors: { src: "str"; logic: typeof child;}; }; invoke: { readonly src: "str"; }; } +>createXMachine({ types: {} as { actors: { src: "str"; logic: typeof child; }; }, invoke: { src: "str", }, extra: 10}) : { types: { actors: { src: "str"; logic: typeof child;}; }; invoke: { readonly src: "str"; }; } +>createXMachine : , TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor; }; } ? TConfig["types"]["actors"] : ProvidedActor>(config: { [K in keyof MachineConfig & keyof TConfig]: TConfig[K]; }) => TConfig +>{ types: {} as { actors: { src: "str"; logic: typeof child; }; }, invoke: { src: "str", }, extra: 10} : { types: { actors: { src: "str"; logic: typeof child;}; }; invoke: { src: "str"; }; extra: number; } + + types: {} as { +>types : { actors: { src: "str"; logic: typeof child;}; } +>{} as { actors: { src: "str"; logic: typeof child; }; } : { actors: { src: "str"; logic: typeof child;}; } +>{} : {} + + actors: { +>actors : { src: "str"; logic: typeof child; } + + src: "str"; +>src : "str" + + logic: typeof child; +>logic : () => any +>child : () => any + + }; + }, + invoke: { +>invoke : { src: "str"; } +>{ src: "str", } : { src: "str"; } + + src: "str", +>src : "str" +>"str" : "str" + + }, + extra: 10 +>extra : number +>10 : 10 + +}); + +const config2 = createXMachine({ +>config2 : { invoke: { readonly src: "whatever"; }; } +>createXMachine({ invoke: { src: "whatever", }, extra: 10}) : { invoke: { readonly src: "whatever"; }; } +>createXMachine : , TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor; }; } ? TConfig["types"]["actors"] : ProvidedActor>(config: { [K in keyof MachineConfig & keyof TConfig]: TConfig[K]; }) => TConfig +>{ invoke: { src: "whatever", }, extra: 10} : { invoke: { src: "whatever"; }; extra: number; } + + invoke: { +>invoke : { src: "whatever"; } +>{ src: "whatever", } : { src: "whatever"; } + + src: "whatever", +>src : "whatever" +>"whatever" : "whatever" + + }, + extra: 10 +>extra : number +>10 : 10 + +}); + diff --git a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.errors.txt b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.errors.txt new file mode 100644 index 00000000000..dc6dc8fa3a3 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.errors.txt @@ -0,0 +1,24 @@ +reverseMappedTypeLimitedConstraint.ts(5,13): error TS2353: Object literal may only specify known properties, and 'y' does not exist in type '{ x: 1; }'. +reverseMappedTypeLimitedConstraint.ts(14,3): error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: "y"; }'. + + +==== reverseMappedTypeLimitedConstraint.ts (2 errors) ==== + type XNumber_ = { x: number } + + declare function foo_(props: {[K in keyof T & keyof XNumber_]: T[K]}): T; + + foo_({x: 1, y: 'foo'}); + ~ +!!! error TS2353: Object literal may only specify known properties, and 'y' does not exist in type '{ x: 1; }'. + + // ----------------------------------------------------------------------------------------- + + const checkType_ = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + + const checked_ = checkType_<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", + ~ +!!! error TS2353: Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: "y"; }'. + }); \ No newline at end of file diff --git a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.js b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.js new file mode 100644 index 00000000000..0be7aa8d6a4 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts] //// + +//// [reverseMappedTypeLimitedConstraint.ts] +type XNumber_ = { x: number } + +declare function foo_(props: {[K in keyof T & keyof XNumber_]: T[K]}): T; + +foo_({x: 1, y: 'foo'}); + +// ----------------------------------------------------------------------------------------- + +const checkType_ = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + +const checked_ = checkType_<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", +}); + +//// [reverseMappedTypeLimitedConstraint.js] +foo_({ x: 1, y: 'foo' }); +// ----------------------------------------------------------------------------------------- +var checkType_ = function () { return function (value) { return value; }; }; +var checked_ = checkType_()({ + x: 1, + y: "y", + z: "z", +}); diff --git a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.symbols b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.symbols new file mode 100644 index 00000000000..5c815072784 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.symbols @@ -0,0 +1,55 @@ +//// [tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts] //// + +=== reverseMappedTypeLimitedConstraint.ts === +type XNumber_ = { x: number } +>XNumber_ : Symbol(XNumber_, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 0)) +>x : Symbol(x, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 17)) + +declare function foo_(props: {[K in keyof T & keyof XNumber_]: T[K]}): T; +>foo_ : Symbol(foo_, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 29)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 22)) +>XNumber_ : Symbol(XNumber_, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 0)) +>props : Symbol(props, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 42)) +>K : Symbol(K, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 51)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 22)) +>XNumber_ : Symbol(XNumber_, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 22)) +>K : Symbol(K, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 51)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 2, 22)) + +foo_({x: 1, y: 'foo'}); +>foo_ : Symbol(foo_, Decl(reverseMappedTypeLimitedConstraint.ts, 0, 29)) +>x : Symbol(x, Decl(reverseMappedTypeLimitedConstraint.ts, 4, 6)) +>y : Symbol(y, Decl(reverseMappedTypeLimitedConstraint.ts, 4, 11)) + +// ----------------------------------------------------------------------------------------- + +const checkType_ = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; +>checkType_ : Symbol(checkType_, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 5)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 20)) +>U : Symbol(U, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 29)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 20)) +>value : Symbol(value, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 42)) +>K : Symbol(K, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 52)) +>U : Symbol(U, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 29)) +>T : Symbol(T, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 20)) +>U : Symbol(U, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 29)) +>K : Symbol(K, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 52)) +>value : Symbol(value, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 42)) + +const checked_ = checkType_<{x: number, y: string}>()({ +>checked_ : Symbol(checked_, Decl(reverseMappedTypeLimitedConstraint.ts, 10, 5)) +>checkType_ : Symbol(checkType_, Decl(reverseMappedTypeLimitedConstraint.ts, 8, 5)) +>x : Symbol(x, Decl(reverseMappedTypeLimitedConstraint.ts, 10, 29)) +>y : Symbol(y, Decl(reverseMappedTypeLimitedConstraint.ts, 10, 39)) + + x: 1 as number, +>x : Symbol(x, Decl(reverseMappedTypeLimitedConstraint.ts, 10, 55)) + + y: "y", +>y : Symbol(y, Decl(reverseMappedTypeLimitedConstraint.ts, 11, 17)) + + z: "z", +>z : Symbol(z, Decl(reverseMappedTypeLimitedConstraint.ts, 12, 9)) + +}); diff --git a/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types new file mode 100644 index 00000000000..821d7685fcc --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeLimitedConstraint.types @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts] //// + +=== reverseMappedTypeLimitedConstraint.ts === +type XNumber_ = { x: number } +>XNumber_ : { x: number; } +>x : number + +declare function foo_(props: {[K in keyof T & keyof XNumber_]: T[K]}): T; +>foo_ : (props: { [K in keyof T & "x"]: T[K]; }) => T +>props : { [K in keyof T & "x"]: T[K]; } + +foo_({x: 1, y: 'foo'}); +>foo_({x: 1, y: 'foo'}) : { x: 1; } +>foo_ : (props: { [K in keyof T & "x"]: T[K]; }) => T +>{x: 1, y: 'foo'} : { x: 1; y: string; } +>x : 1 +>1 : 1 +>y : string +>'foo' : "foo" + +// ----------------------------------------------------------------------------------------- + +const checkType_ = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; +>checkType_ : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>() => (value: { [K in keyof U & keyof T]: U[K] }) => value : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>(value: { [K in keyof U & keyof T]: U[K] }) => value : (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>value : { [K in keyof U & keyof T]: U[K]; } +>value : { [K in keyof U & keyof T]: U[K]; } + +const checked_ = checkType_<{x: number, y: string}>()({ +>checked_ : { x: number; y: "y"; } +>checkType_<{x: number, y: string}>()({ x: 1 as number, y: "y", z: "z",}) : { x: number; y: "y"; } +>checkType_<{x: number, y: string}>() : (value: { [K in keyof U & ("x" | "y")]: U[K]; }) => { [K in keyof U & ("x" | "y")]: U[K]; } +>checkType_ : () => (value: { [K in keyof U & keyof T]: U[K]; }) => { [K in keyof U & keyof T]: U[K]; } +>x : number +>y : string +>{ x: 1 as number, y: "y", z: "z",} : { x: number; y: "y"; z: string; } + + x: 1 as number, +>x : number +>1 as number : number +>1 : 1 + + y: "y", +>y : "y" +>"y" : "y" + + z: "z", +>z : string +>"z" : "z" + +}); diff --git a/tests/baselines/reference/reverseMappedUnionInference.symbols b/tests/baselines/reference/reverseMappedUnionInference.symbols new file mode 100644 index 00000000000..ec09965565d --- /dev/null +++ b/tests/baselines/reference/reverseMappedUnionInference.symbols @@ -0,0 +1,172 @@ +//// [tests/cases/compiler/reverseMappedUnionInference.ts] //// + +=== reverseMappedUnionInference.ts === +interface AnyExtractor { +>AnyExtractor : Symbol(AnyExtractor, Decl(reverseMappedUnionInference.ts, 0, 0)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 0, 23)) + + matches: (node: any) => boolean; +>matches : Symbol(AnyExtractor.matches, Decl(reverseMappedUnionInference.ts, 0, 32)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 1, 12)) + + extract: (node: any) => Result | undefined; +>extract : Symbol(AnyExtractor.extract, Decl(reverseMappedUnionInference.ts, 1, 34)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 2, 12)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 0, 23)) +} + +interface Extractor { +>Extractor : Symbol(Extractor, Decl(reverseMappedUnionInference.ts, 3, 1)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 5, 20)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 5, 22)) + + matches: (node: unknown) => node is T; +>matches : Symbol(Extractor.matches, Decl(reverseMappedUnionInference.ts, 5, 32)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 6, 12)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 6, 12)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 5, 20)) + + extract: (node: T) => Result | undefined; +>extract : Symbol(Extractor.extract, Decl(reverseMappedUnionInference.ts, 6, 40)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 7, 12)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 5, 20)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 5, 22)) +} + +declare function createExtractor(params: { +>createExtractor : Symbol(createExtractor, Decl(reverseMappedUnionInference.ts, 8, 1)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 10, 33)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 10, 35)) +>params : Symbol(params, Decl(reverseMappedUnionInference.ts, 10, 44)) + + matcher: (node: unknown) => node is T; +>matcher : Symbol(matcher, Decl(reverseMappedUnionInference.ts, 10, 53)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 11, 12)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 11, 12)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 10, 33)) + + extract: (node: T) => Result; +>extract : Symbol(extract, Decl(reverseMappedUnionInference.ts, 11, 40)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 12, 12)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 10, 33)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 10, 35)) + +}): Extractor; +>Extractor : Symbol(Extractor, Decl(reverseMappedUnionInference.ts, 3, 1)) +>T : Symbol(T, Decl(reverseMappedUnionInference.ts, 10, 33)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 10, 35)) + +interface Identifier { +>Identifier : Symbol(Identifier, Decl(reverseMappedUnionInference.ts, 13, 25)) + + kind: "identifier"; +>kind : Symbol(Identifier.kind, Decl(reverseMappedUnionInference.ts, 15, 22)) + + name: string; +>name : Symbol(Identifier.name, Decl(reverseMappedUnionInference.ts, 16, 21)) +} + +declare function isIdentifier(node: unknown): node is Identifier; +>isIdentifier : Symbol(isIdentifier, Decl(reverseMappedUnionInference.ts, 18, 1)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 20, 30)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 20, 30)) +>Identifier : Symbol(Identifier, Decl(reverseMappedUnionInference.ts, 13, 25)) + +const identifierExtractor = createExtractor({ +>identifierExtractor : Symbol(identifierExtractor, Decl(reverseMappedUnionInference.ts, 22, 5)) +>createExtractor : Symbol(createExtractor, Decl(reverseMappedUnionInference.ts, 8, 1)) + + matcher: isIdentifier, +>matcher : Symbol(matcher, Decl(reverseMappedUnionInference.ts, 22, 45)) +>isIdentifier : Symbol(isIdentifier, Decl(reverseMappedUnionInference.ts, 18, 1)) + + extract: (node) => { +>extract : Symbol(extract, Decl(reverseMappedUnionInference.ts, 23, 24)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 24, 12)) + + return { + node, +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 25, 12)) + + kind: "identifier" as const, +>kind : Symbol(kind, Decl(reverseMappedUnionInference.ts, 26, 11)) +>const : Symbol(const) + + value: node.name, +>value : Symbol(value, Decl(reverseMappedUnionInference.ts, 27, 34)) +>node.name : Symbol(Identifier.name, Decl(reverseMappedUnionInference.ts, 16, 21)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 24, 12)) +>name : Symbol(Identifier.name, Decl(reverseMappedUnionInference.ts, 16, 21)) + + }; + }, +}); + +interface StringLiteral { +>StringLiteral : Symbol(StringLiteral, Decl(reverseMappedUnionInference.ts, 31, 3)) + + kind: "stringLiteral"; +>kind : Symbol(StringLiteral.kind, Decl(reverseMappedUnionInference.ts, 33, 25)) + + value: string; +>value : Symbol(StringLiteral.value, Decl(reverseMappedUnionInference.ts, 34, 24)) +} + +declare function isStringLiteral(node: unknown): node is StringLiteral; +>isStringLiteral : Symbol(isStringLiteral, Decl(reverseMappedUnionInference.ts, 36, 1)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 38, 33)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 38, 33)) +>StringLiteral : Symbol(StringLiteral, Decl(reverseMappedUnionInference.ts, 31, 3)) + +const stringExtractor = createExtractor({ +>stringExtractor : Symbol(stringExtractor, Decl(reverseMappedUnionInference.ts, 40, 5)) +>createExtractor : Symbol(createExtractor, Decl(reverseMappedUnionInference.ts, 8, 1)) + + matcher: isStringLiteral, +>matcher : Symbol(matcher, Decl(reverseMappedUnionInference.ts, 40, 41)) +>isStringLiteral : Symbol(isStringLiteral, Decl(reverseMappedUnionInference.ts, 36, 1)) + + extract: (node) => { +>extract : Symbol(extract, Decl(reverseMappedUnionInference.ts, 41, 27)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 42, 12)) + + return { + node, +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 43, 12)) + + kind: "string" as const, +>kind : Symbol(kind, Decl(reverseMappedUnionInference.ts, 44, 11)) +>const : Symbol(const) + + value: node.value, +>value : Symbol(value, Decl(reverseMappedUnionInference.ts, 45, 30)) +>node.value : Symbol(StringLiteral.value, Decl(reverseMappedUnionInference.ts, 34, 24)) +>node : Symbol(node, Decl(reverseMappedUnionInference.ts, 42, 12)) +>value : Symbol(StringLiteral.value, Decl(reverseMappedUnionInference.ts, 34, 24)) + + }; + }, +}); + +declare function unionType(parsers: { +>unionType : Symbol(unionType, Decl(reverseMappedUnionInference.ts, 49, 3)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 51, 27)) +>parsers : Symbol(parsers, Decl(reverseMappedUnionInference.ts, 51, 62)) + + [K in keyof Result]: AnyExtractor; +>K : Symbol(K, Decl(reverseMappedUnionInference.ts, 52, 3)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 51, 27)) +>AnyExtractor : Symbol(AnyExtractor, Decl(reverseMappedUnionInference.ts, 0, 0)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 51, 27)) +>K : Symbol(K, Decl(reverseMappedUnionInference.ts, 52, 3)) + +}): AnyExtractor; +>AnyExtractor : Symbol(AnyExtractor, Decl(reverseMappedUnionInference.ts, 0, 0)) +>Result : Symbol(Result, Decl(reverseMappedUnionInference.ts, 51, 27)) + +const myUnion = unionType([identifierExtractor, stringExtractor]); +>myUnion : Symbol(myUnion, Decl(reverseMappedUnionInference.ts, 55, 5)) +>unionType : Symbol(unionType, Decl(reverseMappedUnionInference.ts, 49, 3)) +>identifierExtractor : Symbol(identifierExtractor, Decl(reverseMappedUnionInference.ts, 22, 5)) +>stringExtractor : Symbol(stringExtractor, Decl(reverseMappedUnionInference.ts, 40, 5)) + diff --git a/tests/baselines/reference/reverseMappedUnionInference.types b/tests/baselines/reference/reverseMappedUnionInference.types new file mode 100644 index 00000000000..0ce2b95184f --- /dev/null +++ b/tests/baselines/reference/reverseMappedUnionInference.types @@ -0,0 +1,148 @@ +//// [tests/cases/compiler/reverseMappedUnionInference.ts] //// + +=== reverseMappedUnionInference.ts === +interface AnyExtractor { + matches: (node: any) => boolean; +>matches : (node: any) => boolean +>node : any + + extract: (node: any) => Result | undefined; +>extract : (node: any) => Result | undefined +>node : any +} + +interface Extractor { + matches: (node: unknown) => node is T; +>matches : (node: unknown) => node is T +>node : unknown + + extract: (node: T) => Result | undefined; +>extract : (node: T) => Result | undefined +>node : T +} + +declare function createExtractor(params: { +>createExtractor : (params: { matcher: (node: unknown) => node is T; extract: (node: T) => Result; }) => Extractor +>params : { matcher: (node: unknown) => node is T; extract: (node: T) => Result; } + + matcher: (node: unknown) => node is T; +>matcher : (node: unknown) => node is T +>node : unknown + + extract: (node: T) => Result; +>extract : (node: T) => Result +>node : T + +}): Extractor; + +interface Identifier { + kind: "identifier"; +>kind : "identifier" + + name: string; +>name : string +} + +declare function isIdentifier(node: unknown): node is Identifier; +>isIdentifier : (node: unknown) => node is Identifier +>node : unknown + +const identifierExtractor = createExtractor({ +>identifierExtractor : Extractor +>createExtractor({ matcher: isIdentifier, extract: (node) => { return { node, kind: "identifier" as const, value: node.name, }; },}) : Extractor +>createExtractor : (params: { matcher: (node: unknown) => node is T; extract: (node: T) => Result; }) => Extractor +>{ matcher: isIdentifier, extract: (node) => { return { node, kind: "identifier" as const, value: node.name, }; },} : { matcher: (node: unknown) => node is Identifier; extract: (node: Identifier) => { node: Identifier; kind: "identifier"; value: string; }; } + + matcher: isIdentifier, +>matcher : (node: unknown) => node is Identifier +>isIdentifier : (node: unknown) => node is Identifier + + extract: (node) => { +>extract : (node: Identifier) => { node: Identifier; kind: "identifier"; value: string; } +>(node) => { return { node, kind: "identifier" as const, value: node.name, }; } : (node: Identifier) => { node: Identifier; kind: "identifier"; value: string; } +>node : Identifier + + return { +>{ node, kind: "identifier" as const, value: node.name, } : { node: Identifier; kind: "identifier"; value: string; } + + node, +>node : Identifier + + kind: "identifier" as const, +>kind : "identifier" +>"identifier" as const : "identifier" +>"identifier" : "identifier" + + value: node.name, +>value : string +>node.name : string +>node : Identifier +>name : string + + }; + }, +}); + +interface StringLiteral { + kind: "stringLiteral"; +>kind : "stringLiteral" + + value: string; +>value : string +} + +declare function isStringLiteral(node: unknown): node is StringLiteral; +>isStringLiteral : (node: unknown) => node is StringLiteral +>node : unknown + +const stringExtractor = createExtractor({ +>stringExtractor : Extractor +>createExtractor({ matcher: isStringLiteral, extract: (node) => { return { node, kind: "string" as const, value: node.value, }; },}) : Extractor +>createExtractor : (params: { matcher: (node: unknown) => node is T; extract: (node: T) => Result; }) => Extractor +>{ matcher: isStringLiteral, extract: (node) => { return { node, kind: "string" as const, value: node.value, }; },} : { matcher: (node: unknown) => node is StringLiteral; extract: (node: StringLiteral) => { node: StringLiteral; kind: "string"; value: string; }; } + + matcher: isStringLiteral, +>matcher : (node: unknown) => node is StringLiteral +>isStringLiteral : (node: unknown) => node is StringLiteral + + extract: (node) => { +>extract : (node: StringLiteral) => { node: StringLiteral; kind: "string"; value: string; } +>(node) => { return { node, kind: "string" as const, value: node.value, }; } : (node: StringLiteral) => { node: StringLiteral; kind: "string"; value: string; } +>node : StringLiteral + + return { +>{ node, kind: "string" as const, value: node.value, } : { node: StringLiteral; kind: "string"; value: string; } + + node, +>node : StringLiteral + + kind: "string" as const, +>kind : "string" +>"string" as const : "string" +>"string" : "string" + + value: node.value, +>value : string +>node.value : string +>node : StringLiteral +>value : string + + }; + }, +}); + +declare function unionType(parsers: { +>unionType : (parsers: { [K in keyof Result]: AnyExtractor; }) => AnyExtractor +>parsers : { [K in keyof Result]: AnyExtractor; } + + [K in keyof Result]: AnyExtractor; +}): AnyExtractor; + +const myUnion = unionType([identifierExtractor, stringExtractor]); +>myUnion : AnyExtractor<{ node: Identifier; kind: "identifier"; value: string; } | { node: StringLiteral; kind: "string"; value: string; }> +>unionType([identifierExtractor, stringExtractor]) : AnyExtractor<{ node: Identifier; kind: "identifier"; value: string; } | { node: StringLiteral; kind: "string"; value: string; }> +>unionType : (parsers: { [K in keyof Result]: AnyExtractor; }) => AnyExtractor +>[identifierExtractor, stringExtractor] : (Extractor | Extractor)[] +>identifierExtractor : Extractor +>stringExtractor : Extractor + diff --git a/tests/baselines/reference/signatureHelpRestArgs.baseline b/tests/baselines/reference/signatureHelpRestArgs.baseline new file mode 100644 index 00000000000..9242555b3ad --- /dev/null +++ b/tests/baselines/reference/signatureHelpRestArgs.baseline @@ -0,0 +1,709 @@ +// === SignatureHelp === +=== /tests/cases/fourslash/signatureHelpRestArgs.ts === +// function fn(a: number, b: number, c: number) {} +// const a = [1, 2] as const; +// const b = [1] as const; +// +// fn(...a, ); +// ^ +// | ---------------------------------------------------------------------- +// | fn(a: number, b: number, **c: number**): void +// | ---------------------------------------------------------------------- +// fn(, ...a); +// ^ +// | ---------------------------------------------------------------------- +// | fn(**a: number**, b: number, c: number): void +// | ---------------------------------------------------------------------- +// +// fn(...b, ); +// ^ +// | ---------------------------------------------------------------------- +// | fn(a: number, **b: number**, c: number): void +// | ---------------------------------------------------------------------- +// fn(, ...b, ); +// ^ +// | ---------------------------------------------------------------------- +// | fn(**a: number**, b: number, c: number): void +// | ---------------------------------------------------------------------- +// ^ +// | ---------------------------------------------------------------------- +// | fn(a: number, b: number, **c: number**): void +// | ---------------------------------------------------------------------- + +[ + { + "marker": { + "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts", + "position": 109, + "name": "1" + }, + "item": { + "items": [ + { + "isVariadic": false, + "prefixDisplayParts": [ + { + "text": "fn", + "kind": "functionName" + }, + { + "text": "(", + "kind": "punctuation" + } + ], + "suffixDisplayParts": [ + { + "text": ")", + "kind": "punctuation" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "void", + "kind": "keyword" + } + ], + "separatorDisplayParts": [ + { + "text": ",", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + } + ], + "parameters": [ + { + "name": "a", + "documentation": [], + "displayParts": [ + { + "text": "a", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "b", + "documentation": [], + "displayParts": [ + { + "text": "b", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "c", + "documentation": [], + "displayParts": [ + { + "text": "c", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + } + ], + "documentation": [], + "tags": [] + } + ], + "applicableSpan": { + "start": 103, + "length": 6 + }, + "selectedItemIndex": 0, + "argumentIndex": 2, + "argumentCount": 4 + } + }, + { + "marker": { + "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts", + "position": 115, + "name": "2" + }, + "item": { + "items": [ + { + "isVariadic": false, + "prefixDisplayParts": [ + { + "text": "fn", + "kind": "functionName" + }, + { + "text": "(", + "kind": "punctuation" + } + ], + "suffixDisplayParts": [ + { + "text": ")", + "kind": "punctuation" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "void", + "kind": "keyword" + } + ], + "separatorDisplayParts": [ + { + "text": ",", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + } + ], + "parameters": [ + { + "name": "a", + "documentation": [], + "displayParts": [ + { + "text": "a", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "b", + "documentation": [], + "displayParts": [ + { + "text": "b", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "c", + "documentation": [], + "displayParts": [ + { + "text": "c", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + } + ], + "documentation": [], + "tags": [] + } + ], + "applicableSpan": { + "start": 115, + "length": 6 + }, + "selectedItemIndex": 0, + "argumentIndex": 0, + "argumentCount": 3 + } + }, + { + "marker": { + "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts", + "position": 134, + "name": "3" + }, + "item": { + "items": [ + { + "isVariadic": false, + "prefixDisplayParts": [ + { + "text": "fn", + "kind": "functionName" + }, + { + "text": "(", + "kind": "punctuation" + } + ], + "suffixDisplayParts": [ + { + "text": ")", + "kind": "punctuation" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "void", + "kind": "keyword" + } + ], + "separatorDisplayParts": [ + { + "text": ",", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + } + ], + "parameters": [ + { + "name": "a", + "documentation": [], + "displayParts": [ + { + "text": "a", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "b", + "documentation": [], + "displayParts": [ + { + "text": "b", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "c", + "documentation": [], + "displayParts": [ + { + "text": "c", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + } + ], + "documentation": [], + "tags": [] + } + ], + "applicableSpan": { + "start": 128, + "length": 6 + }, + "selectedItemIndex": 0, + "argumentIndex": 1, + "argumentCount": 3 + } + }, + { + "marker": { + "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts", + "position": 140, + "name": "4" + }, + "item": { + "items": [ + { + "isVariadic": false, + "prefixDisplayParts": [ + { + "text": "fn", + "kind": "functionName" + }, + { + "text": "(", + "kind": "punctuation" + } + ], + "suffixDisplayParts": [ + { + "text": ")", + "kind": "punctuation" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "void", + "kind": "keyword" + } + ], + "separatorDisplayParts": [ + { + "text": ",", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + } + ], + "parameters": [ + { + "name": "a", + "documentation": [], + "displayParts": [ + { + "text": "a", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "b", + "documentation": [], + "displayParts": [ + { + "text": "b", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "c", + "documentation": [], + "displayParts": [ + { + "text": "c", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + } + ], + "documentation": [], + "tags": [] + } + ], + "applicableSpan": { + "start": 140, + "length": 8 + }, + "selectedItemIndex": 0, + "argumentIndex": 0, + "argumentCount": 3 + } + }, + { + "marker": { + "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts", + "position": 148, + "name": "5" + }, + "item": { + "items": [ + { + "isVariadic": false, + "prefixDisplayParts": [ + { + "text": "fn", + "kind": "functionName" + }, + { + "text": "(", + "kind": "punctuation" + } + ], + "suffixDisplayParts": [ + { + "text": ")", + "kind": "punctuation" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "void", + "kind": "keyword" + } + ], + "separatorDisplayParts": [ + { + "text": ",", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + } + ], + "parameters": [ + { + "name": "a", + "documentation": [], + "displayParts": [ + { + "text": "a", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "b", + "documentation": [], + "displayParts": [ + { + "text": "b", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + }, + { + "name": "c", + "documentation": [], + "displayParts": [ + { + "text": "c", + "kind": "parameterName" + }, + { + "text": ":", + "kind": "punctuation" + }, + { + "text": " ", + "kind": "space" + }, + { + "text": "number", + "kind": "keyword" + } + ], + "isOptional": false, + "isRest": false + } + ], + "documentation": [], + "tags": [] + } + ], + "applicableSpan": { + "start": 140, + "length": 8 + }, + "selectedItemIndex": 0, + "argumentIndex": 2, + "argumentCount": 3 + } + } +] \ No newline at end of file diff --git a/tests/baselines/reference/simpleRecursionWithBaseCase1.errors.txt b/tests/baselines/reference/simpleRecursionWithBaseCase1.errors.txt index 77c1830dc69..8e17226700f 100644 --- a/tests/baselines/reference/simpleRecursionWithBaseCase1.errors.txt +++ b/tests/baselines/reference/simpleRecursionWithBaseCase1.errors.txt @@ -14,7 +14,7 @@ simpleRecursionWithBaseCase1.ts(31,10): error TS7023: 'fn5' implicitly has retur } } const num: number = fn1(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 simpleRecursionWithBaseCase1.ts:1:14: An argument for 'n' was not provided. @@ -22,7 +22,7 @@ simpleRecursionWithBaseCase1.ts(31,10): error TS7023: 'fn5' implicitly has retur return fn2(n); } const nev: never = fn2(); - ~~~~~ + ~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 simpleRecursionWithBaseCase1.ts:10:14: An argument for 'n' was not provided. diff --git a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt index f75ab50d766..bdd5f681c2c 100644 --- a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt +++ b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt @@ -22,7 +22,7 @@ specializedSignatureAsCallbackParameter1.ts(8,1): error TS2769: No overload matc } // both are errors x3(1, (x: string) => 1); - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(a: number, cb: (x: number) => number): any', gave the following error. !!! error TS2769: Argument of type '(x: string) => number' is not assignable to parameter of type '(x: number) => number'. @@ -31,7 +31,7 @@ specializedSignatureAsCallbackParameter1.ts(8,1): error TS2769: No overload matc !!! error TS2769: Overload 2 of 2, '(a: string, cb: (x: number) => number): any', gave the following error. !!! error TS2769: Argument of type 'number' is not assignable to parameter of type 'string'. x3(1, (x: 'hm') => 1); - ~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(a: number, cb: (x: number) => number): any', gave the following error. !!! error TS2769: Argument of type '(x: 'hm') => number' is not assignable to parameter of type '(x: number) => number'. diff --git a/tests/baselines/reference/spreadObjectOrFalsy.js b/tests/baselines/reference/spreadObjectOrFalsy.js index c5ee59ce93a..979b98f14d4 100644 --- a/tests/baselines/reference/spreadObjectOrFalsy.js +++ b/tests/baselines/reference/spreadObjectOrFalsy.js @@ -113,7 +113,7 @@ declare function f5(a: S | T): S | T; declare function f6(a: T): T; declare function g1(a: A): T | (undefined & T); +}>(a: A): T; interface DatafulFoo { data: T; } diff --git a/tests/baselines/reference/spreadObjectOrFalsy.types b/tests/baselines/reference/spreadObjectOrFalsy.types index b984a20079a..3f57c796bdf 100644 --- a/tests/baselines/reference/spreadObjectOrFalsy.types +++ b/tests/baselines/reference/spreadObjectOrFalsy.types @@ -58,19 +58,19 @@ function f6(a: T) { // Repro from #46976 function g1(a: A) { ->g1 : (a: A) => T | (undefined & T) ->z : T | (undefined & T) +>g1 : (a: A) => T +>z : T >a : A const { z } = a; ->z : T | (undefined & T) +>z : T >a : A return { ->{ ...z } : T | (undefined & T) +>{ ...z } : T ...z ->z : T | (undefined & T) +>z : T }; } @@ -100,9 +100,9 @@ class Foo { this.data.toLocaleLowerCase(); >this.data.toLocaleLowerCase() : string >this.data.toLocaleLowerCase : (locales?: string | string[] | undefined) => string ->this.data : T | (undefined & T) +>this.data : T >this : this & DatafulFoo ->data : T | (undefined & T) +>data : T >toLocaleLowerCase : (locales?: string | string[] | undefined) => string } } diff --git a/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt b/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt index 1b670ba7a9f..97847882fb3 100644 --- a/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt +++ b/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt @@ -10,6 +10,6 @@ spreadOfParamsFromGeneratorMakesRequiredParams.ts(6,1): error TS2554: Expected 2 ): any; call(function* (a: 'a') { }); // error, 2nd argument required - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6236 spreadOfParamsFromGeneratorMakesRequiredParams.ts:3:5: Arguments for the rest parameter 'args' were not provided. \ No newline at end of file diff --git a/tests/baselines/reference/strictBindCallApply1.errors.txt b/tests/baselines/reference/strictBindCallApply1.errors.txt index 997fb49dac8..a722def945f 100644 --- a/tests/baselines/reference/strictBindCallApply1.errors.txt +++ b/tests/baselines/reference/strictBindCallApply1.errors.txt @@ -32,7 +32,7 @@ strictBindCallApply1.ts(70,12): error TS2345: Argument of type '[number]' is not strictBindCallApply1.ts(71,17): error TS2322: Type 'number' is not assignable to type 'string'. strictBindCallApply1.ts(72,12): error TS2345: Argument of type '[number, string, number]' is not assignable to parameter of type '[a: number, b: string]'. Source has 3 element(s) but target allows only 2. -strictBindCallApply1.ts(76,5): error TS2769: No overload matches this call. +strictBindCallApply1.ts(76,14): error TS2769: No overload matches this call. Overload 1 of 2, '(this: (this: 1, ...args: T) => void, thisArg: 1): (...args: T) => void', gave the following error. Argument of type '2' is not assignable to parameter of type '1'. Overload 2 of 2, '(this: (this: 1, ...args: unknown[]) => void, thisArg: 1): (...args: unknown[]) => void', gave the following error. @@ -40,7 +40,7 @@ strictBindCallApply1.ts(76,5): error TS2769: No overload matches this call. Types of parameters 'args' and 'args' are incompatible. Type 'unknown[]' is not assignable to type 'T'. 'unknown[]' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'unknown[]'. -strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. +strictBindCallApply1.ts(81,14): error TS2769: No overload matches this call. Overload 1 of 2, '(this: (this: 1, ...args: T extends 1 ? [unknown] : [unknown, unknown]) => void, thisArg: 1): (...args: T extends 1 ? [unknown] : [unknown, unknown]) => void', gave the following error. Argument of type '2' is not assignable to parameter of type '1'. Overload 2 of 2, '(this: (this: 1, args_0: unknown) => void, thisArg: 1): (args_0: unknown) => void', gave the following error. @@ -69,7 +69,7 @@ strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. let c00 = foo.call(undefined, 10, "hello"); let c01 = foo.call(undefined, 10); // Error - ~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 2. let c02 = foo.call(undefined, 10, 20); // Error ~~ @@ -122,7 +122,7 @@ strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. let c10 = c.foo.call(c, 10, "hello"); let c11 = c.foo.call(c, 10); // Error - ~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 2. let c12 = c.foo.call(c, 10, 20); // Error ~~ @@ -159,7 +159,7 @@ strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. C.call(c, 10, "hello"); C.call(c, 10); // Error - ~~~~~~~~~~~ + ~~~~ !!! error TS2554: Expected 3 arguments, but got 2. C.call(c, 10, 20); // Error ~~ @@ -184,7 +184,7 @@ strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. function bar(callback: (this: 1, ...args: T) => void) { callback.bind(1); callback.bind(2); // Error - ~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(this: (this: 1, ...args: T) => void, thisArg: 1): (...args: T) => void', gave the following error. !!! error TS2769: Argument of type '2' is not assignable to parameter of type '1'. @@ -198,7 +198,7 @@ strictBindCallApply1.ts(81,5): error TS2769: No overload matches this call. function baz(callback: (this: 1, ...args: T extends 1 ? [unknown] : [unknown, unknown]) => void) { callback.bind(1); callback.bind(2); // Error - ~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(this: (this: 1, ...args: T extends 1 ? [unknown] : [unknown, unknown]) => void, thisArg: 1): (...args: T extends 1 ? [unknown] : [unknown, unknown]) => void', gave the following error. !!! error TS2769: Argument of type '2' is not assignable to parameter of type '1'. diff --git a/tests/baselines/reference/stringMatchAll.types b/tests/baselines/reference/stringMatchAll.types index 59c112f5016..9386da13c84 100644 --- a/tests/baselines/reference/stringMatchAll.types +++ b/tests/baselines/reference/stringMatchAll.types @@ -2,23 +2,23 @@ === stringMatchAll.ts === const matches = "matchAll".matchAll(/\w/g); ->matches : IterableIterator ->"matchAll".matchAll(/\w/g) : IterableIterator ->"matchAll".matchAll : (regexp: RegExp) => IterableIterator +>matches : IterableIterator +>"matchAll".matchAll(/\w/g) : IterableIterator +>"matchAll".matchAll : (regexp: RegExp) => IterableIterator >"matchAll" : "matchAll" ->matchAll : (regexp: RegExp) => IterableIterator +>matchAll : (regexp: RegExp) => IterableIterator >/\w/g : RegExp const array = [...matches]; ->array : RegExpMatchArray[] ->[...matches] : RegExpMatchArray[] ->...matches : RegExpMatchArray ->matches : IterableIterator +>array : RegExpExecArray[] +>[...matches] : RegExpExecArray[] +>...matches : RegExpExecArray +>matches : IterableIterator const { index, input } = array[0]; >index : number >input : string ->array[0] : RegExpMatchArray ->array : RegExpMatchArray[] +>array[0] : RegExpExecArray +>array : RegExpExecArray[] >0 : 0 diff --git a/tests/baselines/reference/templateLiteralTypes3.errors.txt b/tests/baselines/reference/templateLiteralTypes3.errors.txt index ffb22d7ceac..416910fe59a 100644 --- a/tests/baselines/reference/templateLiteralTypes3.errors.txt +++ b/tests/baselines/reference/templateLiteralTypes3.errors.txt @@ -221,4 +221,12 @@ templateLiteralTypes3.ts(141,9): error TS2367: This comparison appears to be uni // Repro from #52685 type Boom = 'abc' | 'def' | `a${string}` | Lowercase; + + // Repro from #56582 + + function a() { + let x: keyof T & string | `-${keyof T & string}`; + x = "id"; + x = "-id"; + } \ No newline at end of file diff --git a/tests/baselines/reference/templateLiteralTypes3.js b/tests/baselines/reference/templateLiteralTypes3.js index 83e6f2b0d05..8b79c69810e 100644 --- a/tests/baselines/reference/templateLiteralTypes3.js +++ b/tests/baselines/reference/templateLiteralTypes3.js @@ -195,6 +195,14 @@ function ft1(t: T, u: Uppercase, u1: Uppercase<`1.${T}.3`>, // Repro from #52685 type Boom = 'abc' | 'def' | `a${string}` | Lowercase; + +// Repro from #56582 + +function a() { + let x: keyof T & string | `-${keyof T & string}`; + x = "id"; + x = "-id"; +} //// [templateLiteralTypes3.js] @@ -291,6 +299,12 @@ function ft1(t, u, u1, u2) { spread("1.".concat(u, ".3"), "1.".concat(u, ".4")); spread(u1, u2); } +// Repro from #56582 +function a() { + var x; + x = "id"; + x = "-id"; +} //// [templateLiteralTypes3.d.ts] @@ -363,3 +377,6 @@ declare function noSpread

(args: P[]): P; declare function spread

(...args: P[]): P; declare function ft1(t: T, u: Uppercase, u1: Uppercase<`1.${T}.3`>, u2: Uppercase<`1.${T}.4`>): void; type Boom = 'abc' | 'def' | `a${string}` | Lowercase; +declare function a(): void; diff --git a/tests/baselines/reference/templateLiteralTypes3.symbols b/tests/baselines/reference/templateLiteralTypes3.symbols index 1259e9f56b0..bead567c4a8 100644 --- a/tests/baselines/reference/templateLiteralTypes3.symbols +++ b/tests/baselines/reference/templateLiteralTypes3.symbols @@ -588,3 +588,22 @@ type Boom = 'abc' | 'def' | `a${string}` | Lowercase; >Boom : Symbol(Boom, Decl(templateLiteralTypes3.ts, 189, 1)) >Lowercase : Symbol(Lowercase, Decl(lib.es5.d.ts, --, --)) +// Repro from #56582 + +function a() { +>a : Symbol(a, Decl(templateLiteralTypes3.ts, 193, 61)) +>T : Symbol(T, Decl(templateLiteralTypes3.ts, 197, 11)) +>id : Symbol(id, Decl(templateLiteralTypes3.ts, 197, 22)) + + let x: keyof T & string | `-${keyof T & string}`; +>x : Symbol(x, Decl(templateLiteralTypes3.ts, 198, 7)) +>T : Symbol(T, Decl(templateLiteralTypes3.ts, 197, 11)) +>T : Symbol(T, Decl(templateLiteralTypes3.ts, 197, 11)) + + x = "id"; +>x : Symbol(x, Decl(templateLiteralTypes3.ts, 198, 7)) + + x = "-id"; +>x : Symbol(x, Decl(templateLiteralTypes3.ts, 198, 7)) +} + diff --git a/tests/baselines/reference/templateLiteralTypes3.types b/tests/baselines/reference/templateLiteralTypes3.types index 67115bf715a..a37862c886c 100644 --- a/tests/baselines/reference/templateLiteralTypes3.types +++ b/tests/baselines/reference/templateLiteralTypes3.types @@ -601,3 +601,23 @@ function ft1(t: T, u: Uppercase, u1: Uppercase<`1.${T}.3`>, type Boom = 'abc' | 'def' | `a${string}` | Lowercase; >Boom : `a${string}` | Lowercase | "def" +// Repro from #56582 + +function a() { +>a : () => void +>id : string + + let x: keyof T & string | `-${keyof T & string}`; +>x : (keyof T & string) | `-${keyof T & string}` + + x = "id"; +>x = "id" : "id" +>x : (keyof T & string) | `-${keyof T & string}` +>"id" : "id" + + x = "-id"; +>x = "-id" : "-id" +>x : (keyof T & string) | `-${keyof T & string}` +>"-id" : "-id" +} + diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt b/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt index cd82afc8398..3ead220eb04 100644 --- a/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt +++ b/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt @@ -55,7 +55,7 @@ templateLiteralTypesPatterns.ts(129,9): error TS2345: Argument of type '"1.1e-10 templateLiteralTypesPatterns.ts(140,1): error TS2322: Type '`a${string}`' is not assignable to type '`a${number}`'. templateLiteralTypesPatterns.ts(141,1): error TS2322: Type '"bno"' is not assignable to type '`a${any}`'. templateLiteralTypesPatterns.ts(160,7): error TS2322: Type '"anything"' is not assignable to type '`${number} ${number}`'. -templateLiteralTypesPatterns.ts(211,5): error TS2345: Argument of type '"abcTest"' is not assignable to parameter of type '`${`a${string}` & `${string}a`}Test`'. +templateLiteralTypesPatterns.ts(215,5): error TS2345: Argument of type '"abcTest"' is not assignable to parameter of type '`${`a${string}` & `${string}a`}Test`'. ==== templateLiteralTypesPatterns.ts (58 errors) ==== @@ -376,10 +376,14 @@ templateLiteralTypesPatterns.ts(211,5): error TS2345: Argument of type '"abcTest } // repro from https://github.com/microsoft/TypeScript/issues/54177#issuecomment-1538436654 - function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} + function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} conversionTest("testDowncast"); - function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} + function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {} conversionTest2("testDowncast"); + function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} + conversionTest3("testDowncast"); + function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} + conversionTest4("testDowncast"); function foo(str: `${`a${string}` & `${string}a`}Test`) {} foo("abaTest"); // ok diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.js b/tests/baselines/reference/templateLiteralTypesPatterns.js index d66c794e287..8741dda63c2 100644 --- a/tests/baselines/reference/templateLiteralTypesPatterns.js +++ b/tests/baselines/reference/templateLiteralTypesPatterns.js @@ -204,10 +204,14 @@ export abstract class BB { } // repro from https://github.com/microsoft/TypeScript/issues/54177#issuecomment-1538436654 -function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} conversionTest("testDowncast"); -function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {} conversionTest2("testDowncast"); +function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +conversionTest3("testDowncast"); +function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +conversionTest4("testDowncast"); function foo(str: `${`a${string}` & `${string}a`}Test`) {} foo("abaTest"); // ok @@ -367,6 +371,10 @@ function conversionTest(groupName) { } conversionTest("testDowncast"); function conversionTest2(groupName) { } conversionTest2("testDowncast"); +function conversionTest3(groupName) { } +conversionTest3("testDowncast"); +function conversionTest4(groupName) { } +conversionTest4("testDowncast"); function foo(str) { } foo("abaTest"); // ok foo("abcTest"); // error diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.symbols b/tests/baselines/reference/templateLiteralTypesPatterns.symbols index cc508d26809..67158ff6db1 100644 --- a/tests/baselines/reference/templateLiteralTypesPatterns.symbols +++ b/tests/baselines/reference/templateLiteralTypesPatterns.symbols @@ -488,27 +488,41 @@ export abstract class BB { } // repro from https://github.com/microsoft/TypeScript/issues/54177#issuecomment-1538436654 -function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} >conversionTest : Symbol(conversionTest, Decl(templateLiteralTypesPatterns.ts, 200, 1)) >groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 203, 24)) conversionTest("testDowncast"); >conversionTest : Symbol(conversionTest, Decl(templateLiteralTypesPatterns.ts, 200, 1)) -function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {} >conversionTest2 : Symbol(conversionTest2, Decl(templateLiteralTypesPatterns.ts, 204, 31)) >groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 205, 25)) conversionTest2("testDowncast"); >conversionTest2 : Symbol(conversionTest2, Decl(templateLiteralTypesPatterns.ts, 204, 31)) +function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +>conversionTest3 : Symbol(conversionTest3, Decl(templateLiteralTypesPatterns.ts, 206, 32)) +>groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 207, 25)) + +conversionTest3("testDowncast"); +>conversionTest3 : Symbol(conversionTest3, Decl(templateLiteralTypesPatterns.ts, 206, 32)) + +function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +>conversionTest4 : Symbol(conversionTest4, Decl(templateLiteralTypesPatterns.ts, 208, 32)) +>groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 209, 25)) + +conversionTest4("testDowncast"); +>conversionTest4 : Symbol(conversionTest4, Decl(templateLiteralTypesPatterns.ts, 208, 32)) + function foo(str: `${`a${string}` & `${string}a`}Test`) {} ->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32)) ->str : Symbol(str, Decl(templateLiteralTypesPatterns.ts, 208, 13)) +>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32)) +>str : Symbol(str, Decl(templateLiteralTypesPatterns.ts, 212, 13)) foo("abaTest"); // ok ->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32)) +>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32)) foo("abcTest"); // error ->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32)) +>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32)) diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.types b/tests/baselines/reference/templateLiteralTypesPatterns.types index d9fbfeec9d8..d63799df570 100644 --- a/tests/baselines/reference/templateLiteralTypesPatterns.types +++ b/tests/baselines/reference/templateLiteralTypesPatterns.types @@ -636,22 +636,40 @@ export abstract class BB { } // repro from https://github.com/microsoft/TypeScript/issues/54177#issuecomment-1538436654 -function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} ->conversionTest : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) => void ->groupName : `${string & {}}Downcast` | "downcast" | "dataDowncast" | "editingDowncast" +function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} +>conversionTest : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) => void +>groupName : (`${string}Downcast` & {}) | "downcast" | "dataDowncast" | "editingDowncast" conversionTest("testDowncast"); >conversionTest("testDowncast") : void ->conversionTest : (groupName: `${string & {}}Downcast` | "downcast" | "dataDowncast" | "editingDowncast") => void +>conversionTest : (groupName: (`${string}Downcast` & {}) | "downcast" | "dataDowncast" | "editingDowncast") => void >"testDowncast" : "testDowncast" -function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} ->conversionTest2 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) => void ->groupName : "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast` +function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {} +>conversionTest2 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) => void +>groupName : "downcast" | "dataDowncast" | "editingDowncast" | ({} & `${string}Downcast`) conversionTest2("testDowncast"); >conversionTest2("testDowncast") : void ->conversionTest2 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) => void +>conversionTest2 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | ({} & `${string}Downcast`)) => void +>"testDowncast" : "testDowncast" + +function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +>conversionTest3 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) => void +>groupName : "downcast" | `${string & {}}Downcast` + +conversionTest3("testDowncast"); +>conversionTest3("testDowncast") : void +>conversionTest3 : (groupName: "downcast" | `${string & {}}Downcast`) => void +>"testDowncast" : "testDowncast" + +function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +>conversionTest4 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) => void +>groupName : "downcast" | `${{} & string}Downcast` + +conversionTest4("testDowncast"); +>conversionTest4("testDowncast") : void +>conversionTest4 : (groupName: "downcast" | `${{} & string}Downcast`) => void >"testDowncast" : "testDowncast" function foo(str: `${`a${string}` & `${string}a`}Test`) {} diff --git a/tests/baselines/reference/templateLiteralsInTypes.errors.txt b/tests/baselines/reference/templateLiteralsInTypes.errors.txt index d13bc602b90..21029f7843f 100644 --- a/tests/baselines/reference/templateLiteralsInTypes.errors.txt +++ b/tests/baselines/reference/templateLiteralsInTypes.errors.txt @@ -6,7 +6,7 @@ templateLiteralsInTypes.ts(3,8): error TS2339: Property 'foo' does not exist on const f = (hdr: string, val: number) => `${hdr}:\t${val}\r\n` as `${string}:\t${number}\r\n`; f("x").foo; - ~~~~~~ + ~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 templateLiteralsInTypes.ts:1:25: An argument for 'val' was not provided. ~~~ diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt index 1356e69cfeb..6362a162253 100644 --- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt +++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt @@ -174,7 +174,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h !!! error TS2353: Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'. ok.f(); // not enough arguments - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 thisTypeInFunctionsNegative.ts:61:46: An argument for 'x' was not provided. ok.f('wrong type'); @@ -196,7 +196,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h let c = new C(); c.explicitC(); // not enough arguments - ~~~~~~~~~~~ + ~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 thisTypeInFunctionsNegative.ts:9:24: An argument for 'm' was not provided. c.explicitC('wrong type'); @@ -206,7 +206,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h ~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 2. c.explicitThis(); // not enough arguments - ~~~~~~~~~~~~~~ + ~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 thisTypeInFunctionsNegative.ts:3:30: An argument for 'm' was not provided. c.explicitThis('wrong type 2'); @@ -216,7 +216,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h ~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 2. c.implicitThis(); // not enough arguments - ~~~~~~~~~~~~~~ + ~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 thisTypeInFunctionsNegative.ts:6:18: An argument for 'm' was not provided. c.implicitThis('wrong type 2'); @@ -226,7 +226,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h ~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 2. c.explicitProperty(); // not enough arguments - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 thisTypeInFunctionsNegative.ts:12:41: An argument for 'm' was not provided. c.explicitProperty('wrong type 3'); diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js index 6d339fb9116..8a8101d75ea 100644 --- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js +++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js @@ -148,17 +148,17 @@ Output:: FsWatches:: -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js index 0b18959b668..0183c236dab 100644 --- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js +++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js @@ -65,17 +65,17 @@ Output:: FsWatches:: -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js index 231d8ea4a7a..f2b82478f96 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js @@ -437,7 +437,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js index 8deb1d39733..4064bd50284 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js @@ -454,7 +454,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js index 10105c0d29d..8daaf139487 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js @@ -142,9 +142,9 @@ export declare class myClass { FsWatches:: -/user/username/projects/solution/app/filewitherror.ts: *new* +/user/username/projects/solution/app/fileWithError.ts: *new* {} -/user/username/projects/solution/app/filewithouterror.ts: *new* +/user/username/projects/solution/app/fileWithoutError.ts: *new* {} /user/username/projects/solution/app/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js index 400c4f0fdb8..4396b2d9f7c 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js @@ -142,9 +142,9 @@ export declare class myClass { FsWatches:: -/user/username/projects/solution/app/filewitherror.ts: *new* +/user/username/projects/solution/app/fileWithError.ts: *new* {} -/user/username/projects/solution/app/filewithouterror.ts: *new* +/user/username/projects/solution/app/fileWithoutError.ts: *new* {} /user/username/projects/solution/app/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js index ee93ce9e0bc..c775784f261 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js @@ -119,9 +119,9 @@ Output:: FsWatches:: -/user/username/projects/solution/app/filewitherror.ts: *new* +/user/username/projects/solution/app/fileWithError.ts: *new* {} -/user/username/projects/solution/app/filewithouterror.ts: *new* +/user/username/projects/solution/app/fileWithoutError.ts: *new* {} /user/username/projects/solution/app/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js index f758e61e3c4..87cf3b60afa 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js @@ -119,9 +119,9 @@ Output:: FsWatches:: -/user/username/projects/solution/app/filewitherror.ts: *new* +/user/username/projects/solution/app/fileWithError.ts: *new* {} -/user/username/projects/solution/app/filewithouterror.ts: *new* +/user/username/projects/solution/app/fileWithoutError.ts: *new* {} /user/username/projects/solution/app/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js index 774b3d80f25..d449e8280af 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js @@ -437,7 +437,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js index b23580ee9a0..44dc8881c84 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js @@ -436,7 +436,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js index 54cc3a0e5fe..d0ce02cd974 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js @@ -216,7 +216,7 @@ export declare function multiply(a: number, b: number): number; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} @@ -397,7 +397,7 @@ export declare const y = 10; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/file3.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js index 68176809a6e..ce572d8da22 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js @@ -226,7 +226,7 @@ export declare function multiply(a: number, b: number): number; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} @@ -414,7 +414,7 @@ export declare const y = 10; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/file3.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js index 21154c20c10..b71217d9ae3 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js @@ -324,7 +324,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js index 420982e7439..b48539eb61e 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js @@ -209,7 +209,7 @@ PolledWatches:: {"pollingInterval":2000} FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} @@ -289,7 +289,7 @@ PolledWatches *deleted*:: {"pollingInterval":2000} FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/index.ts: {} @@ -428,7 +428,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/index.ts: {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js index fa583defd87..cbf8812e110 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js @@ -136,19 +136,19 @@ var library_1 = require("../Library/library"); FsWatches:: -/user/username/projects/sample1/app/app.ts: *new* +/user/username/projects/sample1/App/app.ts: *new* {} -/user/username/projects/sample1/app/tsconfig.json: *new* +/user/username/projects/sample1/App/tsconfig.json: *new* {} -/user/username/projects/sample1/library/library.ts: *new* +/user/username/projects/sample1/Library/library.ts: *new* {} -/user/username/projects/sample1/library/tsconfig.json: *new* +/user/username/projects/sample1/Library/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/sample1/app: *new* +/user/username/projects/sample1/App: *new* {} -/user/username/projects/sample1/library: *new* +/user/username/projects/sample1/Library: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js index 974a9d6e0b3..ef49267e494 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js @@ -433,7 +433,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} @@ -675,7 +675,7 @@ export declare const newFileConst = 30; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/index.ts: {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js index 0a5e72a8631..1ce191e18bb 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js @@ -433,7 +433,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js index 7d0652bdf12..31d5baed76a 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js @@ -433,7 +433,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js index 769f7b89f32..47c4a0dd7ff 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js @@ -437,7 +437,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} @@ -686,7 +686,7 @@ export declare const newFileConst = 30; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: +/user/username/projects/sample1/core/anotherModule.ts: {} /user/username/projects/sample1/core/index.ts: {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js index 311149c8efe..4bf5aafe68e 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js @@ -437,7 +437,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js index 16a6d3add79..37e5e01b361 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js @@ -437,7 +437,7 @@ export declare const m: typeof mod; FsWatches:: -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js index 7c8e55c52bf..b78178060f0 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js @@ -250,9 +250,9 @@ FsWatches:: {} /a/b/bravo.tsconfig.json: *new* {} -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/other.ts: *new* {} @@ -346,9 +346,9 @@ Output:: FsWatches:: /a/b/alpha.tsconfig.json: {} -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} /a/b/project1.tsconfig.json: {} diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js index 5babf1f649c..d9402e71a98 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js @@ -273,15 +273,15 @@ FsWatches:: {} /a/b/bravo.tsconfig.json: *new* {} -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} -/a/b/extendsconfig1.tsconfig.json: *new* +/a/b/extendsConfig1.tsconfig.json: *new* {} -/a/b/extendsconfig2.tsconfig.json: *new* +/a/b/extendsConfig2.tsconfig.json: *new* {} -/a/b/extendsconfig3.tsconfig.json: *new* +/a/b/extendsConfig3.tsconfig.json: *new* {} /a/b/other.ts: *new* {} @@ -757,15 +757,15 @@ var k = 0; FsWatches:: /a/b/alpha.tsconfig.json: {} -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} -/a/b/extendsconfig1.tsconfig.json: +/a/b/extendsConfig1.tsconfig.json: {} -/a/b/extendsconfig2.tsconfig.json: +/a/b/extendsConfig2.tsconfig.json: {} -/a/b/extendsconfig3.tsconfig.json: +/a/b/extendsConfig3.tsconfig.json: {} /a/b/other.ts: {} @@ -1110,13 +1110,13 @@ Output:: FsWatches:: /a/b/alpha.tsconfig.json: {} -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} -/a/b/extendsconfig1.tsconfig.json: +/a/b/extendsConfig1.tsconfig.json: {} -/a/b/extendsconfig2.tsconfig.json: +/a/b/extendsConfig2.tsconfig.json: {} /a/b/other.ts: {} @@ -1130,7 +1130,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/extendsconfig3.tsconfig.json: +/a/b/extendsConfig3.tsconfig.json: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsc/runWithoutArgs/does-not-add-color-when-NO_COLOR-is-set.js b/tests/baselines/reference/tsc/runWithoutArgs/does-not-add-color-when-NO_COLOR-is-set.js index 7d809130885..144118fae91 100644 --- a/tests/baselines/reference/tsc/runWithoutArgs/does-not-add-color-when-NO_COLOR-is-set.js +++ b/tests/baselines/reference/tsc/runWithoutArgs/does-not-add-color-when-NO_COLOR-is-set.js @@ -111,7 +111,7 @@ default: undefined --lib Specify a set of bundled library declaration files that describe the target runtime environment. -one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise/esnext.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.decorators, decorators, decorators.legacy +one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.promise, esnext.decorators, decorators, decorators.legacy default: undefined --allowJs diff --git a/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js b/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js index c4fcbab8f12..4f6bbee5e0a 100644 --- a/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js +++ b/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js @@ -111,7 +111,7 @@ default: undefined --lib Specify a set of bundled library declaration files that describe the target runtime environment. -one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise/esnext.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.decorators, decorators, decorators.legacy +one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.promise, esnext.decorators, decorators, decorators.legacy default: undefined --allowJs diff --git a/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js b/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js index c4fcbab8f12..4f6bbee5e0a 100644 --- a/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js +++ b/tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js @@ -111,7 +111,7 @@ default: undefined --lib Specify a set of bundled library declaration files that describe the target runtime environment. -one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise/esnext.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.decorators, decorators, decorators.legacy +one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.sharedmemory, es2022.string/esnext.string, es2022.regexp, es2023.array/esnext.array, es2023.collection/esnext.collection, esnext.intl, esnext.disposable, esnext.promise, esnext.decorators, decorators, decorators.legacy default: undefined --allowJs diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js index 964af9126af..68bd4415160 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js @@ -79,15 +79,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js index b4d10955c89..00cf09bc229 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js @@ -96,15 +96,15 @@ System.register("moduleFile2", [], function (exports_4, context_4) { FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js index 84e1d4dbcf6..f03b07b8057 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js @@ -75,15 +75,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -168,13 +168,13 @@ exports.Foo = Foo; //// [/a/b/file1Consumer1.js] file written with same contents FsWatches:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile1.ts: +/a/b/moduleFile1.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} @@ -182,7 +182,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js index 411d683b363..c7906ec124b 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js @@ -75,15 +75,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -178,17 +178,17 @@ var y = (0, moduleFile1_1.Foo)(); FsWatches:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} -/a/b/file1consumer3.ts: *new* +/a/b/file1Consumer3.ts: *new* {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile1.ts: +/a/b/moduleFile1.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js index d967fd8c325..b2142981740 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js @@ -75,15 +75,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js index b2ab6370142..5f75aa57778 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js @@ -75,15 +75,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js index 0d929285ffb..6c325666bdf 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js @@ -63,9 +63,9 @@ exports.y = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js index 1a1e01b9027..be061427f02 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js @@ -50,11 +50,11 @@ exports.x = Foo(); PolledWatches:: -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {"pollingInterval":500} FsWatches:: -/a/b/referencefile1.ts: *new* +/a/b/referenceFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -166,11 +166,11 @@ export var Foo4 = 10; PolledWatches *deleted*:: -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {"pollingInterval":500} FsWatches:: -/a/b/referencefile1.ts: +/a/b/referenceFile1.ts: {} /a/b/tsconfig.json: {} @@ -216,9 +216,9 @@ exports.Foo4 = 10; FsWatches:: -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} -/a/b/referencefile1.ts: +/a/b/referenceFile1.ts: {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js index 92fda2fe9fb..d3952dd7491 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js @@ -57,9 +57,9 @@ exports.x = Foo(); FsWatches:: -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/referencefile1.ts: *new* +/a/b/referenceFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -130,11 +130,11 @@ Output:: //// [/a/b/referenceFile1.js] file written with same contents PolledWatches:: -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {"pollingInterval":500} FsWatches:: -/a/b/referencefile1.ts: +/a/b/referenceFile1.ts: {} /a/b/tsconfig.json: {} @@ -142,7 +142,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/modulefile1.ts: +/a/b/moduleFile1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js index a06a0acf004..e8e03ebd937 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js @@ -75,15 +75,15 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js index 297dab2afb7..8e1fb29a3bd 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js +++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js @@ -83,17 +83,17 @@ exports.Foo4 = 10; FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer1consumer1.ts: *new* +/a/b/file1Consumer1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js index 125e491c453..ec43336bed4 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js +++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js @@ -78,7 +78,7 @@ PolledWatches:: FsWatches:: /a/b/dependencies/file2.d.ts: *new* {} -/a/b/output/anotherdependency/file1.d.ts: *new* +/a/b/output/AnotherDependency/file1.d.ts: *new* {} /a/b/project/src/main.ts: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js index a353ab91a0c..1527769223a 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js +++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js @@ -81,7 +81,7 @@ PolledWatches:: FsWatches:: /a/b/dependencies/file2.d.ts: *new* {} -/a/b/output/anotherdependency/file1.d.ts: *new* +/a/b/output/AnotherDependency/file1.d.ts: *new* {} /a/b/project/src/main.ts: *new* {} diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js index 020a817327b..28773029f85 100644 --- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js +++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js @@ -51,21 +51,21 @@ var z = 10; PolledWatches:: -/a/rootfolder/project/node_modules/@types: *new* +/a/rootFolder/project/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/a/rootfolder/project/scripts/javascript.js: *new* +/a/rootFolder/project/Scripts/Javascript.js: *new* {} -/a/rootfolder/project/scripts/typescript.ts: *new* +/a/rootFolder/project/Scripts/TypeScript.ts: *new* {} -/a/rootfolder/project/tsconfig.json: *new* +/a/rootFolder/project/tsconfig.json: *new* {} FsWatchesRecursive:: -/a/rootfolder/project/scripts: *new* +/a/rootFolder/project/Scripts: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js index 2deaf804ed3..b83e758d17c 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js @@ -151,25 +151,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js index 4b2b066d75b..458dd1f1a32 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js index 3415f91e185..3fe0ba62231 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js @@ -152,25 +152,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js index d3d151cbbe5..e9bf6d12006 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js index d5d350d6c0e..419655701fd 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js @@ -150,25 +150,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js index 2f5f956a569..21592fc23bf 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js index 6294aff9f65..bcecb094764 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js @@ -151,25 +151,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js index 86c5cfca75f..1e150b6d710 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js index 7ab5672b6a2..0c8fddf759e 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js @@ -150,25 +150,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js index d62dbbb7631..9a1f5f81bbe 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js index 493038b79f9..4c478973f56 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js @@ -151,25 +151,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js index eaa0c3f4d7b..793ee02cf20 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js @@ -58,25 +58,25 @@ Output:: PolledWatches:: -/user/username/projects/node_modules/@types: *new* +/user/username/projects/noEmitOnError/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/noemitonerror/node_modules/@types: *new* +/user/username/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/noemitonerror/shared/types/db.ts: *new* +/user/username/projects/noEmitOnError/shared/types/db.ts: *new* {} -/user/username/projects/noemitonerror/src/main.ts: *new* +/user/username/projects/noEmitOnError/src/main.ts: *new* {} -/user/username/projects/noemitonerror/src/other.ts: *new* +/user/username/projects/noEmitOnError/src/other.ts: *new* {} -/user/username/projects/noemitonerror/tsconfig.json: *new* +/user/username/projects/noEmitOnError/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/noemitonerror: *new* +/user/username/projects/noEmitOnError: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js index 892740bca28..d08d6a94a36 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js @@ -97,7 +97,7 @@ FsWatches:: {} /user/username/projects/myproject/index.tsx: *new* {} -/user/username/projects/myproject/node_modules/react/jsx-runtime/index.d.ts: *new* +/user/username/projects/myproject/node_modules/react/Jsx-Runtime/index.d.ts: *new* {} /user/username/projects/myproject/node_modules/react/package.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/package-json-is-looked-up-for-file.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/package-json-is-looked-up-for-file.js index 1db4dfeedbb..3705f2f9604 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/package-json-is-looked-up-for-file.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/package-json-is-looked-up-for-file.js @@ -84,31 +84,31 @@ export {}; PolledWatches:: -/users/name/projects/lib-boilerplate/node_modules/@types: *new* +/Users/name/projects/lib-boilerplate/node_modules/@types: *new* {"pollingInterval":500} -/users/name/projects/lib-boilerplate/src/package.json: *new* +/Users/name/projects/lib-boilerplate/src/package.json: *new* {"pollingInterval":2000} -/users/name/projects/lib-boilerplate/test/package.json: *new* +/Users/name/projects/lib-boilerplate/test/package.json: *new* {"pollingInterval":2000} -/users/name/projects/node_modules/@types: *new* +/Users/name/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: +/Users/name/projects/lib-boilerplate/package.json: *new* + {} +/Users/name/projects/lib-boilerplate/src/index.ts: *new* + {} +/Users/name/projects/lib-boilerplate/test/basic.spec.ts: *new* + {} +/Users/name/projects/lib-boilerplate/tsconfig.json: *new* + {} /a/lib/lib.es2021.full.d.ts: *new* {} -/users/name/projects/lib-boilerplate/package.json: *new* - {} -/users/name/projects/lib-boilerplate/src/index.ts: *new* - {} -/users/name/projects/lib-boilerplate/test/basic.spec.ts: *new* - {} -/users/name/projects/lib-boilerplate/tsconfig.json: *new* - {} FsWatchesRecursive:: -/users/name/projects/lib-boilerplate: *new* +/Users/name/projects/lib-boilerplate: *new* {} -/users/name/projects/lib-boilerplate/test: *new* +/Users/name/projects/lib-boilerplate/test: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/self-name-package-reference.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/self-name-package-reference.js index 4febcd255d5..c36a513a551 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/self-name-package-reference.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/self-name-package-reference.js @@ -146,23 +146,23 @@ export declare function thing(): void; PolledWatches:: -/users/name/projects/node_modules/@types: *new* +/Users/name/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/name/projects/web/node_modules/@types: *new* +/Users/name/projects/web/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: +/Users/name/projects/web/index.ts: *new* + {} +/Users/name/projects/web/package.json: *new* + {} +/Users/name/projects/web/tsconfig.json: *new* + {} /a/lib/lib.esnext.full.d.ts: *new* {} -/users/name/projects/web/index.ts: *new* - {} -/users/name/projects/web/package.json: *new* - {} -/users/name/projects/web/tsconfig.json: *new* - {} FsWatchesRecursive:: -/users/name/projects/web: *new* +/Users/name/projects/web: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js index fcf391eb1ac..a852b023bc2 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js @@ -71,21 +71,21 @@ a_2.b; PolledWatches:: -c:/project/node_modules/@types: *new* +C:/project/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: -c:/a/lib/lib.d.ts: *new* +C:/a/lib/lib.d.ts: *new* {} -c:/project/a.ts: *new* +C:/project/a.ts: *new* {} -c:/project/b.ts: *new* +C:/project/b.ts: *new* {} -c:/project/tsconfig.json: *new* +C:/project/tsconfig.json: *new* {} FsWatchesRecursive:: -c:/project: *new* +C:/project: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js index 68568a27e3b..492906d7656 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js @@ -112,14 +112,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY/a.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link/a.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy/a.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js index 9a7392df675..c5b8e96b521 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js @@ -90,14 +90,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js index 3384522bf9c..6fbd7613354 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js @@ -112,14 +112,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY/a.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link/a.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy/a.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js index 5e67dc57fa6..0f3c7282852 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js @@ -90,14 +90,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js index 58156113db9..9e9a72d01e5 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js @@ -110,7 +110,7 @@ System.register("XY/a", [], function (exports_3, context_3) { PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/yx: *new* +/user/username/projects/myproject/yX: *new* {"pollingInterval":500} /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} @@ -118,14 +118,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY/a.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link/a.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy/a.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js index 7051de923d5..94a19d7a0f6 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js @@ -88,7 +88,7 @@ link_1.b; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/yx: *new* +/user/username/projects/myproject/yX: *new* {"pollingInterval":500} /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} @@ -98,14 +98,14 @@ FsWatches:: {} /user/username/projects/myproject: *new* {} +/user/username/projects/myproject/XY.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js index bbc9c7d61a0..8e16059bf38 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js @@ -120,14 +120,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/Xy/a.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link/a.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy/a.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js index cfbc410aa1d..acbae92d610 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js @@ -98,14 +98,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js index a3095d83ee7..7807baa22a3 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js @@ -120,14 +120,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/Xy/a.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link/a.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy/a.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js index 0e9c339c684..25f173f6f28 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js @@ -98,14 +98,14 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} +/user/username/projects/myproject/XY.ts: *new* + {} /user/username/projects/myproject/b.ts: *new* {} /user/username/projects/myproject/link.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} -/user/username/projects/myproject/xy.ts: *new* - {} FsWatchesRecursive:: /user/username/projects/myproject: *new* diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js index 43c3429354c..7d52a608fab 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js @@ -104,11 +104,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/modulea.ts: *new* +/user/username/projects/myproject/ModuleC.ts: *new* {} -/user/username/projects/myproject/moduleb.ts: *new* +/user/username/projects/myproject/moduleA.ts: *new* {} -/user/username/projects/myproject/modulec.ts: *new* +/user/username/projects/myproject/moduleB.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/with-nodeNext-resolution.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/with-nodeNext-resolution.js index 797221771b8..1cdb86479d1 100644 --- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/with-nodeNext-resolution.js +++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/with-nodeNext-resolution.js @@ -110,33 +110,33 @@ Object.defineProperty(exports, "__esModule", { value: true }); PolledWatches:: -/users/name/projects/node_modules/@types: *new* +/Users/name/projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: +/Users/name/projects: *new* + {} +/Users/name/projects/web: *new* + {} +/Users/name/projects/web/node_modules/@types/yargs/index.d.ts: *new* + {} +/Users/name/projects/web/node_modules/@types/yargs/package.json: *new* + {} +/Users/name/projects/web/src/bin.ts: *new* + {} +/Users/name/projects/web/tsconfig.json: *new* + {} /a/lib/lib.d.ts: *new* {} -/users/name/projects: *new* - {} -/users/name/projects/web: *new* - {} -/users/name/projects/web/node_modules/@types/yargs/index.d.ts: *new* - {} -/users/name/projects/web/node_modules/@types/yargs/package.json: *new* - {} -/users/name/projects/web/src/bin.ts: *new* - {} -/users/name/projects/web/tsconfig.json: *new* - {} FsWatchesRecursive:: -/users/name/projects/web: *new* +/Users/name/projects/web: *new* {} -/users/name/projects/web/node_modules: *new* +/Users/name/projects/web/node_modules: *new* {} -/users/name/projects/web/node_modules/@types: *new* +/Users/name/projects/web/node_modules/@types: *new* {} -/users/name/projects/web/src: *new* +/Users/name/projects/web/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js b/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js index 019e2cfe525..d32801e28bc 100644 --- a/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js +++ b/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js @@ -683,7 +683,7 @@ Reusing resolution of module '@typescript/lib-webworker' from '/home/src/project Reusing resolution of module '@typescript/lib-scripthost' from '/home/src/projects/__lib_node_modules_lookup_lib.scripthost.d.ts__.ts' of old program, it was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-scripthost/index.d.ts'. Reusing resolution of module '@typescript/lib-es5' from '/home/src/projects/__lib_node_modules_lookup_lib.es5.d.ts__.ts' of old program, it was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-es5/index.d.ts'. Reusing resolution of module '@typescript/lib-dom' from '/home/src/projects/__lib_node_modules_lookup_lib.dom.d.ts__.ts' of old program, it was not resolved. -FileWatcher:: Added:: WatchInfo: /home/src/projects/project1/core.d.ts 500 undefined Missing file +FileWatcher:: Added:: WatchInfo: project1/core.d.ts 500 undefined Missing file error TS6053: File 'project1/core.d.ts' not found. The file is in the program because: Root file specified for compilation diff --git a/tests/baselines/reference/tscWatch/libraryResolution/without-config.js b/tests/baselines/reference/tscWatch/libraryResolution/without-config.js index 6d99980f935..dfd9070afc3 100644 --- a/tests/baselines/reference/tscWatch/libraryResolution/without-config.js +++ b/tests/baselines/reference/tscWatch/libraryResolution/without-config.js @@ -676,7 +676,7 @@ Reusing resolution of module '@typescript/lib-webworker' from '/home/src/project Reusing resolution of module '@typescript/lib-scripthost' from '/home/src/projects/__lib_node_modules_lookup_lib.scripthost.d.ts__.ts' of old program, it was not resolved. Reusing resolution of module '@typescript/lib-es5' from '/home/src/projects/__lib_node_modules_lookup_lib.es5.d.ts__.ts' of old program, it was not resolved. Reusing resolution of module '@typescript/lib-dom' from '/home/src/projects/__lib_node_modules_lookup_lib.dom.d.ts__.ts' of old program, it was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-dom/index.d.ts'. -FileWatcher:: Added:: WatchInfo: /home/src/projects/project1/core.d.ts 500 undefined Missing file +FileWatcher:: Added:: WatchInfo: project1/core.d.ts 500 undefined Missing file error TS6053: File 'project1/core.d.ts' not found. The file is in the program because: Root file specified for compilation diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js index 5dd08d476d6..f8f64dc2a83 100644 --- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js +++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js @@ -116,7 +116,7 @@ FsWatches:: {} /user/username/projects/myproject/src: *new* {} -/user/username/projects/myproject/src/filea.ts: *new* +/user/username/projects/myproject/src/fileA.ts: *new* {} /user/username/projects/myproject/src/tsconfig.json: *new* {} @@ -248,7 +248,7 @@ const fileB_mjs_1 = require("./fileB.mjs"); PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: *new* +/user/username/projects/myproject/src/fileB.mjs: *new* {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -264,7 +264,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -397,7 +397,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} FsWatches:: @@ -407,7 +407,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -542,7 +542,7 @@ const fileB_mjs_1 = require("./fileB.mjs"); PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: *new* +/user/username/projects/myproject/src/fileB.mjs: *new* {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -560,7 +560,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -669,7 +669,7 @@ src/fileA.ts PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -689,7 +689,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -799,7 +799,7 @@ src/fileA.ts PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -817,7 +817,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js index a40760ffb00..0313b55f99c 100644 --- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js +++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js @@ -110,7 +110,7 @@ const fileB_mjs_1 = require("./fileB.mjs"); PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: *new* +/user/username/projects/myproject/src/fileB.mjs: *new* {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: *new* {"pollingInterval":500} @@ -126,7 +126,7 @@ FsWatches:: {} /user/username/projects/myproject/src: *new* {} -/user/username/projects/myproject/src/filea.ts: *new* +/user/username/projects/myproject/src/fileA.ts: *new* {} /user/username/projects/myproject/src/tsconfig.json: *new* {} @@ -260,7 +260,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} FsWatches:: @@ -270,7 +270,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -401,7 +401,7 @@ const fileB_mjs_1 = require("./fileB.mjs"); PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: *new* +/user/username/projects/myproject/src/fileB.mjs: *new* {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -417,7 +417,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -529,7 +529,7 @@ src/fileA.ts PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -547,7 +547,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -679,7 +679,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/src/fileb.mjs: +/user/username/projects/myproject/src/fileB.mjs: {"pollingInterval":500} /user/username/projects/package.json: {"pollingInterval":2000} @@ -691,7 +691,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -826,7 +826,7 @@ const fileB_mjs_1 = require("./fileB.mjs"); PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/src/fileb.mjs: *new* +/user/username/projects/myproject/src/fileB.mjs: *new* {"pollingInterval":500} /user/username/projects/myproject/src/node_modules/@types: {"pollingInterval":500} @@ -844,7 +844,7 @@ FsWatches:: {} /user/username/projects/myproject/src: {} -/user/username/projects/myproject/src/filea.ts: +/user/username/projects/myproject/src/fileA.ts: {} /user/username/projects/myproject/src/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js index 97423195d98..1f8c206429b 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js +++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js @@ -35,7 +35,7 @@ var x = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -98,9 +98,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js index ab4e31d59fe..da628bc41f0 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js +++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js @@ -115,7 +115,7 @@ FsWatches:: {} /users/username/projects/project/file1.ts: {} -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} FsWatchesRecursive *deleted*:: diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js index 8db2484af73..cf1ee130389 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js +++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js @@ -43,9 +43,9 @@ exports.x = 10; PolledWatches:: -/user/username/projects/myproject/node_modules/@types: *new* +/user/username/projects/myproject/Project/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/project/node_modules/@types: *new* +/user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} @@ -53,13 +53,13 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/project/file1.ts: *new* +/user/username/projects/myproject/Project/file1.ts: *new* {} -/user/username/projects/myproject/project/tsconfig.json: *new* +/user/username/projects/myproject/Project/tsconfig.json: *new* {} FsWatchesRecursive:: -/user/username/projects/myproject/project: *new* +/user/username/projects/myproject/Project: *new* {} Program root files: [ @@ -116,9 +116,9 @@ exports.y = 10; PolledWatches:: -/user/username/projects/myproject/node_modules/@types: +/user/username/projects/myproject/Project/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/project/node_modules/@types: +/user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} /user/username/projects/node_modules/@types: {"pollingInterval":500} @@ -126,15 +126,15 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/project/file1.ts: +/user/username/projects/myproject/Project/file1.ts: {} -/user/username/projects/myproject/project/file2.ts: *new* +/user/username/projects/myproject/Project/file2.ts: *new* {} -/user/username/projects/myproject/project/tsconfig.json: +/user/username/projects/myproject/Project/tsconfig.json: {} FsWatchesRecursive:: -/user/username/projects/myproject/project: +/user/username/projects/myproject/Project: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js b/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js index 7dbae42024e..b32110d77da 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js +++ b/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js @@ -39,9 +39,9 @@ var x = 1; FsWatches:: -/a/b/app.ts: *new* +/A/B/app.ts: *new* {} -/a/b/tsconfig.json: *new* +/A/B/tsconfig.json: *new* {} /a/lib/lib.d.ts: *new* {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js index 4b2f98058d5..56105ed3408 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js +++ b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js @@ -60,9 +60,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -137,9 +137,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} /a/b/first.tsconfig.json: *new* {} @@ -322,9 +322,9 @@ Output:: FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js index 24ac0f6ee9e..b8a83df3df0 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js +++ b/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js @@ -48,9 +48,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js index 27af4bb3d42..7084393e83f 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js +++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js @@ -48,9 +48,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -179,7 +179,7 @@ a/b/commonFile1.ts //// [/a/b/commonFile1.js] file written with same contents FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} /a/b/tsconfig.json: {} @@ -187,7 +187,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} FsWatchesRecursive:: @@ -252,9 +252,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js index 6e437a63358..db75beba808 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js +++ b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js @@ -44,11 +44,11 @@ var x = y; PolledWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {"pollingInterval":500} FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} /a/lib/lib.d.ts: *new* {} @@ -82,11 +82,11 @@ let y = 1 PolledWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {"pollingInterval":500} FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} /a/lib/lib.d.ts: {} @@ -113,9 +113,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/lib/lib.d.ts: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js index e89353238da..5399017134a 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js +++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js @@ -60,7 +60,7 @@ FsWatches:: {} /users/username/projects/project/file1.ts: *new* {} -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} /users/username/projects/project/tsconfig.json: *new* {} @@ -139,7 +139,7 @@ exports.bar = bar; PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile: *new* +/users/username/projects/project/moduleFile: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -151,13 +151,13 @@ FsWatches:: {} /users/username/projects/project/file1.ts: {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} /users/username/projects/project/tsconfig.json: {} FsWatches *deleted*:: -/users/username/projects/project/modulefile.ts: +/users/username/projects/project/moduleFile.ts: {} FsWatchesRecursive:: @@ -246,7 +246,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile: +/users/username/projects/project/moduleFile: {"pollingInterval":500} FsWatches:: @@ -254,7 +254,7 @@ FsWatches:: {} /users/username/projects/project/file1.ts: {} -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} /users/username/projects/project/tsconfig.json: {} @@ -262,7 +262,7 @@ FsWatches:: FsWatches *deleted*:: /users/username/projects/project: {} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js index 94259836d53..575b00b41e7 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js +++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js @@ -51,7 +51,7 @@ FsWatches:: {} /users/username/projects/project/file1.ts: *new* {} -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} Program root files: [ @@ -116,7 +116,7 @@ FsWatches:: {} FsWatches *deleted*:: -/users/username/projects/project/modulefile.ts: +/users/username/projects/project/moduleFile.ts: {} FsWatchesRecursive:: @@ -194,7 +194,7 @@ FsWatches:: {} /users/username/projects/project/file1.ts: {} -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} FsWatchesRecursive *deleted*:: diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js index f739ce1a04c..1a870e20802 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js +++ b/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js @@ -53,11 +53,11 @@ var x = 1; PolledWatches:: -/a/b/commonfile3.ts: *new* +/a/b/commonFile3.ts: *new* {"pollingInterval":500} FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js index a257da494b8..45c5e358d33 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js +++ b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js @@ -51,9 +51,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -183,7 +183,7 @@ a/b/commonFile1.ts //// [/a/b/commonFile1.js] file written with same contents FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} /a/b/tsconfig.json: {} @@ -191,7 +191,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js index 5c6481262ef..ca6bb5b33da 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js +++ b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js @@ -53,9 +53,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js index dd1bfb1115d..132a5801ad7 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js +++ b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js @@ -45,9 +45,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js index e3685bb66bd..1b739fe5391 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js @@ -480,7 +480,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/sample1/core/anothermodule.d.ts: *new* +/user/username/projects/sample1/core/anotherModule.d.ts: *new* {} /user/username/projects/sample1/core/index.d.ts: *new* {} @@ -1236,7 +1236,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/sample1/core/anothermodule.d.ts: +/user/username/projects/sample1/core/anotherModule.d.ts: {} /user/username/projects/sample1/core/index.d.ts: {} diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js index aa0c410b276..5a7f98c04b7 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js @@ -282,39 +282,39 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: *new* +/user/username/projects/transitiveReferences/c/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: *new* +/user/username/projects/transitiveReferences/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/transitivereferences: *new* +/user/username/projects/transitiveReferences: *new* {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: *new* +/user/username/projects/transitiveReferences/a/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/b/index.d.ts: *new* +/user/username/projects/transitiveReferences/b/index.d.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: *new* +/user/username/projects/transitiveReferences/b/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/c/index.ts: *new* +/user/username/projects/transitiveReferences/c/index.ts: *new* {} -/user/username/projects/transitivereferences/c/tsconfig.json: *new* +/user/username/projects/transitiveReferences/c/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: *new* +/user/username/projects/transitiveReferences/a: *new* {} -/user/username/projects/transitivereferences/b: *new* +/user/username/projects/transitiveReferences/b: *new* {} -/user/username/projects/transitivereferences/c: *new* +/user/username/projects/transitiveReferences/c: *new* {} -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} Program root files: [ @@ -641,47 +641,47 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -817,47 +817,47 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -974,45 +974,45 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -1128,45 +1128,45 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -1277,43 +1277,43 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/b/index.ts: *new* +/user/username/projects/transitiveReferences/b/index.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} Timeout callback:: count: 0 @@ -1432,43 +1432,43 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: *new* +/user/username/projects/transitiveReferences/a/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/b/index.d.ts: *new* +/user/username/projects/transitiveReferences/b/index.d.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/b/index.ts: +/user/username/projects/transitiveReferences/b/index.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: *new* +/user/username/projects/transitiveReferences/a: *new* {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 @@ -1582,43 +1582,43 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.ts: *new* +/user/username/projects/transitiveReferences/a/index.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 @@ -1727,43 +1727,43 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.ts: +/user/username/projects/transitiveReferences/a/index.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/c: +/user/username/projects/transitiveReferences/c: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js index 51b97baa673..cc4d4157dcb 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js @@ -291,37 +291,37 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: *new* +/user/username/projects/transitiveReferences/c/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: *new* +/user/username/projects/transitiveReferences/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/transitivereferences: *new* +/user/username/projects/transitiveReferences: *new* {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: *new* +/user/username/projects/transitiveReferences/a/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/b/index.d.ts: *new* +/user/username/projects/transitiveReferences/b/index.d.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: *new* +/user/username/projects/transitiveReferences/b/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/c/index.ts: *new* +/user/username/projects/transitiveReferences/c/index.ts: *new* {} -/user/username/projects/transitivereferences/c/tsconfig.json: *new* +/user/username/projects/transitiveReferences/c/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: *new* +/user/username/projects/transitiveReferences/a: *new* {} -/user/username/projects/transitivereferences/b: *new* +/user/username/projects/transitiveReferences/b: *new* {} -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} Program root files: [ @@ -651,45 +651,45 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -828,45 +828,45 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -986,45 +986,45 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} @@ -1143,41 +1143,41 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -1288,37 +1288,37 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/b/index.ts: *new* +/user/username/projects/transitiveReferences/b/index.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 @@ -1440,41 +1440,41 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: *new* +/user/username/projects/transitiveReferences/a/tsconfig.json: *new* {} -/user/username/projects/transitivereferences/b/index.d.ts: *new* +/user/username/projects/transitiveReferences/b/index.d.ts: *new* {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/b/index.ts: +/user/username/projects/transitiveReferences/b/index.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: *new* +/user/username/projects/transitiveReferences/a: *new* {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 @@ -1588,41 +1588,41 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.ts: *new* +/user/username/projects/transitiveReferences/a/index.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.d.ts: +/user/username/projects/transitiveReferences/a/index.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 @@ -1734,41 +1734,41 @@ c/index.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/c/node_modules/@types: +/user/username/projects/transitiveReferences/c/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences: +/user/username/projects/transitiveReferences: {} -/user/username/projects/transitivereferences/a/index.d.ts: *new* +/user/username/projects/transitiveReferences/a/index.d.ts: *new* {} -/user/username/projects/transitivereferences/a/tsconfig.json: +/user/username/projects/transitiveReferences/a/tsconfig.json: {} -/user/username/projects/transitivereferences/b/index.d.ts: +/user/username/projects/transitiveReferences/b/index.d.ts: {} -/user/username/projects/transitivereferences/b/tsconfig.json: +/user/username/projects/transitiveReferences/b/tsconfig.json: {} -/user/username/projects/transitivereferences/c/index.ts: +/user/username/projects/transitiveReferences/c/index.ts: {} -/user/username/projects/transitivereferences/c/tsconfig.json: +/user/username/projects/transitiveReferences/c/tsconfig.json: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a/index.ts: +/user/username/projects/transitiveReferences/a/index.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/a: +/user/username/projects/transitiveReferences/a: {} -/user/username/projects/transitivereferences/b: +/user/username/projects/transitiveReferences/b: {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} Timeout callback:: count: 0 diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js index 547930c93f8..911332f3afa 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js @@ -292,29 +292,29 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: *new* +/user/username/projects/transitiveReferences/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/transitivereferences/a.d.ts: *new* +/user/username/projects/transitiveReferences/a.d.ts: *new* {} -/user/username/projects/transitivereferences/b.d.ts: *new* +/user/username/projects/transitiveReferences/b.d.ts: *new* {} -/user/username/projects/transitivereferences/c.ts: *new* +/user/username/projects/transitiveReferences/c.ts: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/tsconfig.a.json: *new* +/user/username/projects/transitiveReferences/tsconfig.a.json: *new* {} -/user/username/projects/transitivereferences/tsconfig.b.json: *new* +/user/username/projects/transitiveReferences/tsconfig.b.json: *new* {} -/user/username/projects/transitivereferences/tsconfig.c.json: *new* +/user/username/projects/transitiveReferences/tsconfig.c.json: *new* {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} Program root files: [ @@ -639,37 +639,37 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/a.d.ts: +/user/username/projects/transitiveReferences/a.d.ts: {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -804,37 +804,37 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/a.d.ts: +/user/username/projects/transitiveReferences/a.d.ts: {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -954,35 +954,35 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/nrefs/a.d.ts: *new* +/user/username/projects/transitiveReferences/nrefs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a.d.ts: +/user/username/projects/transitiveReferences/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/nrefs: *new* +/user/username/projects/transitiveReferences/nrefs: *new* {} -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -1101,35 +1101,35 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/nrefs/a.d.ts: +/user/username/projects/transitiveReferences/nrefs/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} FsWatchesRecursive *deleted*:: -/user/username/projects/transitivereferences/nrefs: +/user/username/projects/transitiveReferences/nrefs: {} @@ -1238,31 +1238,31 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/b.ts: *new* +/user/username/projects/transitiveReferences/b.ts: *new* {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -1379,33 +1379,33 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/a.d.ts: *new* +/user/username/projects/transitiveReferences/a.d.ts: *new* {} -/user/username/projects/transitivereferences/b.d.ts: *new* +/user/username/projects/transitiveReferences/b.d.ts: *new* {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: *new* +/user/username/projects/transitiveReferences/tsconfig.a.json: *new* {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/b.ts: +/user/username/projects/transitiveReferences/b.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -1514,33 +1514,33 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/a.ts: *new* +/user/username/projects/transitiveReferences/a.ts: *new* {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a.d.ts: +/user/username/projects/transitiveReferences/a.d.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} @@ -1647,33 +1647,33 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: +/user/username/projects/transitiveReferences/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/transitivereferences/a.d.ts: *new* +/user/username/projects/transitiveReferences/a.d.ts: *new* {} -/user/username/projects/transitivereferences/b.d.ts: +/user/username/projects/transitiveReferences/b.d.ts: {} -/user/username/projects/transitivereferences/c.ts: +/user/username/projects/transitiveReferences/c.ts: {} -/user/username/projects/transitivereferences/refs/a.d.ts: +/user/username/projects/transitiveReferences/refs/a.d.ts: {} -/user/username/projects/transitivereferences/tsconfig.a.json: +/user/username/projects/transitiveReferences/tsconfig.a.json: {} -/user/username/projects/transitivereferences/tsconfig.b.json: +/user/username/projects/transitiveReferences/tsconfig.b.json: {} -/user/username/projects/transitivereferences/tsconfig.c.json: +/user/username/projects/transitiveReferences/tsconfig.c.json: {} FsWatches *deleted*:: -/user/username/projects/transitivereferences/a.ts: +/user/username/projects/transitiveReferences/a.ts: {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: +/user/username/projects/transitiveReferences/refs: {} diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js index f96d8f34bfb..f66f60e7f76 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js @@ -354,7 +354,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/sample1/core/anothermodule.d.ts: *new* +/user/username/projects/sample1/core/anotherModule.d.ts: *new* {} /user/username/projects/sample1/core/index.d.ts: *new* {} diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js index 9121a011c4a..e081291d936 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js @@ -285,29 +285,29 @@ c.ts PolledWatches:: /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/transitivereferences/node_modules/@types: *new* +/user/username/projects/transitiveReferences/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/transitivereferences/a.d.ts: *new* +/user/username/projects/transitiveReferences/a.d.ts: *new* {} -/user/username/projects/transitivereferences/b.d.ts: *new* +/user/username/projects/transitiveReferences/b.d.ts: *new* {} -/user/username/projects/transitivereferences/c.ts: *new* +/user/username/projects/transitiveReferences/c.ts: *new* {} -/user/username/projects/transitivereferences/refs/a.d.ts: *new* +/user/username/projects/transitiveReferences/refs/a.d.ts: *new* {} -/user/username/projects/transitivereferences/tsconfig.a.json: *new* +/user/username/projects/transitiveReferences/tsconfig.a.json: *new* {} -/user/username/projects/transitivereferences/tsconfig.b.json: *new* +/user/username/projects/transitiveReferences/tsconfig.b.json: *new* {} -/user/username/projects/transitivereferences/tsconfig.c.json: *new* +/user/username/projects/transitiveReferences/tsconfig.c.json: *new* {} FsWatchesRecursive:: -/user/username/projects/transitivereferences/refs: *new* +/user/username/projects/transitiveReferences/refs: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js index e2d05eac88f..8f15bbb35bf 100644 --- a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js +++ b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js @@ -312,9 +312,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/filewithimports.ts: *new* +/users/username/projects/project/fileWithImports.ts: *new* {} -/users/username/projects/project/filewithtyperefs.ts: *new* +/users/username/projects/project/fileWithTypeRefs.ts: *new* {} /users/username/projects/project/node_modules/pkg0/index.d.ts: *new* {} @@ -591,9 +591,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/filewithimports.ts: +/users/username/projects/project/fileWithImports.ts: {} -/users/username/projects/project/filewithtyperefs.ts: +/users/username/projects/project/fileWithTypeRefs.ts: {} /users/username/projects/project/node_modules/pkg0/index.d.ts: {} @@ -874,9 +874,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/filewithimports.ts: +/users/username/projects/project/fileWithImports.ts: {} -/users/username/projects/project/filewithtyperefs.ts: +/users/username/projects/project/fileWithTypeRefs.ts: {} /users/username/projects/project/node_modules/pkg0/index.d.ts: {} diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js index cf6fa3176c0..081a97c44ef 100644 --- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js +++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js @@ -61,11 +61,11 @@ module11("hello"); PolledWatches:: -/a/b/projects/myproject/node_modules/@types: *new* +/a/b/projects/myProject/node_modules/@types: *new* {"pollingInterval":500} -/a/b/projects/myproject/src/node_modules: *new* +/a/b/projects/myProject/src/node_modules: *new* {"pollingInterval":500} -/a/b/projects/myproject/src/node_modules/@types: *new* +/a/b/projects/myProject/src/node_modules/@types: *new* {"pollingInterval":500} /a/b/projects/node_modules: *new* {"pollingInterval":500} @@ -73,21 +73,21 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/projects/myproject/node_modules/module1/index.js: *new* +/a/b/projects/myProject/node_modules/module1/index.js: *new* {} -/a/b/projects/myproject/src/file1.ts: *new* +/a/b/projects/myProject/src/file1.ts: *new* {} -/a/b/projects/myproject/src/file2.ts: *new* +/a/b/projects/myProject/src/file2.ts: *new* {} -/a/b/projects/myproject/src/tsconfig.json: *new* +/a/b/projects/myProject/src/tsconfig.json: *new* {} /a/lib/lib.d.ts: *new* {} FsWatchesRecursive:: -/a/b/projects/myproject/node_modules: *new* +/a/b/projects/myProject/node_modules: *new* {} -/a/b/projects/myproject/src: *new* +/a/b/projects/myProject/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js index 03f66379727..352267cf3bf 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js @@ -330,9 +330,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -344,25 +344,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js index f590750df52..20c3fb38304 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js @@ -332,9 +332,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -346,25 +346,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js index cfea149b0cf..796f953699a 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js @@ -166,9 +166,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -180,25 +180,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js index 027f17a78cb..15abedfd3b2 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js @@ -330,9 +330,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -344,25 +344,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js index 17978404fe3..9dbace85ccc 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js @@ -332,9 +332,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -346,25 +346,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js index a0513bddda2..3ca9dc4f025 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js @@ -166,9 +166,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -180,25 +180,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js index cd41103d6d5..03c216317d1 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js @@ -164,9 +164,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -178,25 +178,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js index 682ffb1960f..f839de4c855 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js @@ -164,9 +164,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -178,25 +178,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/index.ts: *new* +/user/username/projects/myproject/packages/A/src/index.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js index 3fd8f5ba1e7..4d65001440f 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js @@ -327,9 +327,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -341,25 +341,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js index c38c364018a..034d10c239c 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js @@ -329,9 +329,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -343,25 +343,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js index 31591f6ccfe..0d201a744e0 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js @@ -163,9 +163,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -177,25 +177,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js index 852d3d8c75c..549a1b8fdc5 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js @@ -327,9 +327,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -341,25 +341,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js index 048f9bf39cc..0eaad029c6e 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js @@ -329,9 +329,9 @@ Output:: PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -343,25 +343,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js index 616b67cd77b..a10fa8b0668 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js @@ -163,9 +163,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -177,25 +177,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js index 0c32a909efa..e7cf9b1955b 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js @@ -161,9 +161,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -175,25 +175,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js index e1e3869559c..86ead9deda3 100644 --- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js +++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js @@ -161,9 +161,9 @@ export {}; PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -175,25 +175,25 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/src/test.ts: *new* +/user/username/projects/myproject/packages/A/src/test.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js index 32cdff4a7de..c04af410704 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js @@ -53,9 +53,9 @@ var y = 1; PolledWatches:: /a/b: *new* {"pollingInterval":500} -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {"pollingInterval":250} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {"pollingInterval":250} /a/b/tsconfig.json: *new* {"pollingInterval":2000} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js index ad719e38e0d..1abd788c9bd 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js @@ -48,9 +48,9 @@ var y = 1; FsWatches:: /a/b: *new* {} -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js index e388246dd3b..274e2d73c87 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js @@ -42,9 +42,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js index 02edc8e476f..a3aa692d33c 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js @@ -46,9 +46,9 @@ var y = 1; FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-applyChangedToOpenFiles-request.js b/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-applyChangedToOpenFiles-request.js index 1f7e7999b10..e179eb554b3 100644 --- a/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-applyChangedToOpenFiles-request.js +++ b/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-applyChangedToOpenFiles-request.js @@ -168,9 +168,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/file3.ts: *new* {} @@ -225,9 +225,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} /a/b/tsconfig.json: {} @@ -331,9 +331,9 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-updateOpen-request.js b/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-updateOpen-request.js index 1d9057a7161..3fe182e5193 100644 --- a/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-updateOpen-request.js +++ b/tests/baselines/reference/tsserver/applyChangesToOpenFiles/with-updateOpen-request.js @@ -168,9 +168,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/file3.ts: *new* {} @@ -225,9 +225,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} /a/b/tsconfig.json: {} @@ -339,9 +339,9 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile1.ts: +/a/b/commonFile1.ts: {} -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Closes-AutoImportProviderProject-when-host-project-closes.js b/tests/baselines/reference/tsserver/autoImportProvider/Closes-AutoImportProviderProject-when-host-project-closes.js index 508f0af7c23..3dda2c89d4d 100644 --- a/tests/baselines/reference/tsserver/autoImportProvider/Closes-AutoImportProviderProject-when-host-project-closes.js +++ b/tests/baselines/reference/tsserver/autoImportProvider/Closes-AutoImportProviderProject-when-host-project-closes.js @@ -223,4 +223,5 @@ FsWatchesRecursive:: Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /tsconfig.json WatchType: Missing file \ No newline at end of file diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js b/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js index fd698940ea7..59436a22899 100644 --- a/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js +++ b/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js @@ -234,7 +234,7 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js b/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js index 14a913d6eb7..a1385096de1 100644 --- a/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js +++ b/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js @@ -291,7 +291,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js index 2b8cb3cc95c..3e5b7cd94aa 100644 --- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js +++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js @@ -117,8 +117,8 @@ Info seq [hh:mm:ss:mss] Config: /Users/someuser/work/applications/frontend/tsco "configFilePath": "/Users/someuser/work/applications/frontend/tsconfig.json" } } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/types 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations @@ -286,27 +286,27 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/users/someuser/work/applications/frontend/node_modules: *new* +/Users/someuser/work/applications/frontend/node_modules: *new* {"pollingInterval":500} -/users/someuser/work/applications/frontend/types: *new* +/Users/someuser/work/applications/frontend/types: *new* {"pollingInterval":500} FsWatches:: +/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts: *new* + {} +/Users/someuser/work/applications/frontend/tsconfig.json: *new* + {} /a/lib/lib.es2016.full.d.ts: *new* {} -/users/someuser/work/applications/frontend/src/app/redux/configurestore.ts: *new* - {} -/users/someuser/work/applications/frontend/tsconfig.json: *new* - {} FsWatchesRecursive:: -/users/someuser/work/applications/frontend/src: *new* +/Users/someuser/work/applications/frontend/src: *new* {} -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /Users/someuser/work/applications/frontend/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory Before running Timeout callback:: count: 2 1: /Users/someuser/work/applications/frontend/tsconfig.json 2: *ensureProjectForOpenFiles* @@ -372,38 +372,34 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 PolledWatches:: -/users/someuser/work/applications/frontend/node_modules: +/Users/someuser/work/applications/frontend/node_modules: {"pollingInterval":500} -/users/someuser/work/applications/frontend/types: +/Users/someuser/work/applications/frontend/types: {"pollingInterval":500} FsWatches:: +/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts: + {} +/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts: *new* + {} +/Users/someuser/work/applications/frontend/tsconfig.json: + {} /a/lib/lib.es2016.full.d.ts: {} -/users/someuser/work/applications/frontend/src/app/redux/configurestore.ts: - {} -/users/someuser/work/applications/frontend/src/app/utils/cookie.ts: *new* - {} -/users/someuser/work/applications/frontend/tsconfig.json: - {} FsWatchesRecursive:: -/users/someuser/work/applications/frontend/src: +/Users/someuser/work/applications/frontend/src: {} Info seq [hh:mm:ss:mss] fileExists:: [ - { - "key": "/users/someuser/work/applications/frontend/src/app/utils/cookie.ts", - "count": 1 - }, { "key": "/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts", - "count": 1 + "count": 2 } ] Info seq [hh:mm:ss:mss] directoryExists:: [ { - "key": "/users/someuser/work/applications/frontend/src/app/utils/cookie.ts", + "key": "/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts", "count": 1 } ] @@ -445,25 +441,25 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/users/someuser/work/applications/frontend/node_modules: +/Users/someuser/work/applications/frontend/node_modules: {"pollingInterval":500} -/users/someuser/work/applications/frontend/types: +/Users/someuser/work/applications/frontend/types: {"pollingInterval":500} FsWatches:: +/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts: + {} +/Users/someuser/work/applications/frontend/tsconfig.json: + {} /a/lib/lib.es2016.full.d.ts: {} -/users/someuser/work/applications/frontend/src/app/redux/configurestore.ts: - {} -/users/someuser/work/applications/frontend/tsconfig.json: - {} FsWatches *deleted*:: -/users/someuser/work/applications/frontend/src/app/utils/cookie.ts: +/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts: {} FsWatchesRecursive:: -/users/someuser/work/applications/frontend/src: +/Users/someuser/work/applications/frontend/src: {} Info seq [hh:mm:ss:mss] fileExists:: [] diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-cascaded-affected-file-list.js index 28a26ae108a..6592d311b4a 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-cascaded-affected-file-list.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-cascaded-affected-file-list.js @@ -172,11 +172,11 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer1consumer1.ts: *new* +/a/b/file1Consumer1Consumer1.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -217,9 +217,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1consumer1.ts: +/a/b/file1Consumer1Consumer1.ts: {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} /a/b/tsconfig.json: {} @@ -227,7 +227,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-disabled.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-disabled.js index 6167dd34669..2510784169b 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-disabled.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-disabled.js @@ -162,9 +162,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-in-base-tsconfig.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-in-base-tsconfig.js index 53cb2a99cb7..5bb8c7cbe52 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-in-base-tsconfig.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-compileOnSave-in-base-tsconfig.js @@ -170,9 +170,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -215,7 +215,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} /a/b/tsconfig.json: {} @@ -225,7 +225,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-detect-changes-in-non-root-files.js index 579c1ea626c..555f1a439a3 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-detect-changes-in-non-root-files.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-detect-changes-in-non-root-files.js @@ -152,7 +152,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -195,7 +195,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} Before request diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-global-file-shape-changed.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-global-file-shape-changed.js index a361d191071..a36d5037a38 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-global-file-shape-changed.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-global-file-shape-changed.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-isolatedModules.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-isolatedModules.js index fabd829c6bd..a25326bb9d0 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-isolatedModules.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-isolatedModules.js @@ -161,7 +161,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-module-shape-changed.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-module-shape-changed.js index 387a5b93fd2..8d2f56ca631 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-module-shape-changed.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-module-shape-changed.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -227,11 +227,11 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} @@ -239,7 +239,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-noEmit.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-noEmit.js index 30132f16941..a46d969d109 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-noEmit.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-noEmit.js @@ -170,9 +170,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-non-existing-code.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-non-existing-code.js index f7dd657dbfd..2dafbe79948 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-non-existing-code.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-non-existing-code.js @@ -46,7 +46,7 @@ Info seq [hh:mm:ss:mss] Config: /a/b/tsconfig.json : { Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/modulefile2.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/moduleFile2.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) @@ -179,7 +179,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {"pollingInterval":500} /a/lib/lib.d.ts: *new* {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js index 1290f23a310..28719544ae5 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js @@ -164,7 +164,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-removed-code.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-removed-code.js index 08ac86f4d7d..7dd0915f5f2 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-removed-code.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-removed-code.js @@ -191,7 +191,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -221,7 +221,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/modulefile1.ts: +/a/b/moduleFile1.ts: {} FsWatchesRecursive:: @@ -242,7 +242,7 @@ Info seq [hh:mm:ss:mss] request: "type": "request" } Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/modulefile1.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/moduleFile1.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (1) @@ -285,7 +285,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/modulefile1.ts: *new* +/a/b/moduleFile1.ts: *new* {"pollingInterval":500} /a/lib/lib.d.ts: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-changes-in-non-open-files.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-changes-in-non-open-files.js index 811b70b24e3..cfaad8d2194 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-changes-in-non-open-files.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-changes-in-non-open-files.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-deleted-files.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-deleted-files.js index 9f1bf7f7a4c..dc18013c429 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-deleted-files.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-deleted-files.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -261,11 +261,11 @@ Before request //// [/a/b/file1Consumer2.ts] deleted FsWatches:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} @@ -273,7 +273,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js index c04fb4036f5..17c2bfb71d6 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -307,15 +307,15 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 FsWatches:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} -/a/b/file1consumer3.ts: *new* +/a/b/file1Consumer3.ts: *new* {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-reference-map-changes.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-reference-map-changes.js index faba0c3135f..4257b77c200 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-reference-map-changes.js +++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-reference-map-changes.js @@ -180,13 +180,13 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer1.ts: *new* +/a/b/file1Consumer1.ts: *new* {} -/a/b/file1consumer2.ts: *new* +/a/b/file1Consumer2.ts: *new* {} -/a/b/globalfile3.ts: *new* +/a/b/globalFile3.ts: *new* {} -/a/b/modulefile2.ts: *new* +/a/b/moduleFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -227,11 +227,11 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/file1consumer2.ts: +/a/b/file1Consumer2.ts: {} -/a/b/globalfile3.ts: +/a/b/globalFile3.ts: {} -/a/b/modulefile2.ts: +/a/b/moduleFile2.ts: {} /a/b/tsconfig.json: {} @@ -239,7 +239,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/file1consumer1.ts: +/a/b/file1Consumer1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/compileOnSave/use-projectRoot-as-current-directory.js b/tests/baselines/reference/tsserver/compileOnSave/use-projectRoot-as-current-directory.js index 34d529c5c8f..1d48242dd1a 100644 --- a/tests/baselines/reference/tsserver/compileOnSave/use-projectRoot-as-current-directory.js +++ b/tests/baselines/reference/tsserver/compileOnSave/use-projectRoot-as-current-directory.js @@ -103,13 +103,13 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/root/typescriptproject3/typescriptproject3/node_modules/@types: *new* +/root/TypeScriptProject3/TypeScriptProject3/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/root/typescriptproject3/typescriptproject3/foo.ts: *new* +/root/TypeScriptProject3/TypeScriptProject3/Foo.ts: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js index dcd4f6fd743..6437dc7db2e 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js +++ b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js @@ -219,7 +219,7 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/configuredProjects/files-explicitly-excluded-in-config-file.js b/tests/baselines/reference/tsserver/configuredProjects/files-explicitly-excluded-in-config-file.js index 48b4a7ae2d0..78f501a4dfc 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/files-explicitly-excluded-in-config-file.js +++ b/tests/baselines/reference/tsserver/configuredProjects/files-explicitly-excluded-in-config-file.js @@ -192,7 +192,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js b/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js index 67392594671..133ce0293d6 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js +++ b/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -218,7 +218,7 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} FsWatchesRecursive:: @@ -339,7 +339,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-ignore-non-existing-files-specified-in-the-config-file.js b/tests/baselines/reference/tsserver/configuredProjects/should-ignore-non-existing-files-specified-in-the-config-file.js index 466d73933da..4b8a79de72f 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/should-ignore-non-existing-files-specified-in-the-config-file.js +++ b/tests/baselines/reference/tsserver/configuredProjects/should-ignore-non-existing-files-specified-in-the-config-file.js @@ -50,7 +50,7 @@ Info seq [hh:mm:ss:mss] Config: /a/b/tsconfig.json : { } } Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/commonfile3.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/commonFile3.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) @@ -206,7 +206,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/commonfile3.ts: *new* +/a/b/commonFile3.ts: *new* {"pollingInterval":500} /a/lib/lib.d.ts: *new* {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js b/tests/baselines/reference/tsserver/configuredProjects/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js index 4247af551bd..605b959447f 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js +++ b/tests/baselines/reference/tsserver/configuredProjects/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js @@ -240,7 +240,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js index ab068727bb9..832648a4b87 100644 --- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js +++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js @@ -29,8 +29,8 @@ Info seq [hh:mm:ss:mss] Search path: ^walkThroughSnippet:/Users/UserName/projec Info seq [hh:mm:ss:mss] For info: ^walkThroughSnippet:/Users/UserName/projects/someProject/out/someFile#1.js :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (2) @@ -47,9 +47,9 @@ Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer PolledWatches:: -/typings/@epic/core.d.ts: *new* +/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} -/typings/@epic/shell.d.ts: *new* +/typings/@epic/Shell.d.ts: *new* {"pollingInterval":500} FsWatches:: @@ -190,15 +190,15 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/^walkthroughsnippet:: *new* +/^walkThroughSnippet:: *new* {"pollingInterval":500} /bower_components: *new* {"pollingInterval":500} /node_modules: *new* {"pollingInterval":500} -/typings/@epic/core.d.ts: +/typings/@epic/Core.d.ts: {"pollingInterval":500} -/typings/@epic/shell.d.ts: +/typings/@epic/Shell.d.ts: {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/dynamicFiles/untitled-can-convert-positions-to-locations.js b/tests/baselines/reference/tsserver/dynamicFiles/untitled-can-convert-positions-to-locations.js index 376d86dc1eb..552c9b31258 100644 --- a/tests/baselines/reference/tsserver/dynamicFiles/untitled-can-convert-positions-to-locations.js +++ b/tests/baselines/reference/tsserver/dynamicFiles/untitled-can-convert-positions-to-locations.js @@ -202,7 +202,7 @@ Info seq [hh:mm:ss:mss] request: Info seq [hh:mm:ss:mss] Search path: Info seq [hh:mm:ss:mss] For info: untitled:^Untitled-1 :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) @@ -236,7 +236,7 @@ After request PolledWatches:: /a/lib/lib.d.ts: {"pollingInterval":500} -/typings/@epic/core.d.ts: *new* +/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/dynamicFiles/untitled.js b/tests/baselines/reference/tsserver/dynamicFiles/untitled.js index 8881940cfb7..e7891543fb8 100644 --- a/tests/baselines/reference/tsserver/dynamicFiles/untitled.js +++ b/tests/baselines/reference/tsserver/dynamicFiles/untitled.js @@ -29,8 +29,8 @@ Info seq [hh:mm:ss:mss] Search path: untitled:/Users/matb/projects/san Info seq [hh:mm:ss:mss] For info: untitled:/Users/matb/projects/san/^newFile.ts :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (2) @@ -58,9 +58,9 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/typings/@epic/core.d.ts: *new* +/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} -/typings/@epic/shell.d.ts: *new* +/typings/@epic/Shell.d.ts: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js b/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js index a6f21b8f9a3..0f050621f12 100644 --- a/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js +++ b/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js @@ -29,8 +29,8 @@ Info seq [hh:mm:ss:mss] Search path: walkThroughSnippet:/usr/share/code/resourc Info seq [hh:mm:ss:mss] For info: walkThroughSnippet:/usr/share/code/resources/app/out/vs/workbench/contrib/welcome/walkThrough/browser/editor/^vs_code_editor_walkthrough.md#1.ts :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /walkthroughsnippet:/usr/share/code/resources/app/out/vs/typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /walkthroughsnippet:/usr/share/code/resources/app/out/vs/typings/@epic/shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (2) @@ -58,9 +58,9 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/walkthroughsnippet:/usr/share/code/resources/app/out/vs/typings/@epic/core.d.ts: *new* +/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} -/walkthroughsnippet:/usr/share/code/resources/app/out/vs/typings/@epic/shell.d.ts: *new* +/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Shell.d.ts: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js index 789b21901d0..513afa22d1a 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js @@ -190,7 +190,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -271,7 +271,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -388,19 +388,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js index 578a58d2397..7e8a2fc8234 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js @@ -385,13 +385,13 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js index 306e66e2c33..113992ee6ad 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -264,7 +264,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -393,17 +393,17 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js index f771fb09e71..9f3b8951647 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -264,7 +264,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -405,21 +405,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/file1consumer3.ts: *new* +/users/username/projects/project/file1Consumer3.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js index f502bbb1c02..1d56a5c6aca 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -264,7 +264,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -391,7 +391,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -401,13 +401,13 @@ FsWatches:: {} /users/username/projects/project: {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} @@ -569,19 +569,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/file1consumer2.ts: +/users/username/projects/project/file1Consumer2.ts: {} -/users/username/projects/project/globalfile3.ts: +/users/username/projects/project/globalFile3.ts: {} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js index 0cc949fc52d..3ffc2c2a478 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -264,7 +264,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -381,19 +381,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js index 13f940ad686..19661e63e3c 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js @@ -185,7 +185,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -246,7 +246,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -345,13 +345,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js index 686048b7944..f710742257a 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -182,7 +182,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -218,7 +218,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -312,7 +312,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -327,11 +327,11 @@ FsWatchesRecursive:: /users/username/projects/project: {} -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -350,7 +350,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} FsWatches:: @@ -368,7 +368,7 @@ Timeout callback:: count: 2 6: *ensureProjectForOpenFiles* *new* Info seq [hh:mm:ss:mss] Running: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) @@ -426,7 +426,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js index 36c3783c7dc..09c81cb745f 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -182,7 +182,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -200,11 +200,11 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -239,7 +239,7 @@ PolledWatches:: PolledWatches *deleted*:: /a/lib/lib.d.ts: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {"pollingInterval":500} FsWatches:: @@ -257,7 +257,7 @@ Timeout callback:: count: 2 Info seq [hh:mm:ss:mss] Running: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -304,7 +304,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js index 17de4597e28..9663d558fb9 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -264,7 +264,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -381,19 +381,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js index 541cf1ba5bc..10b97e6f590 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js @@ -183,7 +183,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -274,7 +274,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -415,21 +415,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer1consumer1.ts: *new* +/users/username/projects/project/file1Consumer1Consumer1.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js index e7799e96f56..42d519b928b 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js @@ -193,7 +193,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -274,7 +274,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -392,19 +392,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js index d1471e2d8f6..03ef020e173 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js @@ -389,13 +389,13 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js index 25a2432f054..5576fab5178 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -397,17 +397,17 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js index fb5baf6fc28..354ff20d613 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -409,21 +409,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/file1consumer3.ts: *new* +/users/username/projects/project/file1Consumer3.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js index 0d9620d0c7d..a2a849d5218 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -395,7 +395,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -405,13 +405,13 @@ FsWatches:: {} /users/username/projects/project: {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} @@ -575,19 +575,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/file1consumer2.ts: +/users/username/projects/project/file1Consumer2.ts: {} -/users/username/projects/project/globalfile3.ts: +/users/username/projects/project/globalFile3.ts: {} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js index 4ee86049af7..266ff72624a 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -385,19 +385,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js index b551c67367f..15500ce8f96 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js @@ -188,7 +188,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -249,7 +249,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -349,13 +349,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js index 1d3e3f39a44..84c35ccfef1 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -185,7 +185,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -221,7 +221,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -316,7 +316,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -331,11 +331,11 @@ FsWatchesRecursive:: /users/username/projects/project: {} -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -354,7 +354,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} FsWatches:: @@ -372,7 +372,7 @@ Timeout callback:: count: 2 6: *ensureProjectForOpenFiles* *new* Info seq [hh:mm:ss:mss] Running: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) @@ -431,7 +431,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js index 8ac8ad7bb7f..fd1ecbc1896 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -185,7 +185,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -203,11 +203,11 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -242,7 +242,7 @@ PolledWatches:: PolledWatches *deleted*:: /a/lib/lib.d.ts: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {"pollingInterval":500} FsWatches:: @@ -260,7 +260,7 @@ Timeout callback:: count: 2 Info seq [hh:mm:ss:mss] Running: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -308,7 +308,7 @@ After running Timeout callback:: count: 0 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js index bc1c32216b5..5a3c4520349 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -385,19 +385,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js index ee673f1fe9c..10db5b736e9 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -277,7 +277,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -419,21 +419,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer1consumer1.ts: *new* +/users/username/projects/project/file1Consumer1Consumer1.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js index 4737d46cb60..96f1c0e893e 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js @@ -193,7 +193,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -274,7 +274,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -393,19 +393,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js index a22f04e1182..9bee6c8d887 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js @@ -390,13 +390,13 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js index c5ed541e600..5c58fcb87b0 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -398,17 +398,17 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js index df4eb0225dc..b53cf72a30c 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -410,21 +410,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/file1consumer3.ts: *new* +/users/username/projects/project/file1Consumer3.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js index 4d0e35dab02..1f0de63af84 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -396,7 +396,7 @@ After running Timeout callback:: count: 1 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -406,13 +406,13 @@ FsWatches:: {} /users/username/projects/project: {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} @@ -599,19 +599,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/file1consumer2.ts: +/users/username/projects/project/file1Consumer2.ts: {} -/users/username/projects/project/globalfile3.ts: +/users/username/projects/project/globalFile3.ts: {} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js index 9bf43231d22..6480f39109e 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -386,19 +386,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js index de54596d43f..0ff275d5362 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js @@ -188,7 +188,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -249,7 +249,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -350,13 +350,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js index 0d221b7d44f..7ddd48133b6 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -185,7 +185,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -221,7 +221,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -317,7 +317,7 @@ After running Timeout callback:: count: 1 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -335,11 +335,11 @@ FsWatchesRecursive:: Timeout callback:: count: 1 3: checkOne *new* -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile2.ts 0:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts 0:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile2.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -359,7 +359,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile2.ts: +/users/username/projects/project/moduleFile2.ts: {"pollingInterval":500} FsWatches:: @@ -377,7 +377,7 @@ Timeout callback:: count: 3 6: /users/username/projects/project/tsconfig.json *new* 7: *ensureProjectForOpenFiles* *new* -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile2.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile2.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) @@ -448,7 +448,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js index cdb645e7673..be6aba16158 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js @@ -44,7 +44,7 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/node_modules/@types 1 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Type roots @@ -185,7 +185,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -203,11 +203,11 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/modulefile1.ts 0:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts 0:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /users/username/projects/project/moduleFile1.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one @@ -242,7 +242,7 @@ PolledWatches:: PolledWatches *deleted*:: /a/lib/lib.d.ts: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {"pollingInterval":500} FsWatches:: @@ -260,7 +260,7 @@ Timeout callback:: count: 2 Info seq [hh:mm:ss:mss] Running: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/modulefile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/moduleFile1.ts 500 undefined Project: /users/username/projects/project/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /users/username/projects/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -309,7 +309,7 @@ After running Timeout callback:: count: 1 PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js index 6c7f05dc3be..5a5bdaad089 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -267,7 +267,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -386,19 +386,19 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js index ec6ca41ba48..a73b18288bb 100644 --- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js +++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js @@ -186,7 +186,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/modulefile1: *new* +/users/username/projects/project/moduleFile1: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -277,7 +277,7 @@ interface Array { length: number; [n: number]: T; } PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -420,21 +420,21 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile1: +/users/username/projects/project/moduleFile1: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/file1consumer1consumer1.ts: *new* +/users/username/projects/project/file1Consumer1Consumer1.ts: *new* {} -/users/username/projects/project/file1consumer2.ts: *new* +/users/username/projects/project/file1Consumer2.ts: *new* {} -/users/username/projects/project/globalfile3.ts: *new* +/users/username/projects/project/globalFile3.ts: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} -/users/username/projects/project/modulefile2.ts: *new* +/users/username/projects/project/moduleFile2.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing-with-lazyConfiguredProjectsFromExternalProject.js b/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing-with-lazyConfiguredProjectsFromExternalProject.js index 76ed88104ef..736cd2fce5f 100644 --- a/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing-with-lazyConfiguredProjectsFromExternalProject.js +++ b/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing-with-lazyConfiguredProjectsFromExternalProject.js @@ -65,7 +65,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/tsconfig.json: *new* +/A/B/tsconfig.json: *new* {} Before request @@ -222,5 +222,5 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/tsconfig.json: +/A/B/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing.js b/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing.js index 0f43ba3aec3..33cc955dc91 100644 --- a/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing.js +++ b/tests/baselines/reference/tsserver/externalProjects/can-handle-tsconfig-file-name-with-difference-casing.js @@ -137,7 +137,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/tsconfig.json: *new* +/A/B/tsconfig.json: *new* {} Before request @@ -204,5 +204,5 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/tsconfig.json: +/A/B/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js index cebed5695c1..d676d31ef23 100644 --- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js +++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js @@ -173,7 +173,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/logger.ts: *new* +/user/username/projects/myproject/Logger.ts: *new* {} /user/username/projects/myproject/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js index d6f78e859af..600f43221e6 100644 --- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js +++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js @@ -89,8 +89,8 @@ Info seq [hh:mm:ss:mss] Config: /Users/username/dev/project/tsconfig.json : { } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Users/username/dev/project/tsconfig.all.json 2000 undefined Config: /Users/username/dev/project/tsconfig.json WatchType: Extended config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/dev/project 1 undefined Config: /Users/username/dev/project/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/dev/project 1 undefined Config: /Users/username/dev/project/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Users/username/dev/project 1 undefined Config: /Users/username/dev/project/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/username/dev/project 1 undefined Config: /Users/username/dev/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Users/username/dev/project/types/file2/index.d.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /Users/username/dev/project/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Users/username/dev/project/types 1 undefined Project: /Users/username/dev/project/tsconfig.json WatchType: Failed Lookup Locations @@ -197,19 +197,19 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: +/Users/username/dev/project/tsconfig.all.json: *new* + {} +/Users/username/dev/project/tsconfig.json: *new* + {} +/Users/username/dev/project/types/file2/index.d.ts: *new* + {} /a/lib/lib.d.ts: *new* {} -/users/username/dev/project/tsconfig.all.json: *new* - {} -/users/username/dev/project/tsconfig.json: *new* - {} -/users/username/dev/project/types/file2/index.d.ts: *new* - {} FsWatchesRecursive:: -/users/username/dev/project: *new* +/Users/username/dev/project: *new* {} -/users/username/dev/project/types: *new* +/Users/username/dev/project/types: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js index 85804391a3c..233e3948240 100644 --- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js +++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js @@ -302,9 +302,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/another.ts: +/user/username/projects/myproject/Logger.ts: *new* {} -/user/username/projects/myproject/logger.ts: *new* +/user/username/projects/myproject/another.ts: {} /user/username/projects/myproject/tsconfig.json: {} @@ -366,7 +366,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/logger.ts: +/user/username/projects/myproject/Logger.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js index 7d3041aa5ba..3bd8b3c838a 100644 --- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js +++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js @@ -328,8 +328,8 @@ Info seq [hh:mm:ss:mss] getCompletionData: Get previous token: * Info seq [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results Info seq [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: * Info seq [hh:mm:ss:mss] getExportInfoMap: done in * ms -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /library/caches/typescript/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /library/caches/typescript/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Library/Caches/typescript/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Library/Caches/typescript/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache Info seq [hh:mm:ss:mss] collectAutoImports: resolved 1 module specifiers, plus 0 ambient and 0 from cache Info seq [hh:mm:ss:mss] collectAutoImports: response is complete Info seq [hh:mm:ss:mss] collectAutoImports: * @@ -935,6 +935,7 @@ watchedFiles:: watchedDirectoriesRecursive:: /Library/Caches/typescript/node_modules: {} + {} *new* /Library/Caches/typescript/node_modules/@types: {} /Library/Caches/typescript/node_modules/@types/node_modules/@types: @@ -945,7 +946,5 @@ watchedDirectoriesRecursive:: {} /Library/Caches/typescript/node_modules/node_modules/@types: {} -/library/caches/typescript/node_modules: *new* - {} /project: {} diff --git a/tests/baselines/reference/tsserver/fourslashServer/rename01.js b/tests/baselines/reference/tsserver/fourslashServer/rename01.js index 9d41daad5ce..8064f8d10b1 100644 --- a/tests/baselines/reference/tsserver/fourslashServer/rename01.js +++ b/tests/baselines/reference/tsserver/fourslashServer/rename01.js @@ -38,7 +38,7 @@ Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.d.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/bar.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/Bar.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots @@ -77,7 +77,7 @@ watchedFiles:: {"pollingInterval":500} /lib.decorators.legacy.d.ts: *new* {"pollingInterval":500} -/tests/cases/fourslash/server/bar.ts: *new* +/tests/cases/fourslash/server/Bar.ts: *new* {"pollingInterval":500} /tests/cases/fourslash/server/jsconfig.json: *new* {"pollingInterval":2000} diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js index eee56c051ea..b866df2fffd 100644 --- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js +++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js @@ -776,9 +776,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: *new* {} -/a/file2.ts: *new* +/a/file1.ts: {} Before request @@ -833,9 +833,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: *new* {} @@ -890,9 +890,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -1092,9 +1092,9 @@ PolledWatches *deleted*:: {"pollingInterval":500} FsWatches *deleted*:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -1657,9 +1657,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: *new* {} -/a/file2.ts: *new* +/a/file1.ts: {} Before request @@ -1714,9 +1714,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: *new* {} @@ -1771,9 +1771,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -2003,9 +2003,9 @@ PolledWatches *deleted*:: {"pollingInterval":500} FsWatches *deleted*:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -2568,9 +2568,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: *new* {} -/a/file2.ts: *new* +/a/file1.ts: {} Before request @@ -2625,9 +2625,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: *new* {} @@ -2682,9 +2682,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -2884,9 +2884,9 @@ PolledWatches *deleted*:: {"pollingInterval":500} FsWatches *deleted*:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} @@ -3449,9 +3449,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: *new* {} -/a/file2.ts: *new* +/a/file1.ts: {} Before request @@ -3506,9 +3506,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: *new* {} @@ -3563,9 +3563,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/file1.ts: +/A/file2.ts: {} -/a/file2.ts: +/a/file1.ts: {} /b/file2.ts: {} diff --git a/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js b/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js index ce6b6796b59..0bb27805d4d 100644 --- a/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js +++ b/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js @@ -384,7 +384,7 @@ FsWatches:: {} /user/username/projects/myproject/app.ts: {} -/user/username/projects/myproject/jsfile1.js: *new* +/user/username/projects/myproject/jsFile1.js: *new* {} /user/username/projects/myproject/tsconfig.json: {} @@ -557,7 +557,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/jsfile1.js: +/user/username/projects/myproject/jsFile1.js: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/inlayHints/with-updateOpen-request-does-not-corrupt-documents.js b/tests/baselines/reference/tsserver/inlayHints/with-updateOpen-request-does-not-corrupt-documents.js index c781c88e12e..988ec9ddbca 100644 --- a/tests/baselines/reference/tsserver/inlayHints/with-updateOpen-request-does-not-corrupt-documents.js +++ b/tests/baselines/reference/tsserver/inlayHints/with-updateOpen-request-does-not-corrupt-documents.js @@ -161,9 +161,9 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile1.ts: *new* +/a/b/commonFile1.ts: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js index 00815197526..1d8642a2d1c 100644 --- a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js +++ b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js @@ -216,7 +216,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: *new* {} -/user/username/projects/myproject/src/fileb.mts: *new* +/user/username/projects/myproject/src/fileB.mts: *new* {} /user/username/projects/myproject/src/tsconfig.json: *new* {} @@ -695,7 +695,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -902,7 +902,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -1110,7 +1110,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js index 2ea7cbd2332..604f8c6ec02 100644 --- a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js +++ b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js @@ -215,7 +215,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: *new* {} -/user/username/projects/myproject/src/fileb.mts: *new* +/user/username/projects/myproject/src/fileB.mts: *new* {} /user/username/projects/myproject/src/tsconfig.json: *new* {} @@ -688,7 +688,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -902,7 +902,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} @@ -1102,7 +1102,7 @@ FsWatches:: {} /user/username/projects/myproject/package.json: {} -/user/username/projects/myproject/src/fileb.mts: +/user/username/projects/myproject/src/fileB.mts: {} /user/username/projects/myproject/src/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js index 79145d1f2d2..b548e23d922 100644 --- a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js +++ b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js @@ -890,7 +890,7 @@ PolledWatches:: {"pollingInterval":500} /home/src/projects/project/packages/package-b/node_modules/@types: {"pollingInterval":500} -/home/src/projects/project/packages/package-b/package-ax: *new* +/home/src/projects/project/packages/package-b/package-aX: *new* {"pollingInterval":500} PolledWatches *deleted*:: @@ -1148,7 +1148,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/home/src/projects/project/packages/package-b/package-ax: +/home/src/projects/project/packages/package-b/package-aX: {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js index 7d1625dc2d5..d5d10603ad0 100644 --- a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js +++ b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js @@ -682,7 +682,7 @@ PolledWatches:: {"pollingInterval":500} /home/src/projects/project/packages/package-b/node_modules/@types: {"pollingInterval":500} -/home/src/projects/project/packages/package-b/package-ax: *new* +/home/src/projects/project/packages/package-b/package-aX: *new* {"pollingInterval":500} PolledWatches *deleted*:: @@ -940,7 +940,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/home/src/projects/project/packages/package-b/package-ax: +/home/src/projects/project/packages/package-b/package-aX: {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js b/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js index 599b208132a..1b7a26994cb 100644 --- a/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js +++ b/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js @@ -150,7 +150,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -323,7 +323,7 @@ FsWatchesRecursive:: {} Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js b/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js index f336761ae8b..08e61655e72 100644 --- a/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js +++ b/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js @@ -166,7 +166,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -360,7 +360,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with src :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with src/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: src/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /src/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /src/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: src/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with src/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -409,3 +409,37 @@ Timeout callback:: count: 2 8: *ensureProjectForOpenFiles* *deleted* 9: /tsconfig.json *new* 10: *ensureProjectForOpenFiles* *new* + +getPackageJsonsVisibleToFile:: /a.ts undefined + +getPackageJsonsVisibleToFile:: /a.ts undefined:: Result:: [ + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/package.json" + } +] + +getPackageJsonsVisibleToFile:: /src/b.ts undefined + +getPackageJsonsVisibleToFile:: /src/b.ts undefined:: Result:: [ + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/src/package.json" + }, + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/package.json" + } +] diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js b/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js index 9e6de872a4d..fc8d7c66f55 100644 --- a/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js +++ b/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js @@ -166,7 +166,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -355,6 +355,19 @@ FsWatchesRecursive:: /: {} +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined:: Result:: [ + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/package.json" + } +] + Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /package.json 2:: WatchInfo: /package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer TI:: [hh:mm:ss:mss] Got install request { diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js b/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js index 75be18de27c..413bf5dfb99 100644 --- a/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js +++ b/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js @@ -153,7 +153,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -332,6 +332,15 @@ FsWatchesRecursive:: /: {} +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined:: Result:: [ + { + "parseable": false, + "fileName": "/package.json" + } +] + Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer TI:: [hh:mm:ss:mss] Got install request { @@ -447,3 +456,16 @@ PackageJson } } + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined:: Result:: [ + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/package.json" + } +] diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js b/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js index dfd47c02ed9..95aa83fd815 100644 --- a/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js +++ b/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js @@ -153,7 +153,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /tsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /tsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /tsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory @@ -332,6 +332,15 @@ FsWatchesRecursive:: /: {} +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined:: Result:: [ + { + "parseable": false, + "fileName": "/package.json" + } +] + Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer TI:: [hh:mm:ss:mss] Got install request { @@ -447,3 +456,16 @@ packageJson } } + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined + +getPackageJsonsVisibleToFile:: /src/whatever/blah.ts undefined:: Result:: [ + { + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "peerDependencies": {}, + "parseable": true, + "fileName": "/package.json" + } +] diff --git a/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js b/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js index d9f58aa16af..84b2cece1bc 100644 --- a/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js +++ b/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js @@ -74,7 +74,7 @@ PluginFactory Invoke Info seq [hh:mm:ss:mss] Plugin validation succeeded Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/somefile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/someFile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots @@ -179,7 +179,7 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/somefile.txt: *new* +/user/username/projects/myproject/someFile.txt: *new* {"pollingInterval":500} /user/username/projects/node_modules/@types: *new* {"pollingInterval":500} @@ -251,8 +251,8 @@ Require:: some-other-plugin PluginFactory Invoke Info seq [hh:mm:ss:mss] Plugin validation succeeded Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/somefile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/someotherfile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/someFile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/someOtherFile.txt 500 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -320,13 +320,13 @@ After running Timeout callback:: count: 0 PolledWatches:: /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/someotherfile.txt: *new* +/user/username/projects/myproject/someOtherFile.txt: *new* {"pollingInterval":500} /user/username/projects/node_modules/@types: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/somefile.txt: +/user/username/projects/myproject/someFile.txt: {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js index 3f953213751..6c603bba99d 100644 --- a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js +++ b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js @@ -37,8 +37,8 @@ Info seq [hh:mm:ss:mss] Search path: Info seq [hh:mm:ss:mss] For info: untitled:Untitled-1 :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/someuser/projects/somefolder/src/somefile.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/someuser/projects/someFolder/src/somefile.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/someuser/projects/someFolder/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/someuser/projects/someFolder/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/someuser/projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots @@ -70,17 +70,17 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/typings/@epic/core.d.ts: *new* +/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} /user/someuser/projects/node_modules/@types: *new* {"pollingInterval":500} -/user/someuser/projects/somefolder/node_modules/@types: *new* +/user/someuser/projects/someFolder/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/someuser/projects/somefolder/src/somefile.d.ts: *new* +/user/someuser/projects/someFolder/src/somefile.d.ts: *new* {} diff --git a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js index 974884ea5af..4d3205f17f4 100644 --- a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js +++ b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js @@ -36,7 +36,7 @@ Info seq [hh:mm:ss:mss] Search path: Info seq [hh:mm:ss:mss] For info: untitled:Untitled-1 :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /src/somefile.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) @@ -65,7 +65,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/typings/@epic/core.d.ts: *new* +/typings/@epic/Core.d.ts: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js b/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js index f76a8ea7731..97aa546136b 100644 --- a/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js +++ b/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js @@ -536,7 +536,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: *new* +/user/username/projects/container/compositeExec/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/container/node_modules/@types: *new* {"pollingInterval":500} @@ -546,7 +546,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/container/compositeexec/tsconfig.json: *new* +/user/username/projects/container/compositeExec/tsconfig.json: *new* {} /user/username/projects/container/lib/index.ts: *new* {} @@ -612,7 +612,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/node_modules/@types: {"pollingInterval":500} @@ -628,7 +628,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/lib/index.ts: {} @@ -1039,7 +1039,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: *new* {"pollingInterval":500} @@ -1059,7 +1059,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: *new* {} @@ -1101,7 +1101,7 @@ Info seq [hh:mm:ss:mss] Projects: /user/username/projects/container/composite Before request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: {"pollingInterval":500} @@ -1123,7 +1123,7 @@ PolledWatches *deleted*:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: {} @@ -1187,7 +1187,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: {"pollingInterval":500} @@ -1207,7 +1207,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: {} @@ -1275,7 +1275,7 @@ Info seq [hh:mm:ss:mss] Open files: Before request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: {"pollingInterval":500} @@ -1297,9 +1297,9 @@ PolledWatches *deleted*:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/index.ts: *new* +/user/username/projects/container/compositeExec/index.ts: *new* {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: {} @@ -1436,7 +1436,7 @@ PolledWatches:: {"pollingInterval":2000} PolledWatches *deleted*:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: {"pollingInterval":500} @@ -1450,9 +1450,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/container/compositeexec/index.ts: +/user/username/projects/container/compositeExec/index.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js b/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js index 24ec7c77482..4d03b54e45e 100644 --- a/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js +++ b/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js @@ -533,7 +533,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: *new* +/user/username/projects/container/compositeExec/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/container/node_modules/@types: *new* {"pollingInterval":500} @@ -543,7 +543,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/container/compositeexec/tsconfig.json: *new* +/user/username/projects/container/compositeExec/tsconfig.json: *new* {} /user/username/projects/container/lib/index.ts: *new* {} @@ -954,7 +954,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: +/user/username/projects/container/compositeExec/node_modules/@types: {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: *new* {"pollingInterval":500} @@ -968,7 +968,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/container/compositeexec/tsconfig.json: +/user/username/projects/container/compositeExec/tsconfig.json: {} /user/username/projects/container/exec/index.ts: *new* {} diff --git a/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js b/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js index 0f2413eb343..0c7ce740fb7 100644 --- a/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js +++ b/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js @@ -768,7 +768,7 @@ declare namespace container { PolledWatches:: -/user/username/projects/container/compositeexec/node_modules/@types: *new* +/user/username/projects/container/compositeExec/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/container/exec/node_modules/@types: *new* {"pollingInterval":500} @@ -782,9 +782,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/container/compositeexec/index.ts: *new* +/user/username/projects/container/compositeExec/index.ts: *new* {} -/user/username/projects/container/compositeexec/tsconfig.json: *new* +/user/username/projects/container/compositeExec/tsconfig.json: *new* {} /user/username/projects/container/exec/index.ts: *new* {} diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js index 5aa272ae6fa..8be3272a7ce 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js @@ -285,8 +285,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -302,8 +302,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -427,9 +427,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -441,23 +441,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js index 193ce052576..ae52918409a 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js @@ -282,8 +282,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -298,8 +298,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -422,9 +422,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -436,23 +436,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js index aadd281096e..1c34fc75651 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js @@ -107,8 +107,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -124,8 +124,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -249,9 +249,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -263,23 +263,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js index 2ae15357c70..09df26beee5 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js @@ -104,8 +104,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -120,8 +120,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -244,9 +244,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -258,23 +258,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js index 7306cae5030..c779f5e9904 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js @@ -285,8 +285,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -302,8 +302,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -427,9 +427,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -441,23 +441,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js index 42d54d7dd5b..b440358ae5f 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js @@ -282,8 +282,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -298,8 +298,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -422,9 +422,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -436,23 +436,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js index ab8d2b19209..3287d394958 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js @@ -107,8 +107,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -124,8 +124,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -249,9 +249,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -263,23 +263,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js index 69d1ebc01f1..ce90faf2aac 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js @@ -104,8 +104,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -120,8 +120,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/index.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -244,9 +244,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -258,23 +258,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar.ts: *new* +/user/username/projects/myproject/packages/B/src/bar.ts: *new* {} -/user/username/projects/myproject/packages/b/src/index.ts: *new* +/user/username/projects/myproject/packages/B/src/index.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js index 97236e030b7..c4340b8ed4c 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js @@ -282,8 +282,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -299,8 +299,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -424,9 +424,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -438,23 +438,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js index bc53224476a..d7b37ab1c43 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js @@ -279,8 +279,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -295,8 +295,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -419,9 +419,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -433,23 +433,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js index ef74f33332e..99d72bea294 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js @@ -104,8 +104,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -121,8 +121,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -246,9 +246,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -260,23 +260,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js index f4aceeb0d8a..f6f05c2857f 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js @@ -101,8 +101,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -117,8 +117,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -241,9 +241,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -255,23 +255,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js index e3ff3362f6e..14f24ffaee6 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js @@ -282,8 +282,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -299,8 +299,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -424,9 +424,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -438,23 +438,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js index 2947fe597c7..890b7a87277 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js @@ -279,8 +279,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -295,8 +295,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -419,9 +419,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -433,23 +433,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js index 5e167922685..7f64f4636f7 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js @@ -104,8 +104,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -121,8 +121,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -246,9 +246,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -260,23 +260,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js index 1612db75b3c..63f85deaa8c 100644 --- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js @@ -101,8 +101,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/A/ts } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/a/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/A/src 1 undefined Config: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/tsconfig.json : { "rootNames": [ @@ -117,8 +117,8 @@ Info seq [hh:mm:ss:mss] Config: /user/username/projects/myproject/packages/B/ts } } Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/packages/A/tsconfig.json WatchType: Config file -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/b/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src 1 undefined Config: /user/username/projects/myproject/packages/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/packages/B/src/bar/foo.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info @@ -241,9 +241,9 @@ After request PolledWatches:: /user/username/projects/myproject/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules: *new* +/user/username/projects/myproject/packages/A/node_modules: *new* {"pollingInterval":500} -/user/username/projects/myproject/packages/a/node_modules/@types: *new* +/user/username/projects/myproject/packages/A/node_modules/@types: *new* {"pollingInterval":500} /user/username/projects/myproject/packages/node_modules: *new* {"pollingInterval":500} @@ -255,23 +255,23 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/packages/a/tsconfig.json: *new* +/user/username/projects/myproject/packages/A/tsconfig.json: *new* {} -/user/username/projects/myproject/packages/b/package.json: *new* +/user/username/projects/myproject/packages/B/package.json: *new* {} -/user/username/projects/myproject/packages/b/src/bar/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/bar/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/src/foo.ts: *new* +/user/username/projects/myproject/packages/B/src/foo.ts: *new* {} -/user/username/projects/myproject/packages/b/tsconfig.json: *new* +/user/username/projects/myproject/packages/B/tsconfig.json: *new* {} FsWatchesRecursive:: /user/username/projects/myproject/node_modules: *new* {} -/user/username/projects/myproject/packages/a/src: *new* +/user/username/projects/myproject/packages/A/src: *new* {} -/user/username/projects/myproject/packages/b/src: *new* +/user/username/projects/myproject/packages/B/src: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js index 5549f75923a..002d6b29b1b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js index 3ee244e1a04..94d80aaf296 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js index 1031448d25c..c41e2b7df71 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js @@ -596,7 +596,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -650,13 +650,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -752,9 +752,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1061,9 +1061,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1124,9 +1124,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1185,11 +1185,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1242,11 +1242,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1333,11 +1333,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js index 0f57146db1d..0387ee16972 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -653,7 +653,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -661,7 +661,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} FsWatchesRecursive:: @@ -740,7 +740,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -754,7 +754,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1049,7 +1049,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1063,7 +1063,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1113,7 +1113,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1133,7 +1133,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1174,7 +1174,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1188,7 +1188,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1229,7 +1229,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1243,7 +1243,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1318,7 +1318,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1330,7 +1330,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js index dd5b3cceab8..d11a4562e10 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js @@ -596,7 +596,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -903,7 +903,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -964,7 +964,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1023,7 +1023,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1037,7 +1037,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1078,7 +1078,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1092,7 +1092,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1167,7 +1167,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1179,7 +1179,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js index 0835ee95743..a70e360c94e 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js index e899713c0df..bc5c29d40fd 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js index 6c287aa05de..5a63e9dda16 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -616,7 +616,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -650,13 +650,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -751,9 +751,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1060,9 +1060,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1123,9 +1123,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1184,11 +1184,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1241,11 +1241,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1331,11 +1331,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js index 6c11473f91c..7b0902ec43d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -653,7 +653,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -661,7 +661,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -740,7 +740,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -754,7 +754,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1049,7 +1049,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1063,7 +1063,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1112,7 +1112,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1126,7 +1126,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1173,7 +1173,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1187,9 +1187,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1230,7 +1230,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1244,9 +1244,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1322,7 +1322,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1334,9 +1334,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js index b49c79bc291..e6e83f1ef80 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -616,7 +616,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -911,7 +911,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -925,7 +925,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -974,7 +974,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -988,7 +988,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1035,7 +1035,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1049,9 +1049,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1092,7 +1092,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1106,9 +1106,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1184,7 +1184,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1196,9 +1196,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js index 51a7bc6989a..6be8e9d3437 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -926,9 +926,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -989,9 +989,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1050,11 +1050,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1107,11 +1107,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1197,11 +1197,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js index 62c5af410d1..15905b2320b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js index e2cb9909485..be64d7a5531 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js @@ -617,9 +617,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js index d11ced63404..e0a76880e26 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js index 9f8c5b155ba..c4cdde00f2a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js index c4eb21ed350..bc5447c2826 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js @@ -601,7 +601,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -655,13 +655,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -757,9 +757,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1066,9 +1066,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1129,9 +1129,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1190,11 +1190,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1247,11 +1247,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1338,11 +1338,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js index df174dc7f8e..4d739ec48e7 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -658,7 +658,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -666,7 +666,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} FsWatchesRecursive:: @@ -745,7 +745,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -759,7 +759,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1054,7 +1054,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1068,7 +1068,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1118,7 +1118,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1138,7 +1138,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1179,7 +1179,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1193,7 +1193,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1234,7 +1234,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1248,7 +1248,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1323,7 +1323,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1335,7 +1335,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js index cec2ccabf6a..8fd311d4a67 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js @@ -601,7 +601,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -908,7 +908,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -969,7 +969,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1028,7 +1028,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1042,7 +1042,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1083,7 +1083,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1097,7 +1097,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1172,7 +1172,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1184,7 +1184,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js index ecd6c7d837e..095febf94ea 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js index c872dd2b7ca..d51a018ff69 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js index d854c4cd6bf..cb652e30748 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js @@ -607,7 +607,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -621,7 +621,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -655,13 +655,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -756,9 +756,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1065,9 +1065,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1128,9 +1128,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1189,11 +1189,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1246,11 +1246,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1336,11 +1336,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js index 20d6a35bc06..07926ced970 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -658,7 +658,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -666,7 +666,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -745,7 +745,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -759,7 +759,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1054,7 +1054,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1068,7 +1068,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1117,7 +1117,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1131,7 +1131,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1178,7 +1178,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1192,9 +1192,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1235,7 +1235,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1249,9 +1249,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1327,7 +1327,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1339,9 +1339,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js index 20d1658be32..7eb60862d3a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js @@ -607,7 +607,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -621,7 +621,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -916,7 +916,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -930,7 +930,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -979,7 +979,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -993,7 +993,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1040,7 +1040,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1054,9 +1054,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1097,7 +1097,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1111,9 +1111,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1189,7 +1189,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1201,9 +1201,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js index 7fa46b8249d..290c89e2092 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js index 428c3c0fae2..1f5e1919dd0 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js index 58813ebf8ee..16015dfb728 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -931,9 +931,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -994,9 +994,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1055,11 +1055,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1112,11 +1112,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1202,11 +1202,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js index 2081a70e9c8..11c551a0c78 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js index db87c560acf..81e00018653 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js @@ -622,9 +622,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js index 9b1d880b89f..d477a1523fd 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js @@ -446,7 +446,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -753,7 +753,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -814,7 +814,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -873,7 +873,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -887,7 +887,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -928,7 +928,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -942,7 +942,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1017,7 +1017,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1029,7 +1029,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js index 5674bbb0fd9..43f340da0e4 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js index eec3c0e0813..782f0d551cf 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js index a368dcc381f..c6de66319e4 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -656,13 +656,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -758,9 +758,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1067,9 +1067,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1130,9 +1130,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1191,11 +1191,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1248,11 +1248,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1339,11 +1339,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js index 0a002fb1517..f9de1540cc2 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -659,7 +659,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -667,7 +667,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} FsWatchesRecursive:: @@ -746,7 +746,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -760,7 +760,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1055,7 +1055,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1069,7 +1069,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1119,7 +1119,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1139,7 +1139,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1180,7 +1180,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1194,7 +1194,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1235,7 +1235,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1249,7 +1249,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1324,7 +1324,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1336,7 +1336,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js index 0120a46f18d..c89f3095e77 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -909,7 +909,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -970,7 +970,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1029,7 +1029,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1043,7 +1043,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1084,7 +1084,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1098,7 +1098,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1173,7 +1173,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1185,7 +1185,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js index 97b8c4689bf..023a3f45301 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js index 1411686ac96..7be9a1b21e1 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js index 01aba147f81..c4fd948f798 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js @@ -608,7 +608,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -622,7 +622,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -656,13 +656,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -757,9 +757,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1066,9 +1066,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1129,9 +1129,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1190,11 +1190,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1247,11 +1247,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1337,11 +1337,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js index f424907c636..ad370cf3255 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -659,7 +659,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -667,7 +667,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -746,7 +746,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -760,7 +760,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1055,7 +1055,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1069,7 +1069,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1118,7 +1118,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1132,7 +1132,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1179,7 +1179,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1193,9 +1193,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1236,7 +1236,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1250,9 +1250,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1328,7 +1328,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1340,9 +1340,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js index d38949d6bd9..d1958023b0b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js @@ -608,7 +608,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -622,7 +622,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -917,7 +917,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -931,7 +931,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -980,7 +980,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -994,7 +994,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1041,7 +1041,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1055,9 +1055,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1098,7 +1098,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1112,9 +1112,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1190,7 +1190,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1202,9 +1202,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js index d4895a2a0a3..88a403c3334 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -932,9 +932,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -995,9 +995,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1056,11 +1056,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1113,11 +1113,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1203,11 +1203,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js index ab879cc484f..517d3858466 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js index 3f11c28347a..72780950d4f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js @@ -623,9 +623,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js index 7e6e3c20258..5567dad98d9 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js index 0882446ae46..231885cff60 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js index 6f4cb367cbc..16e264b188a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js @@ -834,7 +834,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -901,13 +901,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1016,9 +1016,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1794,9 +1794,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1871,9 +1871,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1946,9 +1946,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2017,11 +2017,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2088,11 +2088,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2217,11 +2217,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js index b0d0690c1e6..855845e2e19 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -950,7 +950,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1325,7 +1325,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1341,7 +1341,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1648,7 +1648,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1664,7 +1664,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1726,7 +1726,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1750,7 +1750,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1801,7 +1801,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1870,7 +1870,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1886,7 +1886,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1939,7 +1939,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1955,7 +1955,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2063,7 +2063,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2077,7 +2077,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js index 53d1d579062..ab480c9884f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js @@ -1042,7 +1042,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1363,7 +1363,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1438,7 +1438,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1511,7 +1511,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1580,7 +1580,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1596,7 +1596,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1649,7 +1649,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1665,7 +1665,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1773,7 +1773,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1787,7 +1787,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js index c7dbdd78c8c..cba8e2df384 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js index 72b5e2f9ad8..d2cd99ade5f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js index d0ad17b245b..9691795057d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js @@ -786,7 +786,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -911,7 +911,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: @@ -1010,9 +1010,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1782,9 +1782,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1859,9 +1859,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1934,9 +1934,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2005,11 +2005,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2076,11 +2076,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2204,11 +2204,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js index b5dcae56671..3cd46c713a8 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -959,7 +959,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -1032,7 +1032,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1629,7 +1629,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1706,7 +1706,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1781,7 +1781,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1852,7 +1852,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1870,7 +1870,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1923,7 +1923,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1941,7 +1941,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2053,7 +2053,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2069,7 +2069,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js index 7309c7d01b5..cef6df862fe 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js @@ -786,7 +786,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1380,7 +1380,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1457,7 +1457,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1532,7 +1532,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1603,7 +1603,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1621,7 +1621,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1674,7 +1674,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1692,7 +1692,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1804,7 +1804,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1820,7 +1820,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js index be014bc9132..35e60cb55e3 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1572,9 +1572,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1649,9 +1649,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1724,9 +1724,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1795,11 +1795,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1866,11 +1866,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1994,11 +1994,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js index ac98333602f..8513b860fec 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js index d946ba4fbbf..92f788678e2 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js @@ -803,9 +803,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js index 564f290b445..f092fcea34d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js index 282858f601d..afb82089e15 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js index 01a90c21b59..ba06f84dcd0 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js @@ -394,7 +394,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -559,7 +559,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -895,7 +895,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -962,13 +962,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1373,9 +1373,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1836,9 +1836,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1913,9 +1913,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1988,9 +1988,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2059,11 +2059,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2130,11 +2130,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2259,11 +2259,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js index b9655d03406..051372fc105 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -966,7 +966,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -976,7 +976,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} FsWatchesRecursive:: @@ -1365,7 +1365,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1381,7 +1381,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1828,7 +1828,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1844,7 +1844,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1906,7 +1906,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1930,7 +1930,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1981,7 +1981,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2050,7 +2050,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2066,7 +2066,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2119,7 +2119,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2135,7 +2135,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2246,7 +2246,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2260,7 +2260,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js index 2adeb59fc42..1867e4e11ac 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js @@ -394,7 +394,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -559,7 +559,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -1103,7 +1103,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1564,7 +1564,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1639,7 +1639,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1712,7 +1712,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1781,7 +1781,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1797,7 +1797,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1850,7 +1850,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1866,7 +1866,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1977,7 +1977,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1991,7 +1991,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js index 2ecd5d9b04c..813772e32a3 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js index 3ab09877aa2..55395034d02 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js index bde9acf2971..cabe3055206 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js @@ -399,7 +399,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -564,7 +564,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -901,7 +901,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -917,7 +917,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -962,13 +962,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1370,9 +1370,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1833,9 +1833,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1910,9 +1910,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1985,9 +1985,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2056,11 +2056,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2127,11 +2127,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2255,11 +2255,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js index c9f4bc59173..a099edca0c7 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -965,7 +965,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -975,7 +975,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -1357,7 +1357,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1373,7 +1373,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1820,7 +1820,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1836,7 +1836,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1897,7 +1897,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1913,7 +1913,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1972,7 +1972,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1988,7 +1988,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2043,7 +2043,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2059,9 +2059,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2114,7 +2114,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2130,9 +2130,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2244,7 +2244,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2258,9 +2258,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js index 388aa820254..9893dd41acb 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js @@ -399,7 +399,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -564,7 +564,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -1109,7 +1109,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1125,7 +1125,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1572,7 +1572,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1588,7 +1588,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1649,7 +1649,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1665,7 +1665,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1724,7 +1724,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1740,7 +1740,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1795,7 +1795,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1811,9 +1811,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1866,7 +1866,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1882,9 +1882,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1996,7 +1996,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2010,9 +2010,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js index 0f89bf6e417..de6a2a2974f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js index 347a0ac7b7a..d6ce20a2584 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js index 3eb56ba3bd6..6a37100adcb 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -1126,9 +1126,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1589,9 +1589,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1666,9 +1666,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1741,9 +1741,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1812,11 +1812,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1883,11 +1883,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2011,11 +2011,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js index a0f071ffa64..862cb14eca0 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js index 65f32bf5045..9cd14d29c41 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -567,7 +567,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -918,9 +918,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js index c951a788fb5..6055183f5f7 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js @@ -241,7 +241,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -406,7 +406,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} FsWatchesRecursive:: @@ -950,7 +950,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1411,7 +1411,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1486,7 +1486,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1559,7 +1559,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1628,7 +1628,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1644,7 +1644,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1697,7 +1697,7 @@ After request PolledWatches:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1713,7 +1713,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1824,7 +1824,7 @@ PolledWatches:: PolledWatches *deleted*:: /user/username/projects/myproject/decls: {"pollingInterval":500} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1838,7 +1838,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js index e63a9bcbeeb..75b4c2543d6 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js index d471718ba0c..60d2edf9bc3 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js index 5fcf749a5a5..072fdc4fb11 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js @@ -852,7 +852,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -919,13 +919,13 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1034,9 +1034,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1812,9 +1812,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1889,9 +1889,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1964,9 +1964,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2035,11 +2035,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2106,11 +2106,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2235,11 +2235,11 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js index 36c9dd7287d..21138cf1a85 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -968,7 +968,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1343,7 +1343,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1359,7 +1359,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1666,7 +1666,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1682,7 +1682,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1744,7 +1744,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1768,7 +1768,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} /user/username/projects/myproject/random/random.ts: {} @@ -1819,7 +1819,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1888,7 +1888,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1904,7 +1904,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1957,7 +1957,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1973,7 +1973,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2081,7 +2081,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2095,7 +2095,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js index a38319a93fc..9fa93f8cbc5 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js @@ -1060,7 +1060,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: *new* +/user/username/projects/myproject/decls/FnS.d.ts: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1381,7 +1381,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1456,7 +1456,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1529,7 +1529,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1598,7 +1598,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1614,7 +1614,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1667,7 +1667,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1683,7 +1683,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1791,7 +1791,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1805,7 +1805,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js index 166475d026f..1ab22fe47db 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js index e7ae7cda44e..4bdaae1517e 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js index 3dffc008157..a7bc2a3abb9 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js @@ -804,7 +804,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -929,7 +929,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: @@ -1028,9 +1028,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1800,9 +1800,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1877,9 +1877,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1952,9 +1952,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2023,11 +2023,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2094,11 +2094,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2222,11 +2222,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js index b226fe289fd..f5055406622 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -977,7 +977,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -1050,7 +1050,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1647,7 +1647,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1724,7 +1724,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1799,7 +1799,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1870,7 +1870,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1888,7 +1888,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1941,7 +1941,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1959,7 +1959,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2071,7 +2071,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -2087,7 +2087,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js index c27b5a0d13e..2ada9fd4a0d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js @@ -804,7 +804,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1398,7 +1398,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1475,7 +1475,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1550,7 +1550,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1621,7 +1621,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1639,7 +1639,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1692,7 +1692,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1710,7 +1710,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1822,7 +1822,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/dependency/node_modules/@types: {"pollingInterval":500} @@ -1838,7 +1838,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js index 5c7b296a5a4..cdbd4cf7ff6 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1590,9 +1590,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1667,9 +1667,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1742,9 +1742,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1813,11 +1813,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1884,11 +1884,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -2012,11 +2012,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js index db4215110dd..2fce283ebad 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js index ef95e01d5f0..94146420152 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js @@ -821,9 +821,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts: +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/fns.d.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js index 96d7fba0502..8d4321ae7d6 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -887,11 +887,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -954,11 +954,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1019,11 +1019,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: *new* {} @@ -1080,11 +1080,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} @@ -1180,11 +1180,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js index 9501beb60ba..99b0dfd5048 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js index 3a113710e1a..aa389d72ba6 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js index 9404251ae13..c8f894b9d2d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js @@ -687,11 +687,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -960,11 +960,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1027,11 +1027,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1092,11 +1092,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: *new* {} @@ -1153,11 +1153,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} @@ -1253,11 +1253,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js index 8f03fbb19c4..a7401b4a1ac 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -661,9 +661,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1006,9 +1006,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1079,9 +1079,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/random/random.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js index 621bd37ccf3..5d70dfdbd93 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js index c541a1fcf32..ce8652cfd76 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js index d71e8102e1a..91829506ca5 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -654,7 +654,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: @@ -747,11 +747,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1016,11 +1016,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1083,11 +1083,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1148,11 +1148,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: *new* {} @@ -1209,11 +1209,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} @@ -1309,11 +1309,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/main.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js index 8eab6effb17..7d2cb16591d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -662,7 +662,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -670,7 +670,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -740,7 +740,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -756,7 +756,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1009,7 +1009,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1025,7 +1025,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/main/tsconfig.json: {} @@ -1077,7 +1077,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1099,7 +1099,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/random/random.ts: {} @@ -1142,7 +1142,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1201,7 +1201,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1300,7 +1300,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js index 3fa215874c0..c726e2e4f8f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js @@ -602,7 +602,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -869,7 +869,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -934,7 +934,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -997,7 +997,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1056,7 +1056,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1155,7 +1155,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js index cadb944be44..bf640e22377 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js index 90eb957ed14..26ec68b096a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js @@ -618,11 +618,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/main/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js index cd35f567f8d..91f6ba188de 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -886,7 +886,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -953,7 +953,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1018,7 +1018,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1079,7 +1079,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1180,7 +1180,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js index b6f7de16ac5..fdc6be0dc17 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js index 7178a05cac7..1777b99dbeb 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js index d0a9d282bc6..a0f84f29dcd 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js @@ -394,7 +394,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -557,7 +557,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -947,7 +947,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1014,7 +1014,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1079,7 +1079,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1140,7 +1140,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1241,7 +1241,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js index 7c22988c191..624598231a9 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -948,7 +948,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1015,7 +1015,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1080,7 +1080,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1141,7 +1141,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1242,7 +1242,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js index f0f2c47ad5e..0df149d2c0a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js @@ -394,7 +394,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -557,7 +557,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -878,7 +878,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -945,7 +945,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1010,7 +1010,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1071,7 +1071,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1172,7 +1172,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js index eaa1b04c0c7..7bc692fe07c 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js index 691871708f5..90c79d11abd 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js index f08c2a8ff01..efd8f3fde9b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js @@ -399,7 +399,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -562,7 +562,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -940,7 +940,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1007,7 +1007,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1072,7 +1072,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1133,7 +1133,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1234,7 +1234,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js index 5a48680d665..ff62759012f 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -941,7 +941,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1008,7 +1008,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1073,7 +1073,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1134,7 +1134,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1235,7 +1235,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js index 134e7b7cbb1..4b21906ad1b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js @@ -399,7 +399,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -562,7 +562,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -883,7 +883,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -950,7 +950,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1015,7 +1015,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1076,7 +1076,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1177,7 +1177,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js index 8208297f5a4..3b32bae58a8 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js index f5f6e30bf2a..0d82ea3602c 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js index 6af26730d70..9ae8af36320 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js index af028758396..13e261a67f1 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -565,7 +565,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js index 166f2fd474b..0e0928401b1 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js @@ -241,7 +241,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: *new* {} @@ -404,7 +404,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -725,7 +725,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -792,7 +792,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -857,7 +857,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -918,7 +918,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1019,7 +1019,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js index e42bedb0a23..e9a722337f0 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -927,11 +927,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -998,11 +998,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1067,11 +1067,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1132,11 +1132,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1239,11 +1239,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js index 97860b7beae..82089dc8e9d 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js index 456acd7dd35..76283269315 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js index 4fe99c02e2e..757066c487b 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js @@ -723,11 +723,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: *new* {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1000,11 +1000,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1071,11 +1071,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1140,11 +1140,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1205,11 +1205,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1312,11 +1312,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js index d3ae53812b6..0823f4b6489 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -701,9 +701,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1050,9 +1050,9 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1129,9 +1129,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/random/random.ts: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js index 40e6200d934..ee2ab7f8413 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js index e4cfe9a0fe5..9e8235d68b9 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js index a42e35f2649..2f7c5376341 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js @@ -638,7 +638,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -694,7 +694,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} FsWatches:: @@ -791,11 +791,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1064,11 +1064,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1135,11 +1135,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1204,11 +1204,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1269,11 +1269,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1376,11 +1376,11 @@ FsWatches:: {} FsWatches *deleted*:: +/user/username/projects/myproject/decls/FnS.d.ts.map: + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: - {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js index 2986a626b45..585116d8cff 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -702,7 +702,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -712,7 +712,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {} FsWatchesRecursive:: @@ -784,7 +784,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -800,7 +800,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1057,7 +1057,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1073,7 +1073,7 @@ FsWatches:: {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/dependency/tsconfig.json: {} @@ -1129,7 +1129,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1153,7 +1153,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/dependency/fns.ts: +/user/username/projects/myproject/dependency/FnS.ts: {} /user/username/projects/myproject/random/random.ts: {} @@ -1198,7 +1198,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1261,7 +1261,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1367,7 +1367,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js index 8884d2401bf..fe00bfbebba 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js @@ -638,7 +638,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: *new* +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -909,7 +909,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -978,7 +978,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1045,7 +1045,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1108,7 +1108,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} @@ -1214,7 +1214,7 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/user/username/projects/myproject/decls/fns.d.ts.map: +/user/username/projects/myproject/decls/FnS.d.ts.map: {"pollingInterval":2000} /user/username/projects/myproject/main/node_modules/@types: {"pollingInterval":500} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js index 5bc85a9610f..cdd33e297cb 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js index dc1308a463b..0deeba6839a 100644 --- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js +++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js @@ -654,11 +654,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject/decls/FnS.d.ts.map: *new* + {} /user/username/projects/myproject/decls/fns.d.ts: {} -/user/username/projects/myproject/decls/fns.d.ts.map: *new* - {} -/user/username/projects/myproject/dependency/fns.ts: *new* +/user/username/projects/myproject/dependency/FnS.ts: *new* {} /user/username/projects/myproject/dependency/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/projects/Properly-handle-Windows-style-outDir.js b/tests/baselines/reference/tsserver/projects/Properly-handle-Windows-style-outDir.js index 36c9cf34b62..9385c729804 100644 --- a/tests/baselines/reference/tsserver/projects/Properly-handle-Windows-style-outDir.js +++ b/tests/baselines/reference/tsserver/projects/Properly-handle-Windows-style-outDir.js @@ -47,8 +47,8 @@ Info seq [hh:mm:ss:mss] Config: C:/a/tsconfig.json : { "configFilePath": "C:/a/tsconfig.json" } } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/a 0 undefined Config: C:/a/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/a 0 undefined Config: C:/a/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: C:/a 0 undefined Config: C:/a/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: C:/a 0 undefined Config: C:/a/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: C:/a/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined Project: C:/a/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: C:/a/node_modules/@types 1 undefined Project: C:/a/tsconfig.json WatchType: Type roots @@ -186,13 +186,13 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -c:/a/lib/lib.d.ts: *new* +C:/a/node_modules/@types: *new* {"pollingInterval":500} -c:/a/node_modules/@types: *new* +c:/a/lib/lib.d.ts: *new* {"pollingInterval":500} FsWatches:: -c:/a: *new* +C:/a: *new* {} -c:/a/tsconfig.json: *new* +C:/a/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/projects/assert-when-removing-project.js b/tests/baselines/reference/tsserver/projects/assert-when-removing-project.js index fccee81197a..6e103628aeb 100644 --- a/tests/baselines/reference/tsserver/projects/assert-when-removing-project.js +++ b/tests/baselines/reference/tsserver/projects/assert-when-removing-project.js @@ -71,7 +71,7 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 50 Before request FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/lib/lib.d.ts: {} diff --git a/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js b/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js index bf9896276c3..e65d9a6a8e8 100644 --- a/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js +++ b/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js @@ -32,7 +32,7 @@ Info seq [hh:mm:ss:mss] Search path: /a/b Info seq [hh:mm:ss:mss] For info: /a/b/commonFile1.ts :: No config files found. Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/commonfile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (2) @@ -60,7 +60,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {"pollingInterval":500} FsWatches:: @@ -112,11 +112,11 @@ Info seq [hh:mm:ss:mss] response: } After request -Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /a/b/commonfile2.ts 0:: WatchInfo: /a/b/commonfile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/commonfile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /a/b/commonFile2.ts 0:: WatchInfo: /a/b/commonFile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/commonFile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Scheduled: /dev/null/inferredProject1* Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* -Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /a/b/commonfile2.ts 0:: WatchInfo: /a/b/commonfile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /a/b/commonFile2.ts 0:: WatchInfo: /a/b/commonFile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Before running Timeout callback:: count: 2 1: /dev/null/inferredProject1* 2: *ensureProjectForOpenFiles* @@ -125,7 +125,7 @@ let y = 1 PolledWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {"pollingInterval":500} FsWatches:: @@ -187,7 +187,7 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/lib/lib.d.ts: {} diff --git a/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js b/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js index 5b58f0d535c..352b80bf060 100644 --- a/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js +++ b/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js @@ -203,7 +203,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/myproject/apps/editor/scripts/createconfigvariable.js: *new* +/user/username/projects/myproject/apps/editor/scripts/createConfigVariable.js: *new* {} /user/username/projects/myproject/apps/editor/src/src.js: *new* {} @@ -246,11 +246,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject/apps/editor/scripts/createconfigvariable.js: +/user/username/projects/myproject/apps/editor/scripts/createConfigVariable.js: {} /user/username/projects/myproject/apps/editor/src/src.js: {} -/user/username/projects/myproject/mocks/cssmock.js: *new* +/user/username/projects/myproject/mocks/cssMock.js: *new* {} /user/username/projects/myproject/tsconfig.json: {} @@ -474,9 +474,9 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/apps/editor/scripts/createconfigvariable.js: +/user/username/projects/myproject/apps/editor/scripts/createConfigVariable.js: {} -/user/username/projects/myproject/mocks/cssmock.js: +/user/username/projects/myproject/mocks/cssMock.js: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js b/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js index 3bf2cd1e855..4eadda07b4e 100644 --- a/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js +++ b/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js @@ -728,6 +728,7 @@ Info seq [hh:mm:ss:mss] Files (1) Info seq [hh:mm:ss:mss] ----------------------------------------------- Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/tsconfig.json 2000 undefined Project: /a/tsconfig.json WatchType: Config file Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] `remove Project:: @@ -782,11 +783,9 @@ PolledWatches *deleted*:: /a/node_modules: {"pollingInterval":500} -FsWatches:: +FsWatches *deleted*:: /a/data/package.json: {} - -FsWatches *deleted*:: /a/main.js: {} /a/main.ts: diff --git a/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js b/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js index 3278e0fc5a9..f521497b587 100644 --- a/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js +++ b/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js @@ -187,7 +187,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} @@ -449,5 +449,5 @@ FsWatches:: {} FsWatches *deleted*:: -/a/b/commonfile2.ts: +/a/b/commonFile2.ts: {} diff --git a/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-redirect-info-when-requested.js b/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-redirect-info-when-requested.js index 17a9637d5cd..fdcd43e6c60 100644 --- a/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-redirect-info-when-requested.js +++ b/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-redirect-info-when-requested.js @@ -73,8 +73,8 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/A/tsconfig.jso "configFilePath": "/users/username/projects/project/A/tsconfig.json" } } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/a 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/a 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/A/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A/node_modules/@types 1 undefined Project: /users/username/projects/project/A/tsconfig.json WatchType: Type roots @@ -178,7 +178,7 @@ After request PolledWatches:: /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/a/node_modules/@types: *new* +/users/username/projects/project/A/node_modules/@types: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -186,11 +186,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/a/tsconfig.json: *new* +/users/username/projects/project/A/tsconfig.json: *new* {} FsWatchesRecursive:: -/users/username/projects/project/a: *new* +/users/username/projects/project/A: *new* {} Before request @@ -234,8 +234,8 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/B/tsconfig.jso } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/b 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/b 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/B/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B/node_modules/@types 1 undefined Project: /users/username/projects/project/B/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B/node_modules/@types 1 undefined Project: /users/username/projects/project/B/tsconfig.json WatchType: Type roots @@ -347,9 +347,9 @@ After request PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/a/node_modules/@types: +/users/username/projects/project/A/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/b/node_modules/@types: *new* +/users/username/projects/project/B/node_modules/@types: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -357,15 +357,15 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/a/tsconfig.json: +/users/username/projects/project/A/tsconfig.json: {} -/users/username/projects/project/b/tsconfig.json: *new* +/users/username/projects/project/B/tsconfig.json: *new* {} FsWatchesRecursive:: -/users/username/projects/project/a: +/users/username/projects/project/A: {} -/users/username/projects/project/b: *new* +/users/username/projects/project/B: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-updates-to-redirect-info-when-requested.js b/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-updates-to-redirect-info-when-requested.js index 1c8e289f526..bcc9b13ce60 100644 --- a/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-updates-to-redirect-info-when-requested.js +++ b/tests/baselines/reference/tsserver/projects/synchronizeProjectList-provides-updates-to-redirect-info-when-requested.js @@ -76,8 +76,8 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/A/tsconfig.jso "configFilePath": "/users/username/projects/project/A/tsconfig.json" } } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/a 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/a 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A 1 undefined Config: /users/username/projects/project/A/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/A/tsconfig.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/A/node_modules/@types 1 undefined Project: /users/username/projects/project/A/tsconfig.json WatchType: Type roots @@ -181,7 +181,7 @@ After request PolledWatches:: /users/username/projects/node_modules/@types: *new* {"pollingInterval":500} -/users/username/projects/project/a/node_modules/@types: *new* +/users/username/projects/project/A/node_modules/@types: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -189,11 +189,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/users/username/projects/project/a/tsconfig.json: *new* +/users/username/projects/project/A/tsconfig.json: *new* {} FsWatchesRecursive:: -/users/username/projects/project/a: *new* +/users/username/projects/project/A: *new* {} Before request @@ -238,8 +238,8 @@ Info seq [hh:mm:ss:mss] Config: /users/username/projects/project/B/tsconfig.jso } ] } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/b 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/b 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B 1 undefined Config: /users/username/projects/project/B/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /users/username/projects/project/B/b2.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/username/projects/project/B/tsconfig.json Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/username/projects/project/B/node_modules/@types 1 undefined Project: /users/username/projects/project/B/tsconfig.json WatchType: Type roots @@ -353,9 +353,9 @@ After request PolledWatches:: /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/a/node_modules/@types: +/users/username/projects/project/A/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/b/node_modules/@types: *new* +/users/username/projects/project/B/node_modules/@types: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -363,17 +363,17 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/users/username/projects/project/a/tsconfig.json: +/users/username/projects/project/A/tsconfig.json: {} -/users/username/projects/project/b/b2.ts: *new* +/users/username/projects/project/B/b2.ts: *new* {} -/users/username/projects/project/b/tsconfig.json: *new* +/users/username/projects/project/B/tsconfig.json: *new* {} FsWatchesRecursive:: -/users/username/projects/project/a: +/users/username/projects/project/A: {} -/users/username/projects/project/b: *new* +/users/username/projects/project/B: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js index 4709e1ce652..5d90105059b 100644 --- a/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js +++ b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js @@ -305,7 +305,7 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: *new* {} -/user/username/projects/sample1/core/anothermodule.ts: *new* +/user/username/projects/sample1/core/anotherModule.ts: *new* {} /user/username/projects/sample1/core/index.ts: *new* {} diff --git a/tests/baselines/reference/tsserver/refactors/handles-canonicalization-of-tsconfig-path.js b/tests/baselines/reference/tsserver/refactors/handles-canonicalization-of-tsconfig-path.js index 2b239919480..3590ef2d53d 100644 --- a/tests/baselines/reference/tsserver/refactors/handles-canonicalization-of-tsconfig-path.js +++ b/tests/baselines/reference/tsserver/refactors/handles-canonicalization-of-tsconfig-path.js @@ -176,7 +176,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/foo/tsconfig.json: *new* +/Foo/tsconfig.json: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/refactors/handles-moving-statement-to-an-existing-file.js b/tests/baselines/reference/tsserver/refactors/handles-moving-statement-to-an-existing-file.js index 86d5bafbc18..eb198d82c27 100644 --- a/tests/baselines/reference/tsserver/refactors/handles-moving-statement-to-an-existing-file.js +++ b/tests/baselines/reference/tsserver/refactors/handles-moving-statement-to-an-existing-file.js @@ -185,9 +185,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/foo/b.ts: *new* +/Foo/b.ts: *new* {} -/foo/tsconfig.json: *new* +/Foo/tsconfig.json: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-TS-file-that-is-not-included-in-the-TS-project.js b/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-TS-file-that-is-not-included-in-the-TS-project.js index 0f0cc1e7558..6a438719042 100644 --- a/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-TS-file-that-is-not-included-in-the-TS-project.js +++ b/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-TS-file-that-is-not-included-in-the-TS-project.js @@ -184,7 +184,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/bar/tsconfig.json: *new* +/Bar/tsconfig.json: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-non-TS-file.js b/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-non-TS-file.js index 0cc13228bfd..7eaf2832e25 100644 --- a/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-non-TS-file.js +++ b/tests/baselines/reference/tsserver/refactors/handles-moving-statements-to-a-non-TS-file.js @@ -179,7 +179,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/foo/tsconfig.json: *new* +/Foo/tsconfig.json: *new* {} Before request diff --git a/tests/baselines/reference/tsserver/rename/with-symlinks-and-case-difference.js b/tests/baselines/reference/tsserver/rename/with-symlinks-and-case-difference.js new file mode 100644 index 00000000000..cff07fb2be2 --- /dev/null +++ b/tests/baselines/reference/tsserver/rename/with-symlinks-and-case-difference.js @@ -0,0 +1,576 @@ +currentDirectory:: C:/ useCaseSensitiveFileNames: false +Info seq [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist +Before request +//// [C:/temp/test/project1/index.ts] +export function myFunc() { +} + + +//// [C:/temp/test/project1/tsconfig.json] +{ + "compilerOptions": { + "composite": true + } +} + +//// [C:/temp/test/project1/package.json] +{ + "name": "project1", + "version": "1.0.0", + "main": "index.js" +} + +//// [C:/temp/test/project2/index.ts] +import { myFunc } from 'project1' +myFunc(); + + +//// [C:/temp/test/project2/tsconfig.json] +{ + "compilerOptions": { + "composite": true + }, + "references": [ + { + "path": "../project1" + } + ] +} + +//// [C:/temp/test/tsconfig.json] +{ + "references": [ + { + "path": "./project1" + }, + { + "path": "./project2" + } + ], + "files": [], + "include": [] +} + +//// [C:/temp/test/node_modules/project1] symlink(c:/temp/test/project1) +//// [C:/a/lib/lib.d.ts] +/// +interface Boolean {} +interface Function {} +interface CallableFunction {} +interface NewableFunction {} +interface IArguments {} +interface Number { toExponential: any; } +interface Object {} +interface RegExp {} +interface String { charAt: any; } +interface Array { length: number; [n: number]: T; } +interface ReadonlyArray {} +declare const console: { log(msg: any): void; }; + + +Info seq [hh:mm:ss:mss] request: + { + "command": "open", + "arguments": { + "file": "c:/temp/test/project1/index.ts" + }, + "seq": 1, + "type": "request" + } +Info seq [hh:mm:ss:mss] Search path: c:/temp/test/project1 +Info seq [hh:mm:ss:mss] For info: c:/temp/test/project1/index.ts :: Config file name: c:/temp/test/project1/tsconfig.json +Info seq [hh:mm:ss:mss] Creating configuration project c:/temp/test/project1/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/project1/tsconfig.json 2000 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Config file +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingStart", + "body": { + "projectName": "c:/temp/test/project1/tsconfig.json", + "reason": "Creating possible configured project for c:/temp/test/project1/index.ts to open" + } + } +Info seq [hh:mm:ss:mss] Config: c:/temp/test/project1/tsconfig.json : { + "rootNames": [ + "c:/temp/test/project1/index.ts" + ], + "options": { + "composite": true, + "configFilePath": "c:/temp/test/project1/tsconfig.json" + } +} +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project1 1 undefined Config: c:/temp/test/project1/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project1 1 undefined Config: c:/temp/test/project1/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/temp/test/project1/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project1/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project1/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/temp/test/project1/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project 'c:/temp/test/project1/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (2) + C:/a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };" + c:/temp/test/project1/index.ts SVC-1-0 "export function myFunc() {\n}\n" + + + ../../../a/lib/lib.d.ts + Default library for target 'es5' + index.ts + Matched by default include pattern '**/*' + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/project1/package.json 250 undefined WatchType: package.json file +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingFinish", + "body": { + "projectName": "c:/temp/test/project1/tsconfig.json" + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "telemetry", + "body": { + "telemetryEventName": "projectInfo", + "payload": { + "projectId": "7987d5b773b493a86a91f135bb6a27cbcb359536c3bbea16ea5f1ab8c979acf0", + "fileStats": { + "js": 0, + "jsSize": 0, + "jsx": 0, + "jsxSize": 0, + "ts": 1, + "tsSize": 29, + "tsx": 0, + "tsxSize": 0, + "dts": 1, + "dtsSize": 413, + "deferred": 0, + "deferredSize": 0 + }, + "compilerOptions": { + "composite": true + }, + "typeAcquisition": { + "enable": false, + "include": false, + "exclude": false + }, + "extends": false, + "files": false, + "include": false, + "exclude": false, + "compileOnSave": false, + "configFileName": "tsconfig.json", + "projectType": "configured", + "languageServiceEnabled": true, + "version": "FakeVersion" + } + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "c:/temp/test/project1/index.ts", + "configFile": "c:/temp/test/project1/tsconfig.json", + "diagnostics": [] + } + } +Info seq [hh:mm:ss:mss] Search path: c:/temp/test/project1 +Info seq [hh:mm:ss:mss] For info: c:/temp/test/project1/tsconfig.json :: Config file name: c:/temp/test/tsconfig.json +Info seq [hh:mm:ss:mss] Creating configuration project c:/temp/test/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/tsconfig.json 2000 undefined Project: c:/temp/test/tsconfig.json WatchType: Config file +Info seq [hh:mm:ss:mss] Search path: c:/temp/test +Info seq [hh:mm:ss:mss] For info: c:/temp/test/tsconfig.json :: No config files found. +Info seq [hh:mm:ss:mss] Project 'c:/temp/test/project1/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (2) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Project 'c:/temp/test/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (0) InitialLoadPending + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Open files: +Info seq [hh:mm:ss:mss] FileName: c:/temp/test/project1/index.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: c:/temp/test/project1/tsconfig.json +Info seq [hh:mm:ss:mss] response: + { + "responseRequired": false + } +After request + +PolledWatches:: +c:/temp/node_modules/@types: *new* + {"pollingInterval":500} +c:/temp/test/node_modules/@types: *new* + {"pollingInterval":500} +c:/temp/test/project1/node_modules/@types: *new* + {"pollingInterval":500} + +FsWatches:: +C:/a/lib/lib.d.ts: *new* + {} +c:/temp/test/project1/package.json: *new* + {} +c:/temp/test/project1/tsconfig.json: *new* + {} +c:/temp/test/tsconfig.json: *new* + {} + +FsWatchesRecursive:: +c:/temp/test/project1: *new* + {} + +Before request + +Info seq [hh:mm:ss:mss] request: + { + "command": "rename", + "arguments": { + "file": "C:/temp/test/project1/index.ts", + "line": 1, + "offset": 17 + }, + "seq": 2, + "type": "request" + } +Info seq [hh:mm:ss:mss] Loading configured project c:/temp/test/tsconfig.json +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingStart", + "body": { + "projectName": "c:/temp/test/tsconfig.json", + "reason": "Creating project possibly referencing default composite project c:/temp/test/project1/tsconfig.json of open file c:/temp/test/project1/index.ts" + } + } +Info seq [hh:mm:ss:mss] Config: c:/temp/test/tsconfig.json : { + "rootNames": [], + "options": { + "configFilePath": "c:/temp/test/tsconfig.json" + }, + "projectReferences": [ + { + "path": "c:/temp/test/project1", + "originalPath": "./project1" + }, + { + "path": "c:/temp/test/project2", + "originalPath": "./project2" + } + ] +} +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/temp/test/tsconfig.json +Info seq [hh:mm:ss:mss] Config: c:/temp/test/project2/tsconfig.json : { + "rootNames": [ + "c:/temp/test/project2/index.ts" + ], + "options": { + "composite": true, + "configFilePath": "c:/temp/test/project2/tsconfig.json" + }, + "projectReferences": [ + { + "path": "c:/temp/test/project1", + "originalPath": "../project1" + } + ] +} +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/project2/tsconfig.json 2000 undefined Project: c:/temp/test/tsconfig.json WatchType: Config file +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2 1 undefined Config: c:/temp/test/project2/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2 1 undefined Config: c:/temp/test/project2/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/temp/test/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project 'c:/temp/test/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (0) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingFinish", + "body": { + "projectName": "c:/temp/test/tsconfig.json" + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "telemetry", + "body": { + "telemetryEventName": "projectInfo", + "payload": { + "projectId": "8e7953c1d1edaf51b05db26e77ce2b2601ac9b361b20637b7df15d06b08f29c5", + "fileStats": { + "js": 0, + "jsSize": 0, + "jsx": 0, + "jsxSize": 0, + "ts": 0, + "tsSize": 0, + "tsx": 0, + "tsxSize": 0, + "dts": 0, + "dtsSize": 0, + "deferred": 0, + "deferredSize": 0 + }, + "compilerOptions": {}, + "typeAcquisition": { + "enable": false, + "include": false, + "exclude": false + }, + "extends": false, + "files": true, + "include": true, + "exclude": false, + "compileOnSave": false, + "configFileName": "tsconfig.json", + "projectType": "configured", + "languageServiceEnabled": true, + "version": "FakeVersion" + } + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "c:/temp/test/tsconfig.json", + "configFile": "c:/temp/test/tsconfig.json", + "diagnostics": [] + } + } +Info seq [hh:mm:ss:mss] Creating configuration project c:/temp/test/project2/tsconfig.json +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingStart", + "body": { + "projectName": "c:/temp/test/project2/tsconfig.json", + "reason": "Creating project referenced by : c:/temp/test/tsconfig.json as it references project c:/temp/test/project1/tsconfig.json" + } + } +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/project2/index.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/temp/test/project2/tsconfig.json +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2/node_modules 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2/node_modules 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/temp/test/project1/package.json 2000 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: File location affecting resolution +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/project2/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/test/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: c:/temp/test/project2/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/temp/test/project2/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project 'c:/temp/test/project2/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (3) + C:/a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };" + C:/temp/test/project1/index.ts SVC-1-0 "export function myFunc() {\n}\n" + c:/temp/test/project2/index.ts Text-1 "import { myFunc } from 'project1'\nmyFunc();\n" + + + ../../../a/lib/lib.d.ts + Default library for target 'es5' + ../project1/index.ts + Imported via 'project1' from file 'index.ts' with packageId 'project1/index.ts@1.0.0' + index.ts + Matched by default include pattern '**/*' + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingFinish", + "body": { + "projectName": "c:/temp/test/project2/tsconfig.json" + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "telemetry", + "body": { + "telemetryEventName": "projectInfo", + "payload": { + "projectId": "80bd38ecf3f3fe2cb16c7a334a11c6716aa001717fa79c13f9bcc7a102350f92", + "fileStats": { + "js": 0, + "jsSize": 0, + "jsx": 0, + "jsxSize": 0, + "ts": 2, + "tsSize": 73, + "tsx": 0, + "tsxSize": 0, + "dts": 1, + "dtsSize": 413, + "deferred": 0, + "deferredSize": 0 + }, + "compilerOptions": { + "composite": true + }, + "typeAcquisition": { + "enable": false, + "include": false, + "exclude": false + }, + "extends": false, + "files": false, + "include": false, + "exclude": false, + "compileOnSave": false, + "configFileName": "tsconfig.json", + "projectType": "configured", + "languageServiceEnabled": true, + "version": "FakeVersion" + } + } + } +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/test/project1/index.d.ts 2000 undefined Project: c:/temp/test/project1/tsconfig.json WatchType: Missing generated file +Info seq [hh:mm:ss:mss] Search path: C:/temp/test/project1 +Info seq [hh:mm:ss:mss] For info: C:/temp/test/project1/index.ts :: Config file name: C:/temp/test/project1/tsconfig.json +Info seq [hh:mm:ss:mss] response: + { + "response": { + "info": { + "canRename": true, + "displayName": "myFunc", + "fullDisplayName": "\"c:/temp/test/project1/index\".myFunc", + "kind": "function", + "kindModifiers": "export", + "triggerSpan": { + "start": { + "line": 1, + "offset": 17 + }, + "end": { + "line": 1, + "offset": 23 + } + } + }, + "locs": [ + { + "file": "c:/temp/test/project1/index.ts", + "locs": [ + { + "start": { + "line": 1, + "offset": 17 + }, + "end": { + "line": 1, + "offset": 23 + }, + "contextStart": { + "line": 1, + "offset": 1 + }, + "contextEnd": { + "line": 2, + "offset": 2 + } + } + ] + }, + { + "file": "c:/temp/test/project2/index.ts", + "locs": [ + { + "start": { + "line": 1, + "offset": 10 + }, + "end": { + "line": 1, + "offset": 16 + }, + "contextStart": { + "line": 1, + "offset": 1 + }, + "contextEnd": { + "line": 1, + "offset": 34 + } + }, + { + "start": { + "line": 2, + "offset": 1 + }, + "end": { + "line": 2, + "offset": 7 + } + } + ] + } + ] + }, + "responseRequired": true + } +After request + +PolledWatches:: +c:/temp/node_modules/@types: + {"pollingInterval":500} +c:/temp/test/node_modules/@types: + {"pollingInterval":500} +c:/temp/test/project1/index.d.ts: *new* + {"pollingInterval":2000} +c:/temp/test/project1/node_modules/@types: + {"pollingInterval":500} +c:/temp/test/project2/node_modules: *new* + {"pollingInterval":500} +c:/temp/test/project2/node_modules/@types: *new* + {"pollingInterval":500} + +FsWatches:: +C:/a/lib/lib.d.ts: + {} +c:/temp/test/project1/package.json: + {} +c:/temp/test/project1/tsconfig.json: + {} +c:/temp/test/project2/index.ts: *new* + {} +c:/temp/test/project2/tsconfig.json: *new* + {} +c:/temp/test/tsconfig.json: + {} + +FsWatchesRecursive:: +c:/temp/test/node_modules: *new* + {} +c:/temp/test/project1: + {} +c:/temp/test/project2: *new* + {} diff --git a/tests/baselines/reference/tsserver/resolutionCache/not-sharing-across-references.js b/tests/baselines/reference/tsserver/resolutionCache/not-sharing-across-references.js index 947e63d1aa1..68a4c16f7f8 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/not-sharing-across-references.js +++ b/tests/baselines/reference/tsserver/resolutionCache/not-sharing-across-references.js @@ -303,11 +303,11 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/users/username/projects/app/appa.ts: *new* +/users/username/projects/app/appA.ts: *new* {} /users/username/projects/app/tsconfig.json: *new* {} -/users/username/projects/common/moduleb.ts: *new* +/users/username/projects/common/moduleB.ts: *new* {} /users/username/projects/common/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js index 0be7bce4176..3ace1dcafd1 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js +++ b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js @@ -195,7 +195,7 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} /users/username/projects/project/tsconfig.json: *new* {} @@ -256,7 +256,7 @@ FsWatches:: {} FsWatches *deleted*:: -/users/username/projects/project/modulefile.ts: +/users/username/projects/project/moduleFile.ts: {} FsWatchesRecursive:: @@ -323,7 +323,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile: *new* +/users/username/projects/project/moduleFile: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -331,7 +331,7 @@ PolledWatches:: FsWatches:: /users/username/projects/project: *new* {} -/users/username/projects/project/modulefile1.ts: *new* +/users/username/projects/project/moduleFile1.ts: *new* {} /users/username/projects/project/tsconfig.json: {} @@ -405,7 +405,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/node_modules/@types: {"pollingInterval":500} -/users/username/projects/project/modulefile: +/users/username/projects/project/moduleFile: {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -417,7 +417,7 @@ FsWatches:: {} FsWatches *deleted*:: -/users/username/projects/project/modulefile1.ts: +/users/username/projects/project/moduleFile1.ts: {} FsWatchesRecursive:: @@ -487,11 +487,11 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/users/username/projects/project/modulefile: +/users/username/projects/project/moduleFile: {"pollingInterval":500} FsWatches:: -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} /users/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js index de7b00d2a09..716b216c17b 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js +++ b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js @@ -67,7 +67,7 @@ PolledWatches:: {"pollingInterval":2000} FsWatches:: -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} Before request @@ -114,7 +114,7 @@ PolledWatches:: {"pollingInterval":2000} FsWatches *deleted*:: -/users/username/projects/project/modulefile.ts: +/users/username/projects/project/moduleFile.ts: {} Timeout callback:: count: 2 @@ -175,7 +175,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/project/jsconfig.json: {"pollingInterval":2000} -/users/username/projects/project/modulefile: *new* +/users/username/projects/project/moduleFile: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: {"pollingInterval":500} @@ -333,11 +333,11 @@ PolledWatches:: {"pollingInterval":2000} PolledWatches *deleted*:: -/users/username/projects/project/modulefile: +/users/username/projects/project/moduleFile: {"pollingInterval":500} FsWatches:: -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} FsWatches *deleted*:: diff --git a/tests/baselines/reference/tsserver/resolutionCache/sharing-across-references.js b/tests/baselines/reference/tsserver/resolutionCache/sharing-across-references.js index 9dda3d1b96e..30e37bfb8d3 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/sharing-across-references.js +++ b/tests/baselines/reference/tsserver/resolutionCache/sharing-across-references.js @@ -301,11 +301,11 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/users/username/projects/app/appa.ts: *new* +/users/username/projects/app/appA.ts: *new* {} /users/username/projects/app/tsconfig.json: *new* {} -/users/username/projects/common/moduleb.ts: *new* +/users/username/projects/common/moduleB.ts: *new* {} /users/username/projects/common/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js b/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js index b4c81076837..16f31f5b7f3 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js +++ b/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js @@ -58,7 +58,7 @@ PolledWatches:: {"pollingInterval":500} /users/username/projects/project/jsconfig.json: *new* {"pollingInterval":2000} -/users/username/projects/project/modulefile: *new* +/users/username/projects/project/moduleFile: *new* {"pollingInterval":500} /users/username/projects/project/node_modules/@types: *new* {"pollingInterval":500} @@ -194,11 +194,11 @@ PolledWatches:: {"pollingInterval":2000} PolledWatches *deleted*:: -/users/username/projects/project/modulefile: +/users/username/projects/project/moduleFile: {"pollingInterval":500} FsWatches:: -/users/username/projects/project/modulefile.ts: *new* +/users/username/projects/project/moduleFile.ts: *new* {} FsWatches *deleted*:: diff --git a/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js b/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js index 50942476f36..952a8991c2a 100644 --- a/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js +++ b/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js @@ -83,9 +83,9 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: -/a/dtsfile1.d.ts: *new* +/a/dTsFile1.d.ts: *new* {} -/a/dtsfile2.d.ts: *new* +/a/dTsFile2.d.ts: *new* {} /a/jsconfig.json: *new* {} @@ -138,12 +138,12 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: +/a/dTsFile1.d.ts: + {} +/a/dTsFile2.d.ts: + {} /a/data/package.json: *new* {} -/a/dtsfile1.d.ts: - {} -/a/dtsfile2.d.ts: - {} /a/jsconfig.json: {} @@ -392,12 +392,12 @@ PolledWatches:: {"pollingInterval":500} FsWatches:: +/a/dTsFile1.d.ts: + {} +/a/dTsFile2.d.ts: + {} /a/data/package.json: {} -/a/dtsfile1.d.ts: - {} -/a/dtsfile2.d.ts: - {} /a/jsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/symLinks/when-not-symlink-but-differs-in-casing.js b/tests/baselines/reference/tsserver/symLinks/when-not-symlink-but-differs-in-casing.js index ccbafa40324..0e0d7526ba2 100644 --- a/tests/baselines/reference/tsserver/symLinks/when-not-symlink-but-differs-in-casing.js +++ b/tests/baselines/reference/tsserver/symLinks/when-not-symlink-but-differs-in-casing.js @@ -61,7 +61,7 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/replay/axios-s Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/replay/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/temp/replay/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots @@ -115,7 +115,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -c:/a/lib/lib.d.ts: *new* +C:/a/lib/lib.d.ts: *new* {"pollingInterval":500} c:/temp/node_modules/@types: *new* {"pollingInterval":500} @@ -219,7 +219,7 @@ Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/ Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Failed Lookup Locations Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Failed Lookup Locations Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/temp/replay/axios-src/node_modules/follow-redirects/package.json 2000 undefined Project: /dev/null/inferredProject2* WatchType: File location affecting resolution -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject2* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject2* WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots @@ -273,7 +273,7 @@ Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: c:/temp/replay/no Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: c:/temp/replay/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: c:/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: C:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred) Info seq [hh:mm:ss:mss] Files (4) @@ -290,7 +290,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -c:/a/lib/lib.d.ts: +C:/a/lib/lib.d.ts: {"pollingInterval":500} c:/temp/node_modules: *new* {"pollingInterval":500} @@ -298,7 +298,7 @@ c:/temp/node_modules/@types: {"pollingInterval":500} c:/temp/replay/axios-src/jsconfig.json: {"pollingInterval":2000} -c:/temp/replay/axios-src/lib/core/axiosheaders.js: *new* +c:/temp/replay/axios-src/lib/core/AxiosHeaders.js: *new* {"pollingInterval":500} c:/temp/replay/axios-src/lib/core/jsconfig.json: {"pollingInterval":2000} @@ -332,12 +332,12 @@ c:/temp/replay/tsconfig.json: {"pollingInterval":2000} FsWatches:: +C:/temp/replay/axios-src/node_modules/follow-redirects/package.json: *new* + {} c:/temp/replay/axios-src/lib/core: *new* {} c:/temp/replay/axios-src/lib/core/settle.js: *new* {} -c:/temp/replay/axios-src/node_modules/follow-redirects/package.json: *new* - {} c:/temp/replay/axios-src/package.json: {} @@ -363,7 +363,7 @@ Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/ax Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/AxiosHeaders.js 1 undefined Project: /dev/null/inferredProject3* WatchType: Failed Lookup Locations Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core 0 undefined Project: /dev/null/inferredProject3* WatchType: Failed Lookup Locations Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core 0 undefined Project: /dev/null/inferredProject3* WatchType: Failed Lookup Locations -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject3* WatchType: Missing file +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: C:/a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject3* WatchType: Missing file Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/core/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/temp/replay/axios-src/lib/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots @@ -460,7 +460,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -c:/a/lib/lib.d.ts: +C:/a/lib/lib.d.ts: {"pollingInterval":500} c:/temp/node_modules: {"pollingInterval":500} @@ -468,7 +468,7 @@ c:/temp/node_modules/@types: {"pollingInterval":500} c:/temp/replay/axios-src/jsconfig.json: {"pollingInterval":2000} -c:/temp/replay/axios-src/lib/core/axiosheaders.js: +c:/temp/replay/axios-src/lib/core/AxiosHeaders.js: {"pollingInterval":500} c:/temp/replay/axios-src/lib/core/jsconfig.json: {"pollingInterval":2000} @@ -502,14 +502,14 @@ c:/temp/replay/tsconfig.json: {"pollingInterval":2000} FsWatches:: +C:/temp/replay/axios-src/node_modules/follow-redirects/package.json: + {} c:/temp/replay/axios-src/lib/core: {} -c:/temp/replay/axios-src/lib/core/axiosheaders.js: *new* +c:/temp/replay/axios-src/lib/core/AxiosHeaders.js: *new* {} c:/temp/replay/axios-src/lib/core/settle.js: {} -c:/temp/replay/axios-src/node_modules/follow-redirects/package.json: - {} c:/temp/replay/axios-src/package.json: {} @@ -567,7 +567,7 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -c:/a/lib/lib.d.ts: +C:/a/lib/lib.d.ts: {"pollingInterval":500} c:/temp/node_modules: {"pollingInterval":500} @@ -575,7 +575,7 @@ c:/temp/node_modules/@types: {"pollingInterval":500} c:/temp/replay/axios-src/jsconfig.json: {"pollingInterval":2000} -c:/temp/replay/axios-src/lib/core/axiosheaders.js: +c:/temp/replay/axios-src/lib/core/AxiosHeaders.js: {"pollingInterval":500} c:/temp/replay/axios-src/lib/core/jsconfig.json: {"pollingInterval":2000} @@ -609,11 +609,11 @@ c:/temp/replay/tsconfig.json: {"pollingInterval":2000} FsWatches:: +C:/temp/replay/axios-src/node_modules/follow-redirects/package.json: + {} c:/temp/replay/axios-src/lib/core: {} -c:/temp/replay/axios-src/lib/core/axiosheaders.js: - {} -c:/temp/replay/axios-src/node_modules/follow-redirects/package.json: +c:/temp/replay/axios-src/lib/core/AxiosHeaders.js: {} c:/temp/replay/axios-src/package.json: {} diff --git a/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js b/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js index 1f456512fbc..09865c035ea 100644 --- a/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js +++ b/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js @@ -259,7 +259,7 @@ FsWatches:: {} /user/username/projects/myproject/tsconfig.json: {} -/user/username/projects/myproject/unittest1.ts: *new* +/user/username/projects/myproject/unitTest1.ts: *new* {} FsWatchesRecursive:: @@ -313,7 +313,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/unittest1.ts: +/user/username/projects/myproject/unitTest1.ts: {} FsWatchesRecursive:: @@ -637,7 +637,7 @@ FsWatches:: {} /user/username/projects/myproject/tsconfig.json: {} -/user/username/projects/myproject/unittest1.ts: *new* +/user/username/projects/myproject/unitTest1.ts: *new* {} FsWatchesRecursive:: @@ -691,7 +691,7 @@ FsWatches:: {} FsWatches *deleted*:: -/user/username/projects/myproject/unittest1.ts: +/user/username/projects/myproject/unitTest1.ts: {} FsWatchesRecursive:: diff --git a/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js b/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js index 59c7b913c5f..04e400286d2 100644 --- a/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js +++ b/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js @@ -92,7 +92,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js index 5f45c97a943..d85b1e257b9 100644 --- a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js +++ b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js @@ -105,7 +105,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js index 746126dcde5..1891f208cdf 100644 --- a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js +++ b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js @@ -97,7 +97,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json, Cancelled earlier one Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: a/data/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /a/data/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/data/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: a/data/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with a/data/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js index 8ce547b5b39..2a6d736b589 100644 --- a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js +++ b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js @@ -208,7 +208,7 @@ FsWatches:: {} /user/username/projects/myproject/lib/@app/lib/index.d.ts: *new* {} -/user/username/projects/myproject/lib/@types/uppercasepackage/index.d.ts: *new* +/user/username/projects/myproject/lib/@types/UpperCasePackage/index.d.ts: *new* {} /user/username/projects/myproject/test/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js index 67dd990f2ed..0374de7ac1f 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js @@ -91,7 +91,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js index 397ad91ee30..32f658b011e 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js @@ -90,7 +90,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js index 365982d86b0..4923a55b2af 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js @@ -123,7 +123,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js index c4bc4ccf8fe..cbb1bcd5b92 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js @@ -116,7 +116,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js index 4d61639f829..88efcce4bfa 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js @@ -120,7 +120,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js index 2e0f406f4ed..1663c8a5660 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js @@ -111,7 +111,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js index d4102489ed9..0daad8e19ee 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js @@ -860,6 +860,7 @@ Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/pr Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/project/node_modules/@types 1 undefined Project: /user/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/project/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /user/username/projects/project/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /user/username/projects/project/app.js 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Project '/user/username/projects/project2/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -895,8 +896,6 @@ PolledWatches *deleted*:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/project/package.json: - {} /user/username/projects/project2/package.json: *new* {} /user/username/projects/project2/tsconfig.json: *new* @@ -905,6 +904,8 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/project/app.js: {} +/user/username/projects/project/package.json: + {} /user/username/projects/project/tsconfig.json: {} diff --git a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js index 89f0157b563..c4e80808e3e 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js @@ -106,7 +106,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /jsconfig.json Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory -Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: tmp/package.json +Info seq [hh:mm:ss:mss] Config: /jsconfig.json Detected new package.json: /tmp/package.json Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file Info seq [hh:mm:ss:mss] Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo: 1 undefined Config: /jsconfig.json WatchType: Wild card directory diff --git a/tests/baselines/reference/tsserver/watchEnvironment/perVolumeCasing-and-new-file-addition.js b/tests/baselines/reference/tsserver/watchEnvironment/perVolumeCasing-and-new-file-addition.js new file mode 100644 index 00000000000..351399799ca --- /dev/null +++ b/tests/baselines/reference/tsserver/watchEnvironment/perVolumeCasing-and-new-file-addition.js @@ -0,0 +1,258 @@ +currentDirectory:: / useCaseSensitiveFileNames: false +Info seq [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist +Before request +//// [/a/lib/lib.d.ts] +/// +interface Boolean {} +interface Function {} +interface CallableFunction {} +interface NewableFunction {} +interface IArguments {} +interface Number { toExponential: any; } +interface Object {} +interface RegExp {} +interface String { charAt: any; } +interface Array { length: number; [n: number]: T; } + +//// [/Volumes/git/projects/project/foo.ts] +export const foo = "foo"; + +//// [/Volumes/git/projects/project/tsconfig.json] +{ } + +//// [/Volumes/git/projects/project/package.json] +{ + "name": "project", + "version": "1.0.0" +} + + +Info seq [hh:mm:ss:mss] request: + { + "command": "open", + "arguments": { + "file": "/Volumes/git/projects/project/foo.ts" + }, + "seq": 1, + "type": "request" + } +Info seq [hh:mm:ss:mss] Search path: /Volumes/git/projects/project +Info seq [hh:mm:ss:mss] For info: /Volumes/git/projects/project/foo.ts :: Config file name: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] Creating configuration project /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Volumes/git/projects/project/tsconfig.json 2000 undefined Project: /Volumes/git/projects/project/tsconfig.json WatchType: Config file +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingStart", + "body": { + "projectName": "/Volumes/git/projects/project/tsconfig.json", + "reason": "Creating possible configured project for /Volumes/git/projects/project/foo.ts to open" + } + } +Info seq [hh:mm:ss:mss] Config: /Volumes/git/projects/project/tsconfig.json : { + "rootNames": [ + "/Volumes/git/projects/project/foo.ts" + ], + "options": { + "configFilePath": "/Volumes/git/projects/project/tsconfig.json" + } +} +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/project 1 undefined Config: /Volumes/git/projects/project/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/project 1 undefined Config: /Volumes/git/projects/project/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/project/node_modules/@types 1 undefined Project: /Volumes/git/projects/project/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/project/node_modules/@types 1 undefined Project: /Volumes/git/projects/project/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/node_modules/@types 1 undefined Project: /Volumes/git/projects/project/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Volumes/git/projects/node_modules/@types 1 undefined Project: /Volumes/git/projects/project/tsconfig.json WatchType: Type roots +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /Volumes/git/projects/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project '/Volumes/git/projects/project/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (2) + /a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }" + /Volumes/git/projects/project/foo.ts SVC-1-0 "export const foo = \"foo\";" + + + ../../../../a/lib/lib.d.ts + Default library for target 'es5' + foo.ts + Matched by default include pattern '**/*' + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Volumes/git/projects/project/package.json 250 undefined WatchType: package.json file +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectLoadingFinish", + "body": { + "projectName": "/Volumes/git/projects/project/tsconfig.json" + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "telemetry", + "body": { + "telemetryEventName": "projectInfo", + "payload": { + "projectId": "e50274f5ddc1e90e52ff9c7e9e1743319de8c195753252405d8c0303805297ea", + "fileStats": { + "js": 0, + "jsSize": 0, + "jsx": 0, + "jsxSize": 0, + "ts": 1, + "tsSize": 25, + "tsx": 0, + "tsxSize": 0, + "dts": 1, + "dtsSize": 334, + "deferred": 0, + "deferredSize": 0 + }, + "compilerOptions": {}, + "typeAcquisition": { + "enable": false, + "include": false, + "exclude": false + }, + "extends": false, + "files": false, + "include": false, + "exclude": false, + "compileOnSave": false, + "configFileName": "tsconfig.json", + "projectType": "configured", + "languageServiceEnabled": true, + "version": "FakeVersion" + } + } + } +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "/Volumes/git/projects/project/foo.ts", + "configFile": "/Volumes/git/projects/project/tsconfig.json", + "diagnostics": [] + } + } +Info seq [hh:mm:ss:mss] Project '/Volumes/git/projects/project/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (2) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Open files: +Info seq [hh:mm:ss:mss] FileName: /Volumes/git/projects/project/foo.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] response: + { + "responseRequired": false + } +After request + +PolledWatches:: +/Volumes/git/projects/node_modules/@types: *new* + {"pollingInterval":500} +/Volumes/git/projects/project/node_modules/@types: *new* + {"pollingInterval":500} + +FsWatches:: +/Volumes/git/projects/project/package.json: *new* + {} +/Volumes/git/projects/project/tsconfig.json: *new* + {} +/a/lib/lib.d.ts: *new* + {} + +FsWatchesRecursive:: +/Volumes/git/projects/project: *new* + {} + +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /Volumes/git/projects/project/Bar.ts :: WatchInfo: /Volumes/git/projects/project 1 undefined Config: /Volumes/git/projects/project/tsconfig.json WatchType: Wild card directory +Info seq [hh:mm:ss:mss] Scheduled: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /Volumes/git/projects/project/Bar.ts :: WatchInfo: /Volumes/git/projects/project 1 undefined Config: /Volumes/git/projects/project/tsconfig.json WatchType: Wild card directory +Before running Timeout callback:: count: 2 +1: /Volumes/git/projects/project/tsconfig.json +2: *ensureProjectForOpenFiles* +//// [/Volumes/git/projects/project/Bar.ts] +export const bar = "bar"; + + +Timeout callback:: count: 2 +1: /Volumes/git/projects/project/tsconfig.json *new* +2: *ensureProjectForOpenFiles* *new* + +Info seq [hh:mm:ss:mss] Running: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /Volumes/git/projects/project/Bar.ts 500 undefined WatchType: Closed Script info +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /Volumes/git/projects/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project '/Volumes/git/projects/project/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (3) + /a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }" + /Volumes/git/projects/project/foo.ts SVC-1-0 "export const foo = \"foo\";" + /Volumes/git/projects/project/Bar.ts Text-1 "export const bar = \"bar\";" + + + ../../../../a/lib/lib.d.ts + Default library for target 'es5' + foo.ts + Matched by default include pattern '**/*' + Bar.ts + Matched by default include pattern '**/*' + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles* +Info seq [hh:mm:ss:mss] Before ensureProjectForOpenFiles: +Info seq [hh:mm:ss:mss] Project '/Volumes/git/projects/project/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (3) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Open files: +Info seq [hh:mm:ss:mss] FileName: /Volumes/git/projects/project/foo.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: +Info seq [hh:mm:ss:mss] Project '/Volumes/git/projects/project/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (3) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Open files: +Info seq [hh:mm:ss:mss] FileName: /Volumes/git/projects/project/foo.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: /Volumes/git/projects/project/tsconfig.json +Info seq [hh:mm:ss:mss] got projects updated in background /Volumes/git/projects/project/foo.ts +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectsUpdatedInBackground", + "body": { + "openFiles": [ + "/Volumes/git/projects/project/foo.ts" + ] + } + } +After running Timeout callback:: count: 0 + +PolledWatches:: +/Volumes/git/projects/node_modules/@types: + {"pollingInterval":500} +/Volumes/git/projects/project/node_modules/@types: + {"pollingInterval":500} + +FsWatches:: +/Volumes/git/projects/project/Bar.ts: *new* + {} +/Volumes/git/projects/project/package.json: + {} +/Volumes/git/projects/project/tsconfig.json: + {} +/a/lib/lib.d.ts: + {} + +FsWatchesRecursive:: +/Volumes/git/projects/project: + {} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js index f9d205f73f7..84ecc7a6d08 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js @@ -69,17 +69,17 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/i/jsconfig.json: *new* +/User/userName/Projects/i/jsconfig.json: *new* {"pollingInterval":2000} -/user/username/projects/i/node_modules: *new* +/User/userName/Projects/i/node_modules: *new* {"pollingInterval":500} -/user/username/projects/i/node_modules/@types: *new* +/User/userName/Projects/i/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/i/tsconfig.json: *new* +/User/userName/Projects/i/tsconfig.json: *new* {"pollingInterval":2000} -/user/username/projects/node_modules: *new* +/User/userName/Projects/node_modules: *new* {"pollingInterval":500} -/user/username/projects/node_modules/@types: *new* +/User/userName/Projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js index b373da322b2..c536fd220e2 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js @@ -69,17 +69,17 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/i/jsconfig.json: *new* +/User/userName/Projects/I/jsconfig.json: *new* {"pollingInterval":2000} -/user/username/projects/i/node_modules: *new* +/User/userName/Projects/I/node_modules: *new* {"pollingInterval":500} -/user/username/projects/i/node_modules/@types: *new* +/User/userName/Projects/I/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/i/tsconfig.json: *new* +/User/userName/Projects/I/tsconfig.json: *new* {"pollingInterval":2000} -/user/username/projects/node_modules: *new* +/User/userName/Projects/node_modules: *new* {"pollingInterval":500} -/user/username/projects/node_modules/@types: *new* +/User/userName/Projects/node_modules/@types: *new* {"pollingInterval":500} FsWatches:: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js index 7deb3682af5..eaa46304308 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js @@ -69,17 +69,17 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/user/username/projects/node_modules: *new* +/User/userName/Projects/node_modules: *new* {"pollingInterval":500} -/user/username/projects/node_modules/@types: *new* +/User/userName/Projects/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/Ä°/jsconfig.json: *new* +/User/userName/Projects/Ä°/jsconfig.json: *new* {"pollingInterval":2000} -/user/username/projects/Ä°/node_modules: *new* +/User/userName/Projects/Ä°/node_modules: *new* {"pollingInterval":500} -/user/username/projects/Ä°/node_modules/@types: *new* +/User/userName/Projects/Ä°/node_modules/@types: *new* {"pollingInterval":500} -/user/username/projects/Ä°/tsconfig.json: *new* +/User/userName/Projects/Ä°/tsconfig.json: *new* {"pollingInterval":2000} FsWatches:: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js index ebe5b159dfd..bb6f5525b1d 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js @@ -183,7 +183,7 @@ After request PolledWatches:: /a/b: *new* {"pollingInterval":500} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {"pollingInterval":500} /a/b/tsconfig.json: *new* {"pollingInterval":2000} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js index c47ff3460ca..5cbd491bf2b 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js @@ -190,7 +190,7 @@ After request PolledWatches:: /a/b: *new* {"pollingInterval":500} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {"pollingInterval":500} /a/b/tsconfig.json: *new* {"pollingInterval":2000} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js index 28974194851..ac3444c47fe 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js @@ -183,7 +183,7 @@ After request FsWatches:: /a/b: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js index 821115b3175..3af58dab959 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js @@ -164,7 +164,7 @@ After request FsWatches:: /a/b: *new* {} -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js index 049d38a5bd0..7bb8acb434c 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js @@ -181,7 +181,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js index 785a06fdf91..cb90f5b811d 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js @@ -162,7 +162,7 @@ Info seq [hh:mm:ss:mss] response: After request FsWatches:: -/a/b/commonfile2.ts: *new* +/a/b/commonFile2.ts: *new* {} /a/b/tsconfig.json: *new* {} diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt index 919dc11c7fe..725ef6fb2b2 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt +++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt @@ -5,7 +5,7 @@ file.tsx(12,22): error TS2769: No overload matches this call. Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. -file.tsx(13,12): error TS2769: No overload matches this call. +file.tsx(13,13): error TS2769: No overload matches this call. Overload 1 of 2, '(): Element', gave the following error. Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes'. Property 'yy' does not exist on type 'IntrinsicAttributes'. @@ -38,20 +38,20 @@ file.tsx(25,13): error TS2769: No overload matches this call. Type 'boolean' is not assignable to type 'string'. Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. -file.tsx(26,12): error TS2769: No overload matches this call. +file.tsx(26,13): error TS2769: No overload matches this call. Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. Type '{ yy: string; direction: string; }' is not assignable to type 'IntrinsicAttributes & { "extra-data": string; }'. Property 'yy' does not exist on type 'IntrinsicAttributes & { "extra-data": string; }'. Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. Type 'string' is not assignable to type 'number'. -file.tsx(33,12): error TS2769: No overload matches this call. +file.tsx(33,13): error TS2769: No overload matches this call. Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. Type 'boolean' is not assignable to type 'string'. Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. Type 'boolean' is not assignable to type 'string'. Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. Type 'string' is not assignable to type 'boolean'. -file.tsx(34,12): error TS2769: No overload matches this call. +file.tsx(34,13): error TS2769: No overload matches this call. Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. @@ -60,7 +60,7 @@ file.tsx(34,12): error TS2769: No overload matches this call. Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'. Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. Type 'string' is not assignable to type 'boolean'. -file.tsx(35,12): error TS2769: No overload matches this call. +file.tsx(35,13): error TS2769: No overload matches this call. Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. @@ -68,7 +68,7 @@ file.tsx(35,12): error TS2769: No overload matches this call. Type 'string' is not assignable to type 'Element'. Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. Type 'string' is not assignable to type 'boolean'. -file.tsx(36,12): error TS2769: No overload matches this call. +file.tsx(36,13): error TS2769: No overload matches this call. Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. Type '{ children: string; y1: string; y2: number; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. @@ -100,7 +100,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. !!! error TS2769: Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. !!! error TS2769: Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. const c1 = ; // missing property; - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. !!! error TS2769: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes'. @@ -154,7 +154,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. !!! error TS2769: Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. !!! related TS2728 file.tsx:22:38: 'yy' is declared here. const d2 = - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. !!! error TS2769: Type '{ yy: string; direction: string; }' is not assignable to type 'IntrinsicAttributes & { "extra-data": string; }'. @@ -169,7 +169,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. // Error const e1 = - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. !!! error TS2769: Type 'boolean' is not assignable to type 'string'. @@ -181,7 +181,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. !!! related TS6500 file.tsx:29:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }' !!! related TS6500 file.tsx:30:64: The expected type comes from property 'y3' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' const e2 = - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. !!! error TS2769: Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. @@ -193,7 +193,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. !!! error TS2769: Type 'string' is not assignable to type 'boolean'. !!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' const e3 = - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. !!! error TS2769: Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. @@ -205,7 +205,7 @@ file.tsx(36,12): error TS2769: No overload matches this call. !!! related TS6500 file.tsx:29:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }' !!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' const e4 = Hi - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. !!! error TS2769: Type '{ children: string; y1: string; y2: number; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt index 1aa426b657b..cf6aab23da1 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt +++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt @@ -1,4 +1,4 @@ -file.tsx(48,12): error TS2769: No overload matches this call. +file.tsx(48,13): error TS2769: No overload matches this call. Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. Type '{ children: string; to: string; onClick: (e: MouseEvent) => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. Property 'to' does not exist on type 'IntrinsicAttributes & ButtonProps'. @@ -82,7 +82,7 @@ file.tsx(56,13): error TS2769: No overload matches this call. // Error const b0 = {}}>GO; // extra property; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. !!! error TS2769: Type '{ children: string; to: string; onClick: (e: MouseEvent) => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt index c8fe6a7494a..fdd4fa153df 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt +++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt @@ -1,4 +1,4 @@ -file.tsx(9,14): error TS2769: No overload matches this call. +file.tsx(9,15): error TS2769: No overload matches this call. Overload 1 of 3, '(): Element', gave the following error. Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes'. Property 'a' does not exist on type 'IntrinsicAttributes'. @@ -27,7 +27,7 @@ file.tsx(10,15): error TS2769: No overload matches this call. // Error function Baz(arg1: T, arg2: U) { let a0 = - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 3, '(): Element', gave the following error. !!! error TS2769: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes'. diff --git a/tests/baselines/reference/typeAssertionToGenericFunctionType.errors.txt b/tests/baselines/reference/typeAssertionToGenericFunctionType.errors.txt index f7f231860ad..8cf4ea8be2f 100644 --- a/tests/baselines/reference/typeAssertionToGenericFunctionType.errors.txt +++ b/tests/baselines/reference/typeAssertionToGenericFunctionType.errors.txt @@ -11,6 +11,6 @@ typeAssertionToGenericFunctionType.ts(6,3): error TS2554: Expected 1 arguments, ~ !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. x.b(); // error - ~~~~~~~~~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 typeAssertionToGenericFunctionType.ts:3:12: An argument for 'x' was not provided. \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterConstModifiers.types b/tests/baselines/reference/typeParameterConstModifiers.types index 5f7e230e14a..bf3732eb5a6 100644 --- a/tests/baselines/reference/typeParameterConstModifiers.types +++ b/tests/baselines/reference/typeParameterConstModifiers.types @@ -402,8 +402,8 @@ const thingMapped = >(o: NotEmptyMapped) >o : NotEmptyMapped const tMapped = thingMapped({ foo: '' }); // { foo: "" } ->tMapped : { foo: ""; } ->thingMapped({ foo: '' }) : { foo: ""; } +>tMapped : { readonly foo: ""; } +>thingMapped({ foo: '' }) : { readonly foo: ""; } >thingMapped : >(o: NotEmptyMapped) => NotEmptyMapped >{ foo: '' } : { foo: ""; } >foo : "" diff --git a/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.symbols b/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.symbols new file mode 100644 index 00000000000..5afa119b16a --- /dev/null +++ b/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.symbols @@ -0,0 +1,135 @@ +//// [tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReverseMappedTypes.ts] //// + +=== typeParameterConstModifiersReverseMappedTypes.ts === +declare function test1(obj: { +>test1 : Symbol(test1, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 32)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 1, 3)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 23)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 23)) +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 1, 3)) + +}): [T, typeof obj]; +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 32)) + +const result1 = test1({ +>result1 : Symbol(result1, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 4, 5)) +>test1 : Symbol(test1, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 0, 0)) + + prop: "foo", +>prop : Symbol(prop, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 4, 23)) + + nested: { +>nested : Symbol(nested, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 5, 14)) + + nestedProp: "bar", +>nestedProp : Symbol(nestedProp, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 6, 11)) + + }, +}); + +declare function test2(obj: { +>test2 : Symbol(test2, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 9, 3)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 32)) + + readonly [K in keyof T]: T[K]; +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 12, 12)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 23)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 23)) +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 12, 12)) + +}): [T, typeof obj]; +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 11, 32)) + +const result2 = test2({ +>result2 : Symbol(result2, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 15, 5)) +>test2 : Symbol(test2, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 9, 3)) + + prop: "foo", +>prop : Symbol(prop, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 15, 23)) + + nested: { +>nested : Symbol(nested, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 16, 14)) + + nestedProp: "bar", +>nestedProp : Symbol(nestedProp, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 17, 11)) + + }, +}); + +declare function test3(obj: { +>test3 : Symbol(test3, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 20, 3)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 32)) + + -readonly [K in keyof T]: T[K]; +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 23, 13)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 23)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 23)) +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 23, 13)) + +}): [T, typeof obj]; +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 23)) +>obj : Symbol(obj, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 22, 32)) + +const result3 = test3({ +>result3 : Symbol(result3, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 26, 5)) +>test3 : Symbol(test3, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 20, 3)) + + prop: "foo", +>prop : Symbol(prop, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 26, 23)) + + nested: { +>nested : Symbol(nested, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 27, 14)) + + nestedProp: "bar", +>nestedProp : Symbol(nestedProp, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 28, 11)) + + }, +}); + +declare function test4(arr: { +>test4 : Symbol(test4, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 31, 3)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 33, 23)) +>arr : Symbol(arr, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 33, 59)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 34, 3)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 33, 23)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 33, 23)) +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 34, 3)) + +}): T; +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 33, 23)) + +const result4 = test4(["1", 2]); +>result4 : Symbol(result4, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 37, 5)) +>test4 : Symbol(test4, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 31, 3)) + +declare function test5( +>test5 : Symbol(test5, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 37, 32)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 39, 23)) + + ...args: { +>args : Symbol(args, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 39, 59)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 41, 5)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 39, 23)) +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 39, 23)) +>K : Symbol(K, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 41, 5)) + } +): T; +>T : Symbol(T, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 39, 23)) + +const result5 = test5({ a: "foo" }); +>result5 : Symbol(result5, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 45, 5)) +>test5 : Symbol(test5, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 37, 32)) +>a : Symbol(a, Decl(typeParameterConstModifiersReverseMappedTypes.ts, 45, 23)) + diff --git a/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.types b/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.types new file mode 100644 index 00000000000..fc0a5721419 --- /dev/null +++ b/tests/baselines/reference/typeParameterConstModifiersReverseMappedTypes.types @@ -0,0 +1,123 @@ +//// [tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReverseMappedTypes.ts] //// + +=== typeParameterConstModifiersReverseMappedTypes.ts === +declare function test1(obj: { +>test1 : (obj: { [K in keyof T]: T[K]; }) => [T, typeof obj] +>obj : { [K in keyof T]: T[K]; } + + [K in keyof T]: T[K]; +}): [T, typeof obj]; +>obj : { [K in keyof T]: T[K]; } + +const result1 = test1({ +>result1 : [{ readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }, { readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }] +>test1({ prop: "foo", nested: { nestedProp: "bar", },}) : [{ readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }, { readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }] +>test1 : (obj: { [K in keyof T]: T[K]; }) => [T, { [K in keyof T]: T[K]; }] +>{ prop: "foo", nested: { nestedProp: "bar", },} : { prop: "foo"; nested: { nestedProp: "bar"; }; } + + prop: "foo", +>prop : "foo" +>"foo" : "foo" + + nested: { +>nested : { nestedProp: "bar"; } +>{ nestedProp: "bar", } : { nestedProp: "bar"; } + + nestedProp: "bar", +>nestedProp : "bar" +>"bar" : "bar" + + }, +}); + +declare function test2(obj: { +>test2 : (obj: { readonly [K in keyof T]: T[K]; }) => [T, typeof obj] +>obj : { readonly [K in keyof T]: T[K]; } + + readonly [K in keyof T]: T[K]; +}): [T, typeof obj]; +>obj : { readonly [K in keyof T]: T[K]; } + +const result2 = test2({ +>result2 : [{ prop: "foo"; nested: { readonly nestedProp: "bar"; }; }, { readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }] +>test2({ prop: "foo", nested: { nestedProp: "bar", },}) : [{ prop: "foo"; nested: { readonly nestedProp: "bar"; }; }, { readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }] +>test2 : (obj: { readonly [K in keyof T]: T[K]; }) => [T, { readonly [K in keyof T]: T[K]; }] +>{ prop: "foo", nested: { nestedProp: "bar", },} : { prop: "foo"; nested: { nestedProp: "bar"; }; } + + prop: "foo", +>prop : "foo" +>"foo" : "foo" + + nested: { +>nested : { nestedProp: "bar"; } +>{ nestedProp: "bar", } : { nestedProp: "bar"; } + + nestedProp: "bar", +>nestedProp : "bar" +>"bar" : "bar" + + }, +}); + +declare function test3(obj: { +>test3 : (obj: { -readonly [K in keyof T]: T[K]; }) => [T, typeof obj] +>obj : { -readonly [K in keyof T]: T[K]; } + + -readonly [K in keyof T]: T[K]; +}): [T, typeof obj]; +>obj : { -readonly [K in keyof T]: T[K]; } + +const result3 = test3({ +>result3 : [{ readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }, { prop: "foo"; nested: { readonly nestedProp: "bar"; }; }] +>test3({ prop: "foo", nested: { nestedProp: "bar", },}) : [{ readonly prop: "foo"; readonly nested: { readonly nestedProp: "bar"; }; }, { prop: "foo"; nested: { readonly nestedProp: "bar"; }; }] +>test3 : (obj: { -readonly [K in keyof T]: T[K]; }) => [T, { -readonly [K in keyof T]: T[K]; }] +>{ prop: "foo", nested: { nestedProp: "bar", },} : { prop: "foo"; nested: { nestedProp: "bar"; }; } + + prop: "foo", +>prop : "foo" +>"foo" : "foo" + + nested: { +>nested : { nestedProp: "bar"; } +>{ nestedProp: "bar", } : { nestedProp: "bar"; } + + nestedProp: "bar", +>nestedProp : "bar" +>"bar" : "bar" + + }, +}); + +declare function test4(arr: { +>test4 : (arr: { [K in keyof T]: T[K]; }) => T +>arr : { [K in keyof T]: T[K]; } + + [K in keyof T]: T[K]; +}): T; + +const result4 = test4(["1", 2]); +>result4 : readonly ["1", 2] +>test4(["1", 2]) : readonly ["1", 2] +>test4 : (arr: { [K in keyof T]: T[K]; }) => T +>["1", 2] : ["1", 2] +>"1" : "1" +>2 : 2 + +declare function test5( +>test5 : (...args: { [K in keyof T]: T[K]; }) => T + + ...args: { +>args : { [K in keyof T]: T[K]; } + + [K in keyof T]: T[K]; + } +): T; + +const result5 = test5({ a: "foo" }); +>result5 : readonly [{ readonly a: "foo"; }] +>test5({ a: "foo" }) : readonly [{ readonly a: "foo"; }] +>test5 : (...args: { [K in keyof T]: T[K]; }) => T +>{ a: "foo" } : { a: "foo"; } +>a : "foo" +>"foo" : "foo" + diff --git a/tests/baselines/reference/typeVariableConstraintIntersections.symbols b/tests/baselines/reference/typeVariableConstraintIntersections.symbols new file mode 100644 index 00000000000..ab22dba7117 --- /dev/null +++ b/tests/baselines/reference/typeVariableConstraintIntersections.symbols @@ -0,0 +1,335 @@ +//// [tests/cases/compiler/typeVariableConstraintIntersections.ts] //// + +=== typeVariableConstraintIntersections.ts === +type T00 = K & "a"; +>T00 : Symbol(T00, Decl(typeVariableConstraintIntersections.ts, 0, 0)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 0, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 0, 9)) + +type T01 = K & "c"; +>T01 : Symbol(T01, Decl(typeVariableConstraintIntersections.ts, 0, 40)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 1, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 1, 9)) + +type T02 = K & string; +>T02 : Symbol(T02, Decl(typeVariableConstraintIntersections.ts, 1, 40)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 2, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 2, 9)) + +type T10 = K & "a"; +>T10 : Symbol(T10, Decl(typeVariableConstraintIntersections.ts, 2, 43)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 4, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 4, 9)) + +type T11 = K & "c"; +>T11 : Symbol(T11, Decl(typeVariableConstraintIntersections.ts, 4, 37)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 5, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 5, 9)) + +type T12 = K & string; +>T12 : Symbol(T12, Decl(typeVariableConstraintIntersections.ts, 5, 37)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 6, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 6, 9)) + +type T20 = K & ("a" | "b" | "c"); +>T20 : Symbol(T20, Decl(typeVariableConstraintIntersections.ts, 6, 40)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 8, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 8, 9)) + +type T21 = ("a" | "b" | "c") & K; +>T21 : Symbol(T21, Decl(typeVariableConstraintIntersections.ts, 8, 60)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 9, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 9, 9)) + +type T22 = K & ("a" | "b"); +>T22 : Symbol(T22, Decl(typeVariableConstraintIntersections.ts, 9, 60)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 10, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 10, 9)) + +type T23 = ("a" | "b") & K; +>T23 : Symbol(T23, Decl(typeVariableConstraintIntersections.ts, 10, 54)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 11, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 11, 9)) + +type T30 = K & ("a" | "b" | "c"); +>T30 : Symbol(T30, Decl(typeVariableConstraintIntersections.ts, 11, 54)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 13, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 13, 9)) + +type T31 = ("a" | "b" | "c") & K; +>T31 : Symbol(T31, Decl(typeVariableConstraintIntersections.ts, 13, 54)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 14, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 14, 9)) + +type T32 = K & ("a" | "b"); +>T32 : Symbol(T32, Decl(typeVariableConstraintIntersections.ts, 14, 54)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 15, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 15, 9)) + +type T33 = ("a" | "b") & K; +>T33 : Symbol(T33, Decl(typeVariableConstraintIntersections.ts, 15, 48)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 16, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 16, 9)) + +type T40 = K & undefined; +>T40 : Symbol(T40, Decl(typeVariableConstraintIntersections.ts, 16, 48)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 18, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 18, 9)) + +type T41 = K & null; +>T41 : Symbol(T41, Decl(typeVariableConstraintIntersections.ts, 18, 39)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 19, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 19, 9)) + +type T42 = K & object; +>T42 : Symbol(T42, Decl(typeVariableConstraintIntersections.ts, 19, 34)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 20, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 20, 9)) + +type T43 = K & {}; +>T43 : Symbol(T43, Decl(typeVariableConstraintIntersections.ts, 20, 36)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 21, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 21, 9)) + +type T50 = K & "a"; +>T50 : Symbol(T50, Decl(typeVariableConstraintIntersections.ts, 21, 32)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 23, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 23, 9)) + +type T51 = K & "b"; +>T51 : Symbol(T51, Decl(typeVariableConstraintIntersections.ts, 23, 38)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 24, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 24, 9)) + +type T52 = K & string; +>T52 : Symbol(T52, Decl(typeVariableConstraintIntersections.ts, 24, 38)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 25, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 25, 9)) + +type T53 = K & 0; +>T53 : Symbol(T53, Decl(typeVariableConstraintIntersections.ts, 25, 41)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 26, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 26, 9)) + +type T54 = K & 1; +>T54 : Symbol(T54, Decl(typeVariableConstraintIntersections.ts, 26, 36)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 27, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 27, 9)) + +type T55 = K & number; +>T55 : Symbol(T55, Decl(typeVariableConstraintIntersections.ts, 27, 36)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 28, 9)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 28, 9)) + +type T60 = U & "a"; +>T60 : Symbol(T60, Decl(typeVariableConstraintIntersections.ts, 28, 41)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 30, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 30, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 30, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 30, 29)) + +type T61 = U & ("a" | "b"); +>T61 : Symbol(T61, Decl(typeVariableConstraintIntersections.ts, 30, 53)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 31, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 31, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 31, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 31, 29)) + +type T62 = U & ("a" | "b" | "c"); +>T62 : Symbol(T62, Decl(typeVariableConstraintIntersections.ts, 31, 61)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 32, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 32, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 32, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 32, 29)) + +type T63 = U & string; +>T63 : Symbol(T63, Decl(typeVariableConstraintIntersections.ts, 32, 67)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 33, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 33, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 33, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 33, 29)) + +type T70 = U & "a"; +>T70 : Symbol(T70, Decl(typeVariableConstraintIntersections.ts, 33, 56)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 35, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 35, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 35, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 35, 29)) + +type T71 = U & ("a" | "b"); +>T71 : Symbol(T71, Decl(typeVariableConstraintIntersections.ts, 35, 59)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 36, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 36, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 36, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 36, 29)) + +type T72 = U & ("a" | "b" | "c"); +>T72 : Symbol(T72, Decl(typeVariableConstraintIntersections.ts, 36, 67)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 37, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 37, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 37, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 37, 29)) + +type T73 = U & string; +>T73 : Symbol(T73, Decl(typeVariableConstraintIntersections.ts, 37, 73)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 38, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 38, 29)) +>T : Symbol(T, Decl(typeVariableConstraintIntersections.ts, 38, 9)) +>U : Symbol(U, Decl(typeVariableConstraintIntersections.ts, 38, 29)) + +declare function isA(x: any): x is "a"; +>isA : Symbol(isA, Decl(typeVariableConstraintIntersections.ts, 38, 62)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 40, 21)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 40, 21)) + +declare function isB(x: any): x is "b"; +>isB : Symbol(isB, Decl(typeVariableConstraintIntersections.ts, 40, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 41, 21)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 41, 21)) + +declare function isC(x: any): x is "c"; +>isC : Symbol(isC, Decl(typeVariableConstraintIntersections.ts, 41, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 42, 21)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 42, 21)) + +function foo(x: K) { +>foo : Symbol(foo, Decl(typeVariableConstraintIntersections.ts, 42, 39)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 44, 13)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 44, 13)) + + if (isA(x)) { +>isA : Symbol(isA, Decl(typeVariableConstraintIntersections.ts, 38, 62)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + + x; // K & "a" +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + } + if (isB(x)) { +>isB : Symbol(isB, Decl(typeVariableConstraintIntersections.ts, 40, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + + x; // K & "b" +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + } + if (isC(x)) { +>isC : Symbol(isC, Decl(typeVariableConstraintIntersections.ts, 41, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + + x; // never +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + } + if (isA(x) || isB(x)) { +>isA : Symbol(isA, Decl(typeVariableConstraintIntersections.ts, 38, 62)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) +>isB : Symbol(isB, Decl(typeVariableConstraintIntersections.ts, 40, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + + x; // K +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + } + if (!(isA(x) || isB(x))) { +>isA : Symbol(isA, Decl(typeVariableConstraintIntersections.ts, 38, 62)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) +>isB : Symbol(isB, Decl(typeVariableConstraintIntersections.ts, 40, 39)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) + + return; + } + x; // K +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 44, 34)) +} + +// Example from #30581 + +type OptionOne = { +>OptionOne : Symbol(OptionOne, Decl(typeVariableConstraintIntersections.ts, 61, 1)) + + kind: "one"; +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 65, 18)) + + s: string; +>s : Symbol(s, Decl(typeVariableConstraintIntersections.ts, 66, 14)) + +}; + +type OptionTwo = { +>OptionTwo : Symbol(OptionTwo, Decl(typeVariableConstraintIntersections.ts, 68, 2)) + + kind: "two"; +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 70, 18)) + + x: number; +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 71, 14)) + + y: number; +>y : Symbol(y, Decl(typeVariableConstraintIntersections.ts, 72, 12)) + +}; + +type Options = OptionOne | OptionTwo; +>Options : Symbol(Options, Decl(typeVariableConstraintIntersections.ts, 74, 2)) +>OptionOne : Symbol(OptionOne, Decl(typeVariableConstraintIntersections.ts, 61, 1)) +>OptionTwo : Symbol(OptionTwo, Decl(typeVariableConstraintIntersections.ts, 68, 2)) + +type OptionHandlers = { +>OptionHandlers : Symbol(OptionHandlers, Decl(typeVariableConstraintIntersections.ts, 76, 37)) + + [K in Options['kind']]: (option: Options & { kind: K }) => string; +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 79, 3)) +>Options : Symbol(Options, Decl(typeVariableConstraintIntersections.ts, 74, 2)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 79, 27)) +>Options : Symbol(Options, Decl(typeVariableConstraintIntersections.ts, 74, 2)) +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 79, 46)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 79, 3)) +} + +const optionHandlers: OptionHandlers = { +>optionHandlers : Symbol(optionHandlers, Decl(typeVariableConstraintIntersections.ts, 82, 5)) +>OptionHandlers : Symbol(OptionHandlers, Decl(typeVariableConstraintIntersections.ts, 76, 37)) + + "one": option => option.s, +>"one" : Symbol("one", Decl(typeVariableConstraintIntersections.ts, 82, 40)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 83, 8)) +>option.s : Symbol(s, Decl(typeVariableConstraintIntersections.ts, 66, 14)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 83, 8)) +>s : Symbol(s, Decl(typeVariableConstraintIntersections.ts, 66, 14)) + + "two": option => option.x + "," + option.y, +>"two" : Symbol("two", Decl(typeVariableConstraintIntersections.ts, 83, 28)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 84, 8)) +>option.x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 71, 14)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 84, 8)) +>x : Symbol(x, Decl(typeVariableConstraintIntersections.ts, 71, 14)) +>option.y : Symbol(y, Decl(typeVariableConstraintIntersections.ts, 72, 12)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 84, 8)) +>y : Symbol(y, Decl(typeVariableConstraintIntersections.ts, 72, 12)) + +}; + +function handleOption(option: Options & { kind: K }): string { +>handleOption : Symbol(handleOption, Decl(typeVariableConstraintIntersections.ts, 85, 2)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 87, 22)) +>Options : Symbol(Options, Decl(typeVariableConstraintIntersections.ts, 74, 2)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 87, 49)) +>Options : Symbol(Options, Decl(typeVariableConstraintIntersections.ts, 74, 2)) +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 87, 68)) +>K : Symbol(K, Decl(typeVariableConstraintIntersections.ts, 87, 22)) + + const kind = option.kind; +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 88, 7)) +>option.kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 65, 18), Decl(typeVariableConstraintIntersections.ts, 87, 68), Decl(typeVariableConstraintIntersections.ts, 70, 18), Decl(typeVariableConstraintIntersections.ts, 87, 68)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 87, 49)) +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 65, 18), Decl(typeVariableConstraintIntersections.ts, 87, 68), Decl(typeVariableConstraintIntersections.ts, 70, 18), Decl(typeVariableConstraintIntersections.ts, 87, 68)) + + const handler = optionHandlers[kind]; +>handler : Symbol(handler, Decl(typeVariableConstraintIntersections.ts, 89, 7)) +>optionHandlers : Symbol(optionHandlers, Decl(typeVariableConstraintIntersections.ts, 82, 5)) +>kind : Symbol(kind, Decl(typeVariableConstraintIntersections.ts, 88, 7)) + + return handler(option); +>handler : Symbol(handler, Decl(typeVariableConstraintIntersections.ts, 89, 7)) +>option : Symbol(option, Decl(typeVariableConstraintIntersections.ts, 87, 49)) + +}; + diff --git a/tests/baselines/reference/typeVariableConstraintIntersections.types b/tests/baselines/reference/typeVariableConstraintIntersections.types new file mode 100644 index 00000000000..6d89a64f8a0 --- /dev/null +++ b/tests/baselines/reference/typeVariableConstraintIntersections.types @@ -0,0 +1,258 @@ +//// [tests/cases/compiler/typeVariableConstraintIntersections.ts] //// + +=== typeVariableConstraintIntersections.ts === +type T00 = K & "a"; +>T00 : T00 + +type T01 = K & "c"; +>T01 : never + +type T02 = K & string; +>T02 : K + +type T10 = K & "a"; +>T10 : T10 + +type T11 = K & "c"; +>T11 : T11 + +type T12 = K & string; +>T12 : K + +type T20 = K & ("a" | "b" | "c"); +>T20 : K + +type T21 = ("a" | "b" | "c") & K; +>T21 : K + +type T22 = K & ("a" | "b"); +>T22 : T22 + +type T23 = ("a" | "b") & K; +>T23 : T23 + +type T30 = K & ("a" | "b" | "c"); +>T30 : K + +type T31 = ("a" | "b" | "c") & K; +>T31 : K + +type T32 = K & ("a" | "b"); +>T32 : K + +type T33 = ("a" | "b") & K; +>T33 : K + +type T40 = K & undefined; +>T40 : never + +type T41 = K & null; +>T41 : never + +type T42 = K & object; +>T42 : T42 + +type T43 = K & {}; +>T43 : K + +type T50 = K & "a"; +>T50 : T50 + +type T51 = K & "b"; +>T51 : never + +type T52 = K & string; +>T52 : T52 + +type T53 = K & 0; +>T53 : T53 + +type T54 = K & 1; +>T54 : never + +type T55 = K & number; +>T55 : T55 + +type T60 = U & "a"; +>T60 : T60 + +type T61 = U & ("a" | "b"); +>T61 : U + +type T62 = U & ("a" | "b" | "c"); +>T62 : U + +type T63 = U & string; +>T63 : U + +type T70 = U & "a"; +>T70 : T70 + +type T71 = U & ("a" | "b"); +>T71 : T71 + +type T72 = U & ("a" | "b" | "c"); +>T72 : U + +type T73 = U & string; +>T73 : U + +declare function isA(x: any): x is "a"; +>isA : (x: any) => x is "a" +>x : any + +declare function isB(x: any): x is "b"; +>isB : (x: any) => x is "b" +>x : any + +declare function isC(x: any): x is "c"; +>isC : (x: any) => x is "c" +>x : any + +function foo(x: K) { +>foo : (x: K) => void +>x : K + + if (isA(x)) { +>isA(x) : boolean +>isA : (x: any) => x is "a" +>x : "a" | "b" + + x; // K & "a" +>x : K & "a" + } + if (isB(x)) { +>isB(x) : boolean +>isB : (x: any) => x is "b" +>x : "a" | "b" + + x; // K & "b" +>x : K & "b" + } + if (isC(x)) { +>isC(x) : boolean +>isC : (x: any) => x is "c" +>x : "a" | "b" + + x; // never +>x : never + } + if (isA(x) || isB(x)) { +>isA(x) || isB(x) : boolean +>isA(x) : boolean +>isA : (x: any) => x is "a" +>x : "a" | "b" +>isB(x) : boolean +>isB : (x: any) => x is "b" +>x : "b" + + x; // K +>x : K + } + if (!(isA(x) || isB(x))) { +>!(isA(x) || isB(x)) : boolean +>(isA(x) || isB(x)) : boolean +>isA(x) || isB(x) : boolean +>isA(x) : boolean +>isA : (x: any) => x is "a" +>x : "a" | "b" +>isB(x) : boolean +>isB : (x: any) => x is "b" +>x : "b" + + return; + } + x; // K +>x : K +} + +// Example from #30581 + +type OptionOne = { +>OptionOne : { kind: "one"; s: string; } + + kind: "one"; +>kind : "one" + + s: string; +>s : string + +}; + +type OptionTwo = { +>OptionTwo : { kind: "two"; x: number; y: number; } + + kind: "two"; +>kind : "two" + + x: number; +>x : number + + y: number; +>y : number + +}; + +type Options = OptionOne | OptionTwo; +>Options : OptionOne | OptionTwo + +type OptionHandlers = { +>OptionHandlers : { one: (option: OptionOne & { kind: "one"; }) => string; two: (option: OptionTwo & { kind: "two"; }) => string; } + + [K in Options['kind']]: (option: Options & { kind: K }) => string; +>option : Options & { kind: K; } +>kind : K +} + +const optionHandlers: OptionHandlers = { +>optionHandlers : OptionHandlers +>{ "one": option => option.s, "two": option => option.x + "," + option.y,} : { one: (option: OptionOne & { kind: "one"; }) => string; two: (option: OptionTwo & { kind: "two"; }) => string; } + + "one": option => option.s, +>"one" : (option: OptionOne & { kind: "one"; }) => string +>option => option.s : (option: OptionOne & { kind: "one"; }) => string +>option : OptionOne & { kind: "one"; } +>option.s : string +>option : OptionOne & { kind: "one"; } +>s : string + + "two": option => option.x + "," + option.y, +>"two" : (option: OptionTwo & { kind: "two"; }) => string +>option => option.x + "," + option.y : (option: OptionTwo & { kind: "two"; }) => string +>option : OptionTwo & { kind: "two"; } +>option.x + "," + option.y : string +>option.x + "," : string +>option.x : number +>option : OptionTwo & { kind: "two"; } +>x : number +>"," : "," +>option.y : number +>option : OptionTwo & { kind: "two"; } +>y : number + +}; + +function handleOption(option: Options & { kind: K }): string { +>handleOption : (option: Options & { kind: K; }) => string +>option : Options & { kind: K; } +>kind : K + + const kind = option.kind; +>kind : K +>option.kind : K +>option : Options & { kind: K; } +>kind : K + + const handler = optionHandlers[kind]; +>handler : OptionHandlers[K] +>optionHandlers[kind] : OptionHandlers[K] +>optionHandlers : OptionHandlers +>kind : K + + return handler(option); +>handler(option) : string +>handler : OptionHandlers[K] +>option : Options & { kind: K; } + +}; + diff --git a/tests/baselines/reference/typesVersions.ambientModules.trace.json b/tests/baselines/reference/typesVersions.ambientModules.trace.json index b83224aec0d..b8461698d9e 100644 --- a/tests/baselines/reference/typesVersions.ambientModules.trace.json +++ b/tests/baselines/reference/typesVersions.ambientModules.trace.json @@ -822,6 +822,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersions.emptyTypes.trace.json b/tests/baselines/reference/typesVersions.emptyTypes.trace.json index 826ef3c5b5a..6a0282a43d6 100644 --- a/tests/baselines/reference/typesVersions.emptyTypes.trace.json +++ b/tests/baselines/reference/typesVersions.emptyTypes.trace.json @@ -853,6 +853,19 @@ "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersions.justIndex.trace.json b/tests/baselines/reference/typesVersions.justIndex.trace.json index 129eb5c2d12..6177a45aaac 100644 --- a/tests/baselines/reference/typesVersions.justIndex.trace.json +++ b/tests/baselines/reference/typesVersions.justIndex.trace.json @@ -853,6 +853,19 @@ "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersions.multiFile.trace.json b/tests/baselines/reference/typesVersions.multiFile.trace.json index 3bdc67a0931..589e95c6469 100644 --- a/tests/baselines/reference/typesVersions.multiFile.trace.json +++ b/tests/baselines/reference/typesVersions.multiFile.trace.json @@ -801,6 +801,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json index b83224aec0d..b8461698d9e 100644 --- a/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json +++ b/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json @@ -822,6 +822,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json index 3bdc67a0931..589e95c6469 100644 --- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json +++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json @@ -801,6 +801,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json index 0ce2b1bbe30..231fee4507e 100644 --- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json +++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json @@ -824,6 +824,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json index 9e2cbc93c72..c31f2afd0f3 100644 --- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json +++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json @@ -807,6 +807,18 @@ "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name '@typescript/lib-esnext/disposable' was not resolved. ========", + "======== Resolving module '@typescript/lib-esnext/promise' from '/.src/__lib_node_modules_lookup_lib.esnext.promise.d.ts__.ts'. ========", + "Explicitly specified module resolution kind: 'Node10'.", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.", + "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", + "Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Scoped package detected, looking in 'typescript__lib-esnext/promise'", + "Loading module '@typescript/lib-esnext/promise' from 'node_modules' folder, target file types: JavaScript.", + "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "======== Module name '@typescript/lib-esnext/promise' was not resolved. ========", "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/uncalledFunctionChecksInConditional2.errors.txt b/tests/baselines/reference/uncalledFunctionChecksInConditional2.errors.txt index af6aea3676d..54feef1029a 100644 --- a/tests/baselines/reference/uncalledFunctionChecksInConditional2.errors.txt +++ b/tests/baselines/reference/uncalledFunctionChecksInConditional2.errors.txt @@ -69,4 +69,16 @@ uncalledFunctionChecksInConditional2.ts(49,5): error TS2774: This condition will } } }; + + let _isMobile: boolean; + function isMobile() { + if (_isMobile === undefined) { + const isMobileMatch = + typeof window !== 'undefined' && + window.matchMedia && // no error + window.matchMedia('(max-device-width: 680px)'); + _isMobile = isMobileMatch && isMobileMatch.matches; + } + return _isMobile; + } \ No newline at end of file diff --git a/tests/baselines/reference/uncalledFunctionChecksInConditional2.js b/tests/baselines/reference/uncalledFunctionChecksInConditional2.js index cf63e988127..becc23beb1e 100644 --- a/tests/baselines/reference/uncalledFunctionChecksInConditional2.js +++ b/tests/baselines/reference/uncalledFunctionChecksInConditional2.js @@ -60,6 +60,18 @@ declare let inBrowser: boolean; } } }; + +let _isMobile: boolean; +function isMobile() { + if (_isMobile === undefined) { + const isMobileMatch = + typeof window !== 'undefined' && + window.matchMedia && // no error + window.matchMedia('(max-device-width: 680px)'); + _isMobile = isMobileMatch && isMobileMatch.matches; + } + return _isMobile; +} //// [uncalledFunctionChecksInConditional2.js] @@ -109,3 +121,13 @@ var _a; } } ; +var _isMobile; +function isMobile() { + if (_isMobile === undefined) { + var isMobileMatch = typeof window !== 'undefined' && + window.matchMedia && // no error + window.matchMedia('(max-device-width: 680px)'); + _isMobile = isMobileMatch && isMobileMatch.matches; + } + return _isMobile; +} diff --git a/tests/baselines/reference/uncalledFunctionChecksInConditional2.symbols b/tests/baselines/reference/uncalledFunctionChecksInConditional2.symbols index 19c500ea8be..a98be45df9f 100644 --- a/tests/baselines/reference/uncalledFunctionChecksInConditional2.symbols +++ b/tests/baselines/reference/uncalledFunctionChecksInConditional2.symbols @@ -174,3 +174,40 @@ declare let inBrowser: boolean; } }; +let _isMobile: boolean; +>_isMobile : Symbol(_isMobile, Decl(uncalledFunctionChecksInConditional2.ts, 60, 3)) + +function isMobile() { +>isMobile : Symbol(isMobile, Decl(uncalledFunctionChecksInConditional2.ts, 60, 23)) + + if (_isMobile === undefined) { +>_isMobile : Symbol(_isMobile, Decl(uncalledFunctionChecksInConditional2.ts, 60, 3)) +>undefined : Symbol(undefined) + + const isMobileMatch = +>isMobileMatch : Symbol(isMobileMatch, Decl(uncalledFunctionChecksInConditional2.ts, 63, 9)) + + typeof window !== 'undefined' && +>window : Symbol(window, Decl(lib.dom.d.ts, --, --)) + + window.matchMedia && // no error +>window.matchMedia : Symbol(matchMedia, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) +>window : Symbol(window, Decl(lib.dom.d.ts, --, --)) +>matchMedia : Symbol(matchMedia, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) + + window.matchMedia('(max-device-width: 680px)'); +>window.matchMedia : Symbol(matchMedia, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) +>window : Symbol(window, Decl(lib.dom.d.ts, --, --)) +>matchMedia : Symbol(matchMedia, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) + + _isMobile = isMobileMatch && isMobileMatch.matches; +>_isMobile : Symbol(_isMobile, Decl(uncalledFunctionChecksInConditional2.ts, 60, 3)) +>isMobileMatch : Symbol(isMobileMatch, Decl(uncalledFunctionChecksInConditional2.ts, 63, 9)) +>isMobileMatch.matches : Symbol(MediaQueryList.matches, Decl(lib.dom.d.ts, --, --)) +>isMobileMatch : Symbol(isMobileMatch, Decl(uncalledFunctionChecksInConditional2.ts, 63, 9)) +>matches : Symbol(MediaQueryList.matches, Decl(lib.dom.d.ts, --, --)) + } + return _isMobile; +>_isMobile : Symbol(_isMobile, Decl(uncalledFunctionChecksInConditional2.ts, 60, 3)) +} + diff --git a/tests/baselines/reference/uncalledFunctionChecksInConditional2.types b/tests/baselines/reference/uncalledFunctionChecksInConditional2.types index 60eeef5fb8d..a14c167b9aa 100644 --- a/tests/baselines/reference/uncalledFunctionChecksInConditional2.types +++ b/tests/baselines/reference/uncalledFunctionChecksInConditional2.types @@ -215,3 +215,50 @@ declare let inBrowser: boolean; } }; +let _isMobile: boolean; +>_isMobile : boolean + +function isMobile() { +>isMobile : () => boolean + + if (_isMobile === undefined) { +>_isMobile === undefined : boolean +>_isMobile : boolean +>undefined : undefined + + const isMobileMatch = +>isMobileMatch : false | MediaQueryList + + typeof window !== 'undefined' && +>typeof window !== 'undefined' && window.matchMedia && // no error window.matchMedia('(max-device-width: 680px)') : false | MediaQueryList +>typeof window !== 'undefined' && window.matchMedia : false | (((query: string) => MediaQueryList) & ((query: string) => MediaQueryList)) +>typeof window !== 'undefined' : boolean +>typeof window : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>window : Window & typeof globalThis +>'undefined' : "undefined" + + window.matchMedia && // no error +>window.matchMedia : ((query: string) => MediaQueryList) & ((query: string) => MediaQueryList) +>window : Window & typeof globalThis +>matchMedia : ((query: string) => MediaQueryList) & ((query: string) => MediaQueryList) + + window.matchMedia('(max-device-width: 680px)'); +>window.matchMedia('(max-device-width: 680px)') : MediaQueryList +>window.matchMedia : ((query: string) => MediaQueryList) & ((query: string) => MediaQueryList) +>window : Window & typeof globalThis +>matchMedia : ((query: string) => MediaQueryList) & ((query: string) => MediaQueryList) +>'(max-device-width: 680px)' : "(max-device-width: 680px)" + + _isMobile = isMobileMatch && isMobileMatch.matches; +>_isMobile = isMobileMatch && isMobileMatch.matches : boolean +>_isMobile : boolean +>isMobileMatch && isMobileMatch.matches : boolean +>isMobileMatch : false | MediaQueryList +>isMobileMatch.matches : boolean +>isMobileMatch : MediaQueryList +>matches : boolean + } + return _isMobile; +>_isMobile : boolean +} + diff --git a/tests/baselines/reference/underscoreTest1.errors.txt b/tests/baselines/reference/underscoreTest1.errors.txt index 700bdfc4001..f3070567b8d 100644 --- a/tests/baselines/reference/underscoreTest1.errors.txt +++ b/tests/baselines/reference/underscoreTest1.errors.txt @@ -1,4 +1,4 @@ -underscoreTest1_underscoreTests.ts(26,1): error TS2769: No overload matches this call. +underscoreTest1_underscoreTests.ts(26,3): error TS2769: No overload matches this call. Overload 1 of 2, '(list: (string | number | boolean)[], iterator?: Iterator_, context?: any): boolean', gave the following error. Argument of type '(value: T) => T' is not assignable to parameter of type 'Iterator_'. Type 'string | number | boolean' is not assignable to type 'boolean'. @@ -35,7 +35,7 @@ underscoreTest1_underscoreTests.ts(26,1): error TS2769: No overload matches this var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0); _.all([true, 1, null, 'yes'], _.identity); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2769: No overload matches this call. !!! error TS2769: Overload 1 of 2, '(list: (string | number | boolean)[], iterator?: Iterator_, context?: any): boolean', gave the following error. !!! error TS2769: Argument of type '(value: T) => T' is not assignable to parameter of type 'Iterator_'. diff --git a/tests/baselines/reference/unionTypeCallSignatures.errors.txt b/tests/baselines/reference/unionTypeCallSignatures.errors.txt index 3af5487b201..1206a615f29 100644 --- a/tests/baselines/reference/unionTypeCallSignatures.errors.txt +++ b/tests/baselines/reference/unionTypeCallSignatures.errors.txt @@ -71,7 +71,7 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 !!! error TS2769: Overload 2 of 2, '(a: string): string | boolean', gave the following error. !!! error TS2769: Argument of type 'boolean' is not assignable to parameter of type 'string'. unionOfDifferentReturnType1(); // error missing parameter - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:12:37: An argument for 'a' was not provided. @@ -83,13 +83,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'never'. unionOfDifferentParameterTypes();// error - no call signatures - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:18:40: An argument for 'a' was not provided. var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; }; unionOfDifferentNumberOfSignatures(); // error - no call signatures - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:23:44: An argument for 'a' was not provided. unionOfDifferentNumberOfSignatures(10); // error - no call signatures @@ -99,11 +99,11 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ; unionWithDifferentParameterCount();// needs more args - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:28:69: An argument for 'a' was not provided. unionWithDifferentParameterCount("hello");// needs more args - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 unionTypeCallSignatures.ts:28:80: An argument for 'b' was not provided. unionWithDifferentParameterCount("hello", 10);// OK @@ -115,13 +115,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithOptionalParameter1(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:33:37: An argument for 'a' was not provided. var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number }; strOrNum = unionWithOptionalParameter2('hello'); // error no call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 unionTypeCallSignatures.ts:39:87: An argument for 'b' was not provided. strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature @@ -129,7 +129,7 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithOptionalParameter2(); // error no call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:39:76: An argument for 'a' was not provided. @@ -140,7 +140,7 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithOptionalParameter3(); // needs more args - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 1-2 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:45:37: An argument for 'a' was not provided. @@ -152,13 +152,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithRestParameter1(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:51:33: An argument for 'a' was not provided. var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number }; strOrNum = unionWithRestParameter2('hello'); // error no call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 unionTypeCallSignatures.ts:58:87: An argument for 'b' was not provided. strOrNum = unionWithRestParameter2('hello', 10); // error no call signature @@ -169,7 +169,7 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithRestParameter2(); // error no call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:58:76: An argument for 'a' was not provided. @@ -181,13 +181,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. strOrNum = unionWithRestParameter3(); // error no call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2555: Expected at least 1 arguments, but got 0. !!! related TS6210 unionTypeCallSignatures.ts:65:33: An argument for 'a' was not provided. var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; }; strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 unionTypeCallSignatures.ts:72:76: An argument for 'b' was not provided. strOrNum = unionWithRestParameter4("hello", "world"); diff --git a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt index aec33944383..3a790cf5d99 100644 --- a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt +++ b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt @@ -26,7 +26,7 @@ unionTypeCallSignatures4.ts(25,18): error TS2554: Expected 2 arguments, but got var f12345: F1 | F2 | F3 | F4 | F5; f12345("a"); // error - ~~~~~~~~~~~ + ~~~~~~ !!! error TS2554: Expected 2 arguments, but got 1. !!! related TS6210 unionTypeCallSignatures4.ts:5:23: An argument for 'b' was not provided. f12345("a", "b"); diff --git a/tests/baselines/reference/unionTypeCallSignatures6.errors.txt b/tests/baselines/reference/unionTypeCallSignatures6.errors.txt index d04dd49fdb3..a3e4e593fc4 100644 --- a/tests/baselines/reference/unionTypeCallSignatures6.errors.txt +++ b/tests/baselines/reference/unionTypeCallSignatures6.errors.txt @@ -6,12 +6,7 @@ unionTypeCallSignatures6.ts(38,4): error TS2349: This expression is not callable unionTypeCallSignatures6.ts(39,1): error TS2684: The 'this' context of type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' is not assignable to method's 'this' of type 'B'. Property 'b' is missing in type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' but required in type 'B'. unionTypeCallSignatures6.ts(48,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'. -unionTypeCallSignatures6.ts(55,1): error TS2769: No overload matches this call. - Overload 1 of 2, '(this: A & B & C): void', gave the following error. - The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B & C'. - Type 'void' is not assignable to type 'A'. - Overload 2 of 2, '(this: A & B): void', gave the following error. - The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'. +unionTypeCallSignatures6.ts(55,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'. ==== unionTypeCallSignatures6.ts (6 errors) ==== @@ -85,10 +80,5 @@ unionTypeCallSignatures6.ts(55,1): error TS2769: No overload matches this call. declare var f4: F6 | F7; f4(); // error ~~~~ -!!! error TS2769: No overload matches this call. -!!! error TS2769: Overload 1 of 2, '(this: A & B & C): void', gave the following error. -!!! error TS2769: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B & C'. -!!! error TS2769: Type 'void' is not assignable to type 'A'. -!!! error TS2769: Overload 2 of 2, '(this: A & B): void', gave the following error. -!!! error TS2769: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'. +!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'. \ No newline at end of file diff --git a/tests/baselines/reference/unionTypeCallSignatures7.symbols b/tests/baselines/reference/unionTypeCallSignatures7.symbols new file mode 100644 index 00000000000..4082ac25248 --- /dev/null +++ b/tests/baselines/reference/unionTypeCallSignatures7.symbols @@ -0,0 +1,26 @@ +//// [tests/cases/conformance/types/union/unionTypeCallSignatures7.ts] //// + +=== unionTypeCallSignatures7.ts === +// https://github.com/microsoft/TypeScript/issues/55203 + +interface Callable { +>Callable : Symbol(Callable, Decl(unionTypeCallSignatures7.ts, 0, 0)) +>Name : Symbol(Name, Decl(unionTypeCallSignatures7.ts, 2, 19)) + + (): `${Name} without id`; +>Name : Symbol(Name, Decl(unionTypeCallSignatures7.ts, 2, 19)) + + (id: number): `${Name} with id`; +>id : Symbol(id, Decl(unionTypeCallSignatures7.ts, 4, 3)) +>Name : Symbol(Name, Decl(unionTypeCallSignatures7.ts, 2, 19)) +} + +declare const f: Callable<"A"> | Callable<"B">; +>f : Symbol(f, Decl(unionTypeCallSignatures7.ts, 7, 13)) +>Callable : Symbol(Callable, Decl(unionTypeCallSignatures7.ts, 0, 0)) +>Callable : Symbol(Callable, Decl(unionTypeCallSignatures7.ts, 0, 0)) + +const result = f(123); +>result : Symbol(result, Decl(unionTypeCallSignatures7.ts, 8, 5)) +>f : Symbol(f, Decl(unionTypeCallSignatures7.ts, 7, 13)) + diff --git a/tests/baselines/reference/unionTypeCallSignatures7.types b/tests/baselines/reference/unionTypeCallSignatures7.types new file mode 100644 index 00000000000..9d777eb4c00 --- /dev/null +++ b/tests/baselines/reference/unionTypeCallSignatures7.types @@ -0,0 +1,20 @@ +//// [tests/cases/conformance/types/union/unionTypeCallSignatures7.ts] //// + +=== unionTypeCallSignatures7.ts === +// https://github.com/microsoft/TypeScript/issues/55203 + +interface Callable { + (): `${Name} without id`; + (id: number): `${Name} with id`; +>id : number +} + +declare const f: Callable<"A"> | Callable<"B">; +>f : Callable<"A"> | Callable<"B"> + +const result = f(123); +>result : "A with id" | "B with id" +>f(123) : "A with id" | "B with id" +>f : Callable<"A"> | Callable<"B"> +>123 : 123 + diff --git a/tests/baselines/reference/unionTypeReduction2.errors.txt b/tests/baselines/reference/unionTypeReduction2.errors.txt index 3cbed1418cd..2e6789d7e4c 100644 --- a/tests/baselines/reference/unionTypeReduction2.errors.txt +++ b/tests/baselines/reference/unionTypeReduction2.errors.txt @@ -35,7 +35,7 @@ unionTypeReduction2.ts(33,5): error TS2554: Expected 1 arguments, but got 0. function f6(x: (x: 'hello' | undefined) => void, y: (x?: string) => void) { let f = !!true ? x : y; // (x: 'hello' | undefined) => void f(); // Error - ~~~ + ~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 unionTypeReduction2.ts:31:17: An argument for 'x' was not provided. f('hello'); diff --git a/tests/baselines/reference/unknownControlFlow.errors.txt b/tests/baselines/reference/unknownControlFlow.errors.txt index 2fa0730617d..e8f4f198a50 100644 --- a/tests/baselines/reference/unknownControlFlow.errors.txt +++ b/tests/baselines/reference/unknownControlFlow.errors.txt @@ -3,9 +3,11 @@ unknownControlFlow.ts(283,5): error TS2536: Type 'keyof (T & {})' cannot be used unknownControlFlow.ts(290,11): error TS2345: Argument of type 'string' is not assignable to parameter of type 'never'. unknownControlFlow.ts(291,5): error TS2345: Argument of type 'null' is not assignable to parameter of type 'never'. unknownControlFlow.ts(293,5): error TS2345: Argument of type 'null' is not assignable to parameter of type 'never'. +unknownControlFlow.ts(323,9): error TS2367: This comparison appears to be unintentional because the types 'T' and 'number' have no overlap. +unknownControlFlow.ts(341,9): error TS2367: This comparison appears to be unintentional because the types 'T' and 'number' have no overlap. -==== unknownControlFlow.ts (5 errors) ==== +==== unknownControlFlow.ts (7 errors) ==== type T01 = {} & string; // {} & string type T02 = {} & 'a'; // 'a' type T03 = {} & object; // object @@ -339,6 +341,8 @@ unknownControlFlow.ts(293,5): error TS2345: Argument of type 'null' is not assig function fx2(value: T & ({} | null)) { if (value === 42) { + ~~~~~~~~~~~~ +!!! error TS2367: This comparison appears to be unintentional because the types 'T' and 'number' have no overlap. value; // T & {} } else { @@ -357,6 +361,8 @@ unknownControlFlow.ts(293,5): error TS2345: Argument of type 'null' is not assig function fx4(value: T & ({} | null)) { if (value === 42) { + ~~~~~~~~~~~~ +!!! error TS2367: This comparison appears to be unintentional because the types 'T' and 'number' have no overlap. value; // T & {} } else { diff --git a/tests/baselines/reference/unknownControlFlow.types b/tests/baselines/reference/unknownControlFlow.types index 4f452904c71..7b320964b83 100644 --- a/tests/baselines/reference/unknownControlFlow.types +++ b/tests/baselines/reference/unknownControlFlow.types @@ -819,47 +819,29 @@ function fx1(value: T & ({} | null)) { function fx2(value: T & ({} | null)) { >fx2 : (value: T & ({} | null)) => void ->value : T & ({} | null) +>value : T if (value === 42) { >value === 42 : boolean ->value : T & ({} | null) +>value : T >42 : 42 value; // T & {} ->value : T & ({} | null) +>value : never } else { value; // T & ({} | null) ->value : T & ({} | null) +>value : T } } function fx3(value: T & ({} | null)) { >fx3 : (value: T & ({} | null)) => void ->value : T & ({} | null) +>value : T & {} if (value === 42) { >value === 42 : boolean ->value : T & ({} | null) ->42 : 42 - - value; // T & {} ->value : T & ({} | null) - } - else { - value; // T & ({} | null) ->value : T & ({} | null) - } -} - -function fx4(value: T & ({} | null)) { ->fx4 : (value: T & ({} | null)) => void ->value : T & ({} | null) - - if (value === 42) { ->value === 42 : boolean ->value : T & ({} | null) +>value : T & {} >42 : 42 value; // T & {} @@ -867,7 +849,25 @@ function fx4(value: T & ({} | null)) { } else { value; // T & ({} | null) ->value : T & ({} | null) +>value : T & {} + } +} + +function fx4(value: T & ({} | null)) { +>fx4 : (value: T & ({} | null)) => void +>value : T + + if (value === 42) { +>value === 42 : boolean +>value : T +>42 : 42 + + value; // T & {} +>value : never + } + else { + value; // T & ({} | null) +>value : T } } @@ -1036,12 +1036,12 @@ type AB = "A" | "B"; function x(x: T_AB & undefined, y: any) { >x : (x: T_AB & undefined, y: any) => void ->x : T_AB & undefined +>x : never >y : any let r2: never = y as T_AB & undefined; >r2 : never ->y as T_AB & undefined : T_AB & undefined +>y as T_AB & undefined : never >y : any } diff --git a/tests/baselines/reference/variadicTuples1.errors.txt b/tests/baselines/reference/variadicTuples1.errors.txt index 0e1af58d56a..a272e389314 100644 --- a/tests/baselines/reference/variadicTuples1.errors.txt +++ b/tests/baselines/reference/variadicTuples1.errors.txt @@ -101,7 +101,7 @@ variadicTuples1.ts(411,7): error TS2322: Type '[boolean, false]' is not assignab foo1(...t1, ...t2, 42, 43, 44); foo1(...t1, ...t2, ...a1); foo1(...t1); // Error - ~~~~~~~~~~~ + ~~~~ !!! error TS2555: Expected at least 3 arguments, but got 2. !!! related TS6210 variadicTuples1.ts:45:45: An argument for 'c' was not provided. foo1(...t1, 45); // Error diff --git a/tests/cases/compiler/APILibCheck.ts b/tests/cases/compiler/APILibCheck.ts index 674c2f280a1..38821a58b0b 100644 --- a/tests/cases/compiler/APILibCheck.ts +++ b/tests/cases/compiler/APILibCheck.ts @@ -2,6 +2,7 @@ // @noImplicitAny: true // @strictNullChecks: true // @lib: es2018 +// @exactOptionalPropertyTypes: true // @filename: node_modules/typescript/package.json { diff --git a/tests/cases/compiler/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts b/tests/cases/compiler/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts new file mode 100644 index 00000000000..3fd22f46c8d --- /dev/null +++ b/tests/cases/compiler/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.ts @@ -0,0 +1,12 @@ +// @strict: true +// @noEmit: true + +declare const foo: ["a", string, number] | ["b", string, boolean]; + +export function test(arg: { index?: number }) { + const { index = 0 } = arg; + + if (foo[index] === "a") { + foo; + } +} diff --git a/tests/cases/compiler/circularMappedTypeConstraint.ts b/tests/cases/compiler/circularMappedTypeConstraint.ts new file mode 100644 index 00000000000..90160560d32 --- /dev/null +++ b/tests/cases/compiler/circularMappedTypeConstraint.ts @@ -0,0 +1,7 @@ +// @strict: true +// @noEmit: true + +// Repro from #56232 + +declare function foo2]: V }, V extends string>(a: T): T; +export const r2 = foo2({A: "a"}); diff --git a/tests/cases/compiler/circularReferenceInReturnType.ts b/tests/cases/compiler/circularReferenceInReturnType.ts new file mode 100644 index 00000000000..05ed1a56f50 --- /dev/null +++ b/tests/cases/compiler/circularReferenceInReturnType.ts @@ -0,0 +1,11 @@ +// @strict: true +// @noEmit: true + +declare function fn1(cb: () => T): string; +const res1 = fn1(() => res1); + +declare function fn2(): (cb: () => any) => (a: T) => void; +const res2 = fn2()(() => res2); + +declare function fn3(): (cb: (arg: T2) => any) => (a: T) => void; +const res3 = fn3()(() => res3); diff --git a/tests/cases/compiler/circularReferenceInReturnType2.ts b/tests/cases/compiler/circularReferenceInReturnType2.ts new file mode 100644 index 00000000000..f9fa8fef33c --- /dev/null +++ b/tests/cases/compiler/circularReferenceInReturnType2.ts @@ -0,0 +1,53 @@ +// @strict: true +// @noEmit: true + +type ObjectType = { + kind: "object"; + __source: (source: Source) => void; +}; + +type Field = { + __key: (key: Key) => void; + __source: (source: Source) => void; +}; + +declare const object: () => < + Fields extends { + [Key in keyof Fields]: Field; + } +>(config: { + name: string; + fields: Fields | (() => Fields); +}) => ObjectType; + +type InferValueFromObjectType> = + Type extends ObjectType ? Source : never; + +type FieldResolver> = ( + source: Source +) => InferValueFromObjectType; + +type FieldFuncArgs> = { + type: Type; + resolve: FieldResolver; +}; + +declare const field: , Key extends string>( + field: FieldFuncArgs +) => Field; + +type Something = { foo: number }; + +const A = object()({ + name: "A", + fields: () => ({ + a: field({ + type: A, + resolve() { + return { + foo: 100, + }; + }, + }), + }), +}); diff --git a/tests/cases/compiler/contextuallyTypedParametersWithInitializers.ts b/tests/cases/compiler/contextuallyTypedParametersWithInitializers1.ts similarity index 100% rename from tests/cases/compiler/contextuallyTypedParametersWithInitializers.ts rename to tests/cases/compiler/contextuallyTypedParametersWithInitializers1.ts diff --git a/tests/cases/compiler/contextuallyTypedParametersWithInitializers2.ts b/tests/cases/compiler/contextuallyTypedParametersWithInitializers2.ts new file mode 100644 index 00000000000..d80e45ad859 --- /dev/null +++ b/tests/cases/compiler/contextuallyTypedParametersWithInitializers2.ts @@ -0,0 +1,22 @@ +// @strict: true +// @noEmit: true + +declare function test1< + TContext, + TMethods extends Record unknown>, +>(context: TContext, methods: TMethods): void; + +test1( + { + count: 0, + }, + { + checkLimit: (ctx, max = 500) => {}, + hasAccess: (ctx, user: { name: string }) => {}, + }, +); + +declare const num: number; +const test2: (arg: 1 | 2) => void = (arg = num) => {}; + +const test3: (arg: number) => void = (arg = 1) => {}; diff --git a/tests/cases/compiler/contextuallyTypedParametersWithInitializers3.ts b/tests/cases/compiler/contextuallyTypedParametersWithInitializers3.ts new file mode 100644 index 00000000000..25b4dd93912 --- /dev/null +++ b/tests/cases/compiler/contextuallyTypedParametersWithInitializers3.ts @@ -0,0 +1,18 @@ +// @strict: true +// @noEmit: true + +type CanvasDirection = "RIGHT" | "LEFT"; + +interface GraphActions { + setDirection: (direction: CanvasDirection) => void; +} + +export declare function create(config: T): void; + +declare function takesDirection(direction: CanvasDirection): void; + +create({ + setDirection: (direction = "RIGHT") => { + takesDirection(direction); + }, +}); \ No newline at end of file diff --git a/tests/cases/compiler/contextuallyTypedParametersWithInitializers4.ts b/tests/cases/compiler/contextuallyTypedParametersWithInitializers4.ts new file mode 100644 index 00000000000..a28258acaf4 --- /dev/null +++ b/tests/cases/compiler/contextuallyTypedParametersWithInitializers4.ts @@ -0,0 +1,16 @@ +// @strict: true +// @noEmit: true + +declare function test< + TContext, + TMethods extends Record unknown>, +>(context: TContext, methods: TMethods): void; + +test( + { + count: 0, + }, + { + checkLimit: (ctx, max = 3) => {}, + }, +); diff --git a/tests/cases/compiler/distributiveConditionalTypeConstraints.ts b/tests/cases/compiler/distributiveConditionalTypeConstraints.ts new file mode 100644 index 00000000000..265e6d12c74 --- /dev/null +++ b/tests/cases/compiler/distributiveConditionalTypeConstraints.ts @@ -0,0 +1,92 @@ +// @strict: true +// @noEmit: true + +type IsArray = T extends unknown[] ? true : false; + +function f1(x: IsArray) { + let t: true = x; // Error + let f: false = x; // Error +} + +function f2(x: IsArray) { + let t: true = x; + let f: false = x; // Error +} + +function f3(x: IsArray) { + let t: true = x; + let f: false = x; // Error +} + +function f4(x: IsArray) { + let t: true = x; // Error + let f: false = x; +} + +type ZeroOf = + T extends null ? null : + T extends undefined ? undefined : + T extends string ? "" : + T extends number ? 0 : + T extends boolean ? false : + never; + +function f10(x: ZeroOf) { + let t: "" | 0 | false = x; +} + +type Foo = T extends "abc" | 42 ? true : false; + +function f20(x: Foo) { + let t: false = x; // Error +} + +// Modified repro from #30152 + +interface A { foo(): void; } +interface B { bar(): void; } +interface C { foo(): void, bar(): void } + +function test1(y: T extends B ? number : string) { + if (typeof y == 'string') { + y; // T extends B ? number : string + } + else { + y; // never + } + const newY: string | number = y; + newY; // string +} + +function test2(y: T extends B ? string : number) { + if (typeof y == 'string') { + y; // never + } + else { + y; // T extends B ? string : number + } + const newY: string | number = y; + newY; // number +} + +function test3(y: T extends C ? number : string) { + if (typeof y == 'string') { + y; // (T extends C ? number : string) & string + } + else { + y; // T extends C ? number : string + } + const newY: string | number = y; + newY; // string | number +} + +function test4(y: T extends C ? string : number) { + if (typeof y == 'string') { + y; // (T extends C ? string : number) & string + } + else { + y; // T extends C ? string : number + } + const newY: string | number = y; + newY; // string | number +} diff --git a/tests/cases/compiler/dynamicImportsDeclaration.ts b/tests/cases/compiler/dynamicImportsDeclaration.ts new file mode 100644 index 00000000000..a8ef69e6572 --- /dev/null +++ b/tests/cases/compiler/dynamicImportsDeclaration.ts @@ -0,0 +1,25 @@ +// @declaration: true +// @module: nodenext +// @target: esnext + +// @filename: /case0.ts +export default 0; + +// @filename: /case1.ts +export default 1; + +// @filename: /caseFallback.ts +export default 'fallback'; + +// @filename: /index.ts +export const mod = await (async () => { + const x: number = 0; + switch (x) { + case 0: + return await import("./case0.js"); + case 1: + return await import("./case1.js"); + default: + return await import("./caseFallback.js"); + } +})(); \ No newline at end of file diff --git a/tests/cases/compiler/expandoFunctionBlockShadowing.ts b/tests/cases/compiler/expandoFunctionBlockShadowing.ts new file mode 100644 index 00000000000..e55499a33de --- /dev/null +++ b/tests/cases/compiler/expandoFunctionBlockShadowing.ts @@ -0,0 +1,21 @@ +// @strict: true +// @declaration: true + +// https://github.com/microsoft/TypeScript/issues/56538 + +export function X() {} +if (Math.random()) { + const X: { test?: any } = {}; + X.test = 1; +} + +export function Y() {} +Y.test = "foo"; +const aliasTopY = Y; +if (Math.random()) { + const Y = function Y() {} + Y.test = 42; + + const topYcheck: { (): void; test: string } = aliasTopY; + const blockYcheck: { (): void; test: number } = Y; +} \ No newline at end of file diff --git a/tests/cases/compiler/expandoFunctionExpressionsWithDynamicNames2.ts b/tests/cases/compiler/expandoFunctionExpressionsWithDynamicNames2.ts new file mode 100644 index 00000000000..86be30e27a2 --- /dev/null +++ b/tests/cases/compiler/expandoFunctionExpressionsWithDynamicNames2.ts @@ -0,0 +1,19 @@ +// @strict: true +// @lib: esnext +// @noEmit: true + +const mySymbol = Symbol(); +interface Foo { + (): void; + [mySymbol]: true; +} +const foo: Foo = () => {}; +foo[mySymbol] = true; + +interface Bar { + (): void; + test: true; +} +const t = "test" as const; +const bar: Bar = () => {}; +bar[t] = true; \ No newline at end of file diff --git a/tests/cases/compiler/inferenceGenericNestedCallReturningConstructor.ts b/tests/cases/compiler/inferenceGenericNestedCallReturningConstructor.ts new file mode 100644 index 00000000000..8c1ea320962 --- /dev/null +++ b/tests/cases/compiler/inferenceGenericNestedCallReturningConstructor.ts @@ -0,0 +1,28 @@ +// @strict: true +// @noEmit: true + +interface Action { + new (ctx: TContext): void; +} + +declare class AssignAction { + constructor(ctx: TContext); +} + +declare function assign( + assigner: (ctx: TContext) => void +): { + new (ctx: TContext): AssignAction; +} + +declare function createMachine(config: { + context: TContext; + entry: Action; +}): void; + +createMachine({ + context: { count: 0 }, + entry: assign((ctx) => { + ctx // { count: number } + }), +}); diff --git a/tests/cases/compiler/intersectionWithConstructSignaturePrototypeResult.ts b/tests/cases/compiler/intersectionWithConstructSignaturePrototypeResult.ts new file mode 100644 index 00000000000..28eb6c6b956 --- /dev/null +++ b/tests/cases/compiler/intersectionWithConstructSignaturePrototypeResult.ts @@ -0,0 +1,16 @@ +// @strict: true +// @noEmit: true + +declare class EmberObject {} + +type PersonType = Readonly & + (new (properties?: object) => { + firstName: string; + lastName: string; + } & EmberObject) & + (new (...args: any[]) => { + firstName: string; + lastName: string; + } & EmberObject); + +type PersonPrototype = PersonType["prototype"]; diff --git a/tests/cases/compiler/nestedExcessPropertyChecking.ts b/tests/cases/compiler/nestedExcessPropertyChecking.ts index 9e7c808b5e0..35caf37d7d1 100644 --- a/tests/cases/compiler/nestedExcessPropertyChecking.ts +++ b/tests/cases/compiler/nestedExcessPropertyChecking.ts @@ -63,3 +63,28 @@ const response: Query = { }, }, }; + +// Repro from #53412 + +type BaseItem = { + id: number; +} +type ExtendedItem = BaseItem & { + description: string | null +}; + +type BaseValue = { + // there are other fields + items: BaseItem[]; +} +type ExtendedValue = BaseValue & { + // there are other fields + items: ExtendedItem[]; +} + +const TEST_VALUE: ExtendedValue = { + items: [ + {id: 1, description: null}, + {id: 2, description: 'wigglytubble'}, + ] +}; diff --git a/tests/cases/compiler/promiseWithResolvers.ts b/tests/cases/compiler/promiseWithResolvers.ts new file mode 100644 index 00000000000..33b43d616f6 --- /dev/null +++ b/tests/cases/compiler/promiseWithResolvers.ts @@ -0,0 +1,4 @@ +// @target: esnext + +type T = {}; +const { promise, resolve, reject } = Promise.withResolvers(); diff --git a/tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts b/tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts new file mode 100644 index 00000000000..e5655497911 --- /dev/null +++ b/tests/cases/compiler/reverseMappedTypeIntersectionConstraint.ts @@ -0,0 +1,174 @@ +// @strict: true + +type StateConfig = { + entry?: TAction + states?: Record>; +}; + +type StateSchema = { + states?: Record; +}; + +declare function createMachine< + TConfig extends StateConfig, + TAction extends string = TConfig["entry"] extends string ? TConfig["entry"] : string, +>(config: { [K in keyof TConfig & keyof StateConfig]: TConfig[K] }): [TAction, TConfig]; + +const inferredParams1 = createMachine({ + entry: "foo", + states: { + a: { + entry: "bar", + }, + }, + extra: 12, +}); + +const inferredParams2 = createMachine({ + entry: "foo", + states: { + a: { + entry: "foo", + }, + }, + extra: 12, +}); + + +// ----------------------------------------------------------------------------------------- + +const checkType = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + +const checked = checkType<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", // undesirable property z is *not* allowed +}); + +checked; + +// ----------------------------------------------------------------------------------------- + +interface Stuff { + field: number; + anotherField: string; +} + +function doStuffWithStuff(s: { [K in keyof T & keyof Stuff]: T[K] } ): T { + if(Math.random() > 0.5) { + return s as T + } else { + return s + } +} + +doStuffWithStuff({ field: 1, anotherField: 'a', extra: 123 }) + +function doStuffWithStuffArr(arr: { [K in keyof T & keyof Stuff]: T[K] }[]): T[] { + if(Math.random() > 0.5) { + return arr as T[] + } else { + return arr + } +} + +doStuffWithStuffArr([ + { field: 1, anotherField: 'a', extra: 123 }, +]) + +// ----------------------------------------------------------------------------------------- + +type XNumber = { x: number } + +declare function foo(props: {[K in keyof T & keyof XNumber]: T[K]}): void; + +function bar(props: {x: number, y: string}) { + return foo(props); // no error because lack of excess property check by design +} + +foo({x: 1, y: 'foo'}); + +foo({...{x: 1, y: 'foo'}}); // no error because lack of excess property check by design + +// ----------------------------------------------------------------------------------------- + +type NoErrWithOptProps = { x: number, y?: string } + +declare function baz(props: {[K in keyof T & keyof NoErrWithOptProps]: T[K]}): void; + +baz({x: 1}); +baz({x: 1, z: 123}); +baz({x: 1, y: 'foo'}); +baz({x: 1, y: 'foo', z: 123}); + +// ----------------------------------------------------------------------------------------- + +interface WithNestedProp { + prop: string; + nested: { + prop: string; + } +} + +declare function withNestedProp(props: {[K in keyof T & keyof WithNestedProp]: T[K]}): T; + +const wnp = withNestedProp({prop: 'foo', nested: { prop: 'bar' }, extra: 10 }); + +// ----------------------------------------------------------------------------------------- + +type IsLiteralString = string extends T ? false : true; + +type DeepWritable = T extends Function ? T : { -readonly [K in keyof T]: DeepWritable } + +interface ProvidedActor { + src: string; + logic: () => Promise; +} + +type DistributeActors = TActor extends { src: infer TSrc } + ? { + src: TSrc; + } + : never; + +interface MachineConfig { + types?: { + actors?: TActor; + }; + invoke: IsLiteralString extends true + ? DistributeActors + : { + src: string; + }; +} + +type NoExtra = { + [K in keyof T]: K extends keyof MachineConfig ? T[K] : never +} + +declare function createXMachine< + const TConfig extends MachineConfig, + TActor extends ProvidedActor = TConfig extends { types: { actors: ProvidedActor} } ? TConfig["types"]["actors"] : ProvidedActor, +>(config: {[K in keyof MachineConfig & keyof TConfig]: TConfig[K] }): TConfig; + +const child = () => Promise.resolve("foo"); + +const config = createXMachine({ + types: {} as { + actors: { + src: "str"; + logic: typeof child; + }; + }, + invoke: { + src: "str", + }, + extra: 10 +}); + +const config2 = createXMachine({ + invoke: { + src: "whatever", + }, + extra: 10 +}); diff --git a/tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts b/tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts new file mode 100644 index 00000000000..7618ae65046 --- /dev/null +++ b/tests/cases/compiler/reverseMappedTypeLimitedConstraint.ts @@ -0,0 +1,15 @@ +type XNumber_ = { x: number } + +declare function foo_(props: {[K in keyof T & keyof XNumber_]: T[K]}): T; + +foo_({x: 1, y: 'foo'}); + +// ----------------------------------------------------------------------------------------- + +const checkType_ = () => (value: { [K in keyof U & keyof T]: U[K] }) => value; + +const checked_ = checkType_<{x: number, y: string}>()({ + x: 1 as number, + y: "y", + z: "z", +}); \ No newline at end of file diff --git a/tests/cases/compiler/reverseMappedUnionInference.ts b/tests/cases/compiler/reverseMappedUnionInference.ts new file mode 100644 index 00000000000..0f1ffc1c347 --- /dev/null +++ b/tests/cases/compiler/reverseMappedUnionInference.ts @@ -0,0 +1,59 @@ +// @strict: true +// @noEmit: true + +interface AnyExtractor { + matches: (node: any) => boolean; + extract: (node: any) => Result | undefined; +} + +interface Extractor { + matches: (node: unknown) => node is T; + extract: (node: T) => Result | undefined; +} + +declare function createExtractor(params: { + matcher: (node: unknown) => node is T; + extract: (node: T) => Result; +}): Extractor; + +interface Identifier { + kind: "identifier"; + name: string; +} + +declare function isIdentifier(node: unknown): node is Identifier; + +const identifierExtractor = createExtractor({ + matcher: isIdentifier, + extract: (node) => { + return { + node, + kind: "identifier" as const, + value: node.name, + }; + }, +}); + +interface StringLiteral { + kind: "stringLiteral"; + value: string; +} + +declare function isStringLiteral(node: unknown): node is StringLiteral; + +const stringExtractor = createExtractor({ + matcher: isStringLiteral, + extract: (node) => { + return { + node, + kind: "string" as const, + value: node.value, + }; + }, +}); + +declare function unionType(parsers: { + [K in keyof Result]: AnyExtractor; +}): AnyExtractor; + +const myUnion = unionType([identifierExtractor, stringExtractor]); diff --git a/tests/cases/compiler/typeVariableConstraintIntersections.ts b/tests/cases/compiler/typeVariableConstraintIntersections.ts new file mode 100644 index 00000000000..3d5d69fe322 --- /dev/null +++ b/tests/cases/compiler/typeVariableConstraintIntersections.ts @@ -0,0 +1,95 @@ +// @strict: true +// @noEmit: true + +type T00 = K & "a"; +type T01 = K & "c"; +type T02 = K & string; + +type T10 = K & "a"; +type T11 = K & "c"; +type T12 = K & string; + +type T20 = K & ("a" | "b" | "c"); +type T21 = ("a" | "b" | "c") & K; +type T22 = K & ("a" | "b"); +type T23 = ("a" | "b") & K; + +type T30 = K & ("a" | "b" | "c"); +type T31 = ("a" | "b" | "c") & K; +type T32 = K & ("a" | "b"); +type T33 = ("a" | "b") & K; + +type T40 = K & undefined; +type T41 = K & null; +type T42 = K & object; +type T43 = K & {}; + +type T50 = K & "a"; +type T51 = K & "b"; +type T52 = K & string; +type T53 = K & 0; +type T54 = K & 1; +type T55 = K & number; + +type T60 = U & "a"; +type T61 = U & ("a" | "b"); +type T62 = U & ("a" | "b" | "c"); +type T63 = U & string; + +type T70 = U & "a"; +type T71 = U & ("a" | "b"); +type T72 = U & ("a" | "b" | "c"); +type T73 = U & string; + +declare function isA(x: any): x is "a"; +declare function isB(x: any): x is "b"; +declare function isC(x: any): x is "c"; + +function foo(x: K) { + if (isA(x)) { + x; // K & "a" + } + if (isB(x)) { + x; // K & "b" + } + if (isC(x)) { + x; // never + } + if (isA(x) || isB(x)) { + x; // K + } + if (!(isA(x) || isB(x))) { + return; + } + x; // K +} + +// Example from #30581 + +type OptionOne = { + kind: "one"; + s: string; +}; + +type OptionTwo = { + kind: "two"; + x: number; + y: number; +}; + +type Options = OptionOne | OptionTwo; + +type OptionHandlers = { + [K in Options['kind']]: (option: Options & { kind: K }) => string; +} + +const optionHandlers: OptionHandlers = { + "one": option => option.s, + "two": option => option.x + "," + option.y, +}; + +function handleOption(option: Options & { kind: K }): string { + const kind = option.kind; + const handler = optionHandlers[kind]; + return handler(option); +}; diff --git a/tests/cases/compiler/uncalledFunctionChecksInConditional2.ts b/tests/cases/compiler/uncalledFunctionChecksInConditional2.ts index dc75f72cec4..425584ba171 100644 --- a/tests/cases/compiler/uncalledFunctionChecksInConditional2.ts +++ b/tests/cases/compiler/uncalledFunctionChecksInConditional2.ts @@ -59,3 +59,15 @@ declare let inBrowser: boolean; } } }; + +let _isMobile: boolean; +function isMobile() { + if (_isMobile === undefined) { + const isMobileMatch = + typeof window !== 'undefined' && + window.matchMedia && // no error + window.matchMedia('(max-device-width: 680px)'); + _isMobile = isMobileMatch && isMobileMatch.matches; + } + return _isMobile; +} diff --git a/tests/cases/conformance/controlFlow/controlFlowOptionalChain3.tsx b/tests/cases/conformance/controlFlow/controlFlowOptionalChain3.tsx new file mode 100644 index 00000000000..191de7ed682 --- /dev/null +++ b/tests/cases/conformance/controlFlow/controlFlowOptionalChain3.tsx @@ -0,0 +1,44 @@ +// @strict: true +// @noEmit: true +// @esModuleInterop: true +// @jsx: react + +/// + +// https://github.com/microsoft/TypeScript/issues/56482 + +import React from "react"; + +interface Foo { + bar: boolean; +} + +function test1(foo: Foo | undefined) { + if (foo?.bar === false) { + foo; + } + foo; +} + +function test2(foo: Foo | undefined) { + if (foo?.bar === false) { + foo; + } else { + foo; + } +} + +function Test3({ foo }: { foo: Foo | undefined }) { + return ( +

+ ); +} + +function test4(options?: { a?: boolean; b?: boolean }) { + if (options?.a === false || options.b) { + options; + } +} diff --git a/tests/cases/conformance/controlFlow/dependentDestructuredVariablesFromNestedPatterns.ts b/tests/cases/conformance/controlFlow/dependentDestructuredVariablesFromNestedPatterns.ts new file mode 100644 index 00000000000..8d92be327b5 --- /dev/null +++ b/tests/cases/conformance/controlFlow/dependentDestructuredVariablesFromNestedPatterns.ts @@ -0,0 +1,53 @@ +// @strict: true +// @target: esnext +// @lib: esnext +// @noEmit: true + +function test1(arg: [[undefined, Error] | [number, undefined]]) { + const [[p1, p1Error]] = arg; + + if (p1Error) { + return; + } + + p1; +} + +function test2([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { + if (p1Error) { + return; + } + + p1; +} + +async function myAllSettled(fn: () => T) { + const promises = await Promise.allSettled(fn()); + + return promises.map((result) => + result.status === "fulfilled" + ? [result.value, undefined] + : [undefined, new Error(String(result.reason))], + ) as { [K in keyof T]: [Awaited, undefined] | [undefined, Error] }; +} + +async function test3() { + const [[p1, p1Error], _] = await myAllSettled( + () => [Promise.resolve(0), Promise.reject(1)] as const, + ); + + if (p1Error) return; + + p1; +} + +function test4([[p1, p1Error]]: [[undefined, Error] | [number, undefined]]) { + if (Math.random()) { + p1 = undefined; + } + if (p1Error) { + return; + } + + p1; +} diff --git a/tests/cases/conformance/es2020/localesObjectArgument.ts b/tests/cases/conformance/es2020/localesObjectArgument.ts index a89e22ba91d..37be75f13d6 100644 --- a/tests/cases/conformance/es2020/localesObjectArgument.ts +++ b/tests/cases/conformance/es2020/localesObjectArgument.ts @@ -7,6 +7,7 @@ const jaJP = new Intl.Locale("ja-JP"); const now = new Date(); const num = 1000; const bigint = 123456789123456789n; +const str = ""; now.toLocaleString(enUS); now.toLocaleDateString(enUS); @@ -20,3 +21,35 @@ num.toLocaleString([deDE, jaJP]); bigint.toLocaleString(enUS); bigint.toLocaleString([deDE, jaJP]); + +str.toLocaleLowerCase(enUS); +str.toLocaleLowerCase([deDE, jaJP]); +str.toLocaleUpperCase(enUS); +str.toLocaleUpperCase([deDE, jaJP]); +str.localeCompare(str, enUS); +str.localeCompare(str, [deDE, jaJP]); + +new Intl.PluralRules(enUS); +new Intl.PluralRules([deDE, jaJP]); +Intl.PluralRules.supportedLocalesOf(enUS); +Intl.PluralRules.supportedLocalesOf([deDE, jaJP]); + +new Intl.RelativeTimeFormat(enUS); +new Intl.RelativeTimeFormat([deDE, jaJP]); +Intl.RelativeTimeFormat.supportedLocalesOf(enUS); +Intl.RelativeTimeFormat.supportedLocalesOf([deDE, jaJP]); + +new Intl.Collator(enUS); +new Intl.Collator([deDE, jaJP]); +Intl.Collator.supportedLocalesOf(enUS); +Intl.Collator.supportedLocalesOf([deDE, jaJP]); + +new Intl.DateTimeFormat(enUS); +new Intl.DateTimeFormat([deDE, jaJP]); +Intl.DateTimeFormat.supportedLocalesOf(enUS); +Intl.DateTimeFormat.supportedLocalesOf([deDE, jaJP]); + +new Intl.NumberFormat(enUS); +new Intl.NumberFormat([deDE, jaJP]); +Intl.NumberFormat.supportedLocalesOf(enUS); +Intl.NumberFormat.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts b/tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts new file mode 100644 index 00000000000..00b4bc5ea05 --- /dev/null +++ b/tests/cases/conformance/es2021/es2021LocalesObjectArgument.ts @@ -0,0 +1,10 @@ +// @target: es2021 + +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); + +new Intl.ListFormat(enUS); +new Intl.ListFormat([deDE, jaJP]); +Intl.ListFormat.supportedLocalesOf(enUS); +Intl.ListFormat.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts b/tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts new file mode 100644 index 00000000000..7087ae2eab9 --- /dev/null +++ b/tests/cases/conformance/es2022/es2022LocalesObjectArgument.ts @@ -0,0 +1,10 @@ +// @target: es2022 + +const enUS = new Intl.Locale("en-US"); +const deDE = new Intl.Locale("de-DE"); +const jaJP = new Intl.Locale("ja-JP"); + +new Intl.Segmenter(enUS); +new Intl.Segmenter([deDE, jaJP]); +Intl.Segmenter.supportedLocalesOf(enUS); +Intl.Segmenter.supportedLocalesOf([deDE, jaJP]); diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts index 4cd9047581f..2d6f92b9bde 100644 --- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts +++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesWithStaticProperty.ts @@ -1,11 +1,22 @@ // @target: es6 -class C { +class C1 { static staticProp = 10; - get [C.staticProp]() { + get [C1.staticProp]() { return "hello"; } - set [C.staticProp](x: string) { + set [C1.staticProp](x: string) { var y = x; } - [C.staticProp]() { } -} \ No newline at end of file + [C1.staticProp]() { } +} + +(class C2 { + static staticProp = 10; + get [C2.staticProp]() { + return "hello"; + } + set [C2.staticProp](x: string) { + var y = x; + } + [C2.staticProp]() { } +}) diff --git a/tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts b/tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts new file mode 100644 index 00000000000..6a860266819 --- /dev/null +++ b/tests/cases/conformance/externalModules/typeOnly/importDefaultNamedType3.ts @@ -0,0 +1,5 @@ +// @Filename: /a.ts +export class A {} + +// @Filename: /b.ts +import type from = require('./a'); diff --git a/tests/cases/conformance/jsdoc/callbackTag4.ts b/tests/cases/conformance/jsdoc/callbackTag4.ts new file mode 100644 index 00000000000..a5ac356aedd --- /dev/null +++ b/tests/cases/conformance/jsdoc/callbackTag4.ts @@ -0,0 +1,19 @@ +// @allowJs: true +// @checkJs: true +// @strict: true +// @noEmit: true +// @filename: ./a.js + +/** + * @callback C + * @this {{ a: string, b: number }} + * @param {string} a + * @param {number} b + * @returns {boolean} + */ + +/** @type {C} */ +const cb = function (a, b) { + this + return true +} diff --git a/tests/cases/conformance/jsdoc/jsdocLinkTag7.ts b/tests/cases/conformance/jsdoc/jsdocLinkTag7.ts new file mode 100644 index 00000000000..b149a6127b3 --- /dev/null +++ b/tests/cases/conformance/jsdoc/jsdocLinkTag7.ts @@ -0,0 +1,20 @@ +// @checkJs: true +// @allowJs: true +// @target: esnext +// @noEmit: true +// @filename: /a.js +class Foo { + /** + * {@linkcode this.a} + * {@linkcode this.#c} + * + * {@link this.a} + * {@link this.#c} + * + * {@linkplain this.a} + * {@linkplain this.#c} + */ + a() { } + b() { } + #c() { } +} diff --git a/tests/cases/conformance/types/literal/templateLiteralTypes3.ts b/tests/cases/conformance/types/literal/templateLiteralTypes3.ts index 3103c48201d..73adca7da76 100644 --- a/tests/cases/conformance/types/literal/templateLiteralTypes3.ts +++ b/tests/cases/conformance/types/literal/templateLiteralTypes3.ts @@ -195,3 +195,11 @@ function ft1(t: T, u: Uppercase, u1: Uppercase<`1.${T}.3`>, // Repro from #52685 type Boom = 'abc' | 'def' | `a${string}` | Lowercase; + +// Repro from #56582 + +function a() { + let x: keyof T & string | `-${keyof T & string}`; + x = "id"; + x = "-id"; +} diff --git a/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts b/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts index aeb05ead7cc..00d36bd722a 100644 --- a/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts +++ b/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts @@ -202,10 +202,14 @@ export abstract class BB { } // repro from https://github.com/microsoft/TypeScript/issues/54177#issuecomment-1538436654 -function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} conversionTest("testDowncast"); -function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {} conversionTest2("testDowncast"); +function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +conversionTest3("testDowncast"); +function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {} +conversionTest4("testDowncast"); function foo(str: `${`a${string}` & `${string}a`}Test`) {} foo("abaTest"); // ok diff --git a/tests/cases/conformance/types/mapped/mappedTypeAsClauses.ts b/tests/cases/conformance/types/mapped/mappedTypeAsClauses.ts index ba0222660b8..9256a4541fe 100644 --- a/tests/cases/conformance/types/mapped/mappedTypeAsClauses.ts +++ b/tests/cases/conformance/types/mapped/mappedTypeAsClauses.ts @@ -29,7 +29,8 @@ type TM1 = Methods<{ foo(): number, bar(x: string): boolean, baz: string | numbe type DoubleProp = { [P in keyof T & string as `${P}1` | `${P}2`]: T[P] } type TD1 = DoubleProp<{ a: string, b: number }>; // { a1: string, a2: string, b1: number, b2: number } type TD2 = keyof TD1; // 'a1' | 'a2' | 'b1' | 'b2' -type TD3 = keyof DoubleProp; // `${keyof U & string}1` | `${keyof U & string}2` +type TD3 = keyof DoubleProp; // keyof DoubleProp +type TD4 = TD3<{ a: string, b: number }>; // 'a1' | 'a2' | 'b1' | 'b2' // Repro from #40619 @@ -152,3 +153,26 @@ type TN2 = keyof { [P in keyof T as 'a' extends P ? 'x' : 'y']: string }; type TN3 = keyof { [P in keyof T as Exclude, 'b'>, 'a'>]: string }; type TN4 = keyof { [K in keyof T as (K extends U ? T[K] : never) extends T[K] ? K : never]: string }; type TN5 = keyof { [K in keyof T as keyof { [P in K as T[P] extends U ? K : never]: true }]: string }; + +// repro from https://github.com/microsoft/TypeScript/issues/55129 +type Fruit = + | { + name: "apple"; + color: "red"; + } + | { + name: "banana"; + color: "yellow"; + } + | { + name: "orange"; + color: "orange"; + }; +type Result1 = { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +}; +type Result2 = keyof { + [Key in T as `${Key['name']}:${Key['color']}`]: unknown +} +type Test1 = keyof Result1 // "apple:red" | "banana:yellow" | "orange:orange" +type Test2 = Result2 // "apple:red" | "banana:yellow" | "orange:orange" diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReverseMappedTypes.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReverseMappedTypes.ts new file mode 100644 index 00000000000..a8ffbea7d64 --- /dev/null +++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReverseMappedTypes.ts @@ -0,0 +1,49 @@ +// @strict: true +// @noEmit: true + +declare function test1(obj: { + [K in keyof T]: T[K]; +}): [T, typeof obj]; + +const result1 = test1({ + prop: "foo", + nested: { + nestedProp: "bar", + }, +}); + +declare function test2(obj: { + readonly [K in keyof T]: T[K]; +}): [T, typeof obj]; + +const result2 = test2({ + prop: "foo", + nested: { + nestedProp: "bar", + }, +}); + +declare function test3(obj: { + -readonly [K in keyof T]: T[K]; +}): [T, typeof obj]; + +const result3 = test3({ + prop: "foo", + nested: { + nestedProp: "bar", + }, +}); + +declare function test4(arr: { + [K in keyof T]: T[K]; +}): T; + +const result4 = test4(["1", 2]); + +declare function test5( + ...args: { + [K in keyof T]: T[K]; + } +): T; + +const result5 = test5({ a: "foo" }); diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts index 4f3e7ecda0d..4f747be593f 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts @@ -71,3 +71,40 @@ function f14(a: AList4, b: BList4) { a = b; b = a; // Error } + +// Repro from #51620 + +type Bivar = { set(value: T): void } + +declare let bu: Bivar; +declare let bs: Bivar; +bu = bs; +bs = bu; + +declare let bfu: Bivar<(x: unknown) => void>; +declare let bfs: Bivar<(x: string) => void>; +bfu = bfs; +bfs = bfu; + +type Bivar1 = { set(value: T): void } +type Bivar2 = { set(value: T): void } + +declare let b1fu: Bivar1<(x: unknown) => void>; +declare let b2fs: Bivar2<(x: string) => void>; +b1fu = b2fs; +b2fs = b1fu; + +type SetLike = { set(value: T): void, get(): T } + +declare let sx: SetLike1<(x: unknown) => void>; +declare let sy: SetLike1<(x: string) => void>; +sx = sy; // Error +sy = sx; + +type SetLike1 = { set(value: T): void, get(): T } +type SetLike2 = { set(value: T): void, get(): T } + +declare let s1: SetLike1<(x: unknown) => void>; +declare let s2: SetLike2<(x: string) => void>; +s1 = s2; // Error +s2 = s1; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/intersectionIncludingPropFromGlobalAugmentation.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/intersectionIncludingPropFromGlobalAugmentation.ts new file mode 100644 index 00000000000..00a17068d9b --- /dev/null +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/intersectionIncludingPropFromGlobalAugmentation.ts @@ -0,0 +1,14 @@ +// @strict: true +// @noEmit: true + +// repro from https://github.com/microsoft/TypeScript/issues/54345 + +interface Test1 { toString: null | 'string'; } +type Test2 = Test1 & { optional?: unknown }; +declare const source: Test1; +const target: Test2 = { ...source }; + +const toString = target.toString; +const hasOwn = target.hasOwnProperty; // not an own member but it should still be accessible + +export {} diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures7.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures7.ts new file mode 100644 index 00000000000..8c889ee4591 --- /dev/null +++ b/tests/cases/conformance/types/union/unionTypeCallSignatures7.ts @@ -0,0 +1,12 @@ +// @strict: true +// @noEmit: true + +// https://github.com/microsoft/TypeScript/issues/55203 + +interface Callable { + (): `${Name} without id`; + (id: number): `${Name} with id`; +} + +declare const f: Callable<"A"> | Callable<"B">; +const result = f(123); diff --git a/tests/cases/fourslash/arityErrorAfterSignatureHelp.ts b/tests/cases/fourslash/arityErrorAfterSignatureHelp.ts index d6578ec1288..e6f80141a4a 100644 --- a/tests/cases/fourslash/arityErrorAfterSignatureHelp.ts +++ b/tests/cases/fourslash/arityErrorAfterSignatureHelp.ts @@ -3,9 +3,9 @@ //// //// declare function f(x: string, y: number): any; //// -//// /*1*/f(/*2*/)/*3*/ +//// /*1*/f/*2*/(/*3*/) -goTo.marker("2"); +goTo.marker("3"); verify.signatureHelp({ triggerReason: { kind: "invoked" @@ -19,4 +19,4 @@ verify.signatureHelp({ } }) verify.not.codeFixAvailable() // trigger typecheck -verify.errorExistsBetweenMarkers("1", "3"); +verify.errorExistsBetweenMarkers("1", "2"); diff --git a/tests/cases/fourslash/arityErrorAfterStringCompletions.ts b/tests/cases/fourslash/arityErrorAfterStringCompletions.ts index 7784e3ef70c..eda989a93f0 100644 --- a/tests/cases/fourslash/arityErrorAfterStringCompletions.ts +++ b/tests/cases/fourslash/arityErrorAfterStringCompletions.ts @@ -8,7 +8,7 @@ //// //// declare function addListener(type: K, listener: (ev: Events[K]) => any): void; //// -//// /*1*/addListener("/*2*/")/*3*/ +//// /*1*/addListener/*2*/("/*3*/") -verify.completions({ marker: ["2"], exact: ["click", "drag"] }); -verify.errorExistsBetweenMarkers("1", "3"); +verify.completions({ marker: ["3"], exact: ["click", "drag"] }); +verify.errorExistsBetweenMarkers("1", "2"); diff --git a/tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes1.ts b/tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes1.ts index d9c668507ae..ffca754c936 100644 --- a/tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes1.ts +++ b/tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes1.ts @@ -28,6 +28,7 @@ //// g(): T //// h?(x: X): Y //// (x: X): Y +//// [i: string]: number //// }) => void //// const foo5: F2 = (a) => { } @@ -41,6 +42,11 @@ ////function foo4(callback: (thing: Thing) => void) {} ////foo4(p => {}) +//// type F4 = (a: { +//// [i in string]: number +//// }) => void +//// const foo5: F4 = (a) => { } + verify.baselineInlayHints(undefined, { includeInlayFunctionParameterTypeHints: true, interactiveInlayHints: true, diff --git a/tests/cases/fourslash/inlayHintsInteractiveRestParameters3.ts b/tests/cases/fourslash/inlayHintsInteractiveRestParameters3.ts new file mode 100644 index 00000000000..9b898c6c942 --- /dev/null +++ b/tests/cases/fourslash/inlayHintsInteractiveRestParameters3.ts @@ -0,0 +1,11 @@ +/// + +////function fn(x: number, y: number, a: number, b: number) { +//// return x + y + a + b; +////} +////const foo: [x: number, y: number] = [1, 2]; +////fn(...foo, 3, 4); + +verify.baselineInlayHints(undefined, { + includeInlayParameterNameHints: "all", +}); diff --git a/tests/cases/fourslash/inlayHintsInteractiveReturnType.ts b/tests/cases/fourslash/inlayHintsInteractiveReturnType.ts index 5bb31f39cb3..92afc7ee173 100644 --- a/tests/cases/fourslash/inlayHintsInteractiveReturnType.ts +++ b/tests/cases/fourslash/inlayHintsInteractiveReturnType.ts @@ -12,6 +12,9 @@ //// foo() { //// return 1 //// } +//// bar() { +//// return this +//// } //// } //// const a = () => 1 diff --git a/tests/cases/fourslash/inlayHintsInteractiveTemplateLiteralTypes.ts b/tests/cases/fourslash/inlayHintsInteractiveTemplateLiteralTypes.ts new file mode 100644 index 00000000000..008099f618b --- /dev/null +++ b/tests/cases/fourslash/inlayHintsInteractiveTemplateLiteralTypes.ts @@ -0,0 +1,16 @@ +/// + +//// declare function getTemplateLiteral1(): `${string},${string}`; +//// const lit1 = getTemplateLiteral1(); +//// declare function getTemplateLiteral2(): `\${${string},${string}`; +//// const lit2 = getTemplateLiteral2(); +//// declare function getTemplateLiteral3(): `start${string}\${,$${string}end`; +//// const lit3 = getTemplateLiteral3(); +//// declare function getTemplateLiteral4(): `${string}\`,${string}`; +//// const lit4 = getTemplateLiteral4(); + + +verify.baselineInlayHints(undefined, { + includeInlayVariableTypeHints: true, + interactiveInlayHints: true +}); diff --git a/tests/cases/fourslash/renameStringLiteralTypes4.ts b/tests/cases/fourslash/renameStringLiteralTypes4.ts new file mode 100644 index 00000000000..8ac01df18dc --- /dev/null +++ b/tests/cases/fourslash/renameStringLiteralTypes4.ts @@ -0,0 +1,11 @@ +/// + +////interface I { +//// "Prop 1": string; +////} +//// +////declare const fn: (p: K) => void +//// +////fn("Prop 1"/**/) + +verify.baselineRename("", {}); diff --git a/tests/cases/fourslash/renameStringLiteralTypes5.ts b/tests/cases/fourslash/renameStringLiteralTypes5.ts new file mode 100644 index 00000000000..aa40b656e57 --- /dev/null +++ b/tests/cases/fourslash/renameStringLiteralTypes5.ts @@ -0,0 +1,11 @@ +/// + +////type T = { +//// "Prop 1": string; +////} +//// +////declare const fn: (p: K) => void +//// +////fn("Prop 1"/**/) + +verify.baselineRename("", {}); diff --git a/tests/cases/fourslash/signatureHelpRestArgs.ts b/tests/cases/fourslash/signatureHelpRestArgs.ts new file mode 100644 index 00000000000..49f5088b912 --- /dev/null +++ b/tests/cases/fourslash/signatureHelpRestArgs.ts @@ -0,0 +1,13 @@ +/// + +////function fn(a: number, b: number, c: number) {} +////const a = [1, 2] as const; +////const b = [1] as const; +//// +////fn(...a, /*1*/); +////fn(/*2*/, ...a); +//// +////fn(...b, /*3*/); +////fn(/*4*/, ...b, /*5*/); + +verify.baselineSignatureHelp(); diff --git a/tests/cases/fourslash/stringLiteralCompletionsForOpenEndedTemplateLiteralType.ts b/tests/cases/fourslash/stringLiteralCompletionsForOpenEndedTemplateLiteralType.ts index 92c02a23a28..c5472fab365 100644 --- a/tests/cases/fourslash/stringLiteralCompletionsForOpenEndedTemplateLiteralType.ts +++ b/tests/cases/fourslash/stringLiteralCompletionsForOpenEndedTemplateLiteralType.ts @@ -1,6 +1,6 @@ /// -//// function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {} +//// function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string}Downcast` & {}) {} //// conversionTest("/**/"); verify.completions({ marker: "", exact: ["downcast", "dataDowncast", "editingDowncast"] });