Repository navigation
Restrict content mapper extensions to a single dot - #65284
Draft
Andrew Branch (andrewbranch) wants to merge 1 commit into
Draft
Andrew Branch (andrewbranch) wants to merge 1 commit into
Andrew Branch (andrewbranch) wants to merge 1 commit into
Conversation
typescript-automation
Bot
added
Author: Team
For Uncommitted Bug
Member
|
Would this break say, |
Member
Author
|
Yep, exactly. |
Member
Author
|
A compromise that would still reduce the complexity could be to prohibit overlapping extension registrations, e.g. registering both |
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues are reported for the changes restricting content mapper source extensions to a single leading dot.
No open issues 🎉
2 files not reviewed
tsc/internal/diagnostics/diagnostics_generated.go: Generated filetsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.js: Generated file
What changed in this PR
This PR restricts content mapper source extensions to a single leading dot across the compiler, language server, and VS Code integration. It removes overlapping-extension complexity highlighted by #65047 while preserving compound output suffixes and filenames containing additional dots.
Changes:
- Reject compound source extensions in registrations and output mapping keys, with matching diagnostics and schema validation.
- Simplify extension matching, import rewriting, module resolution, and declaration output paths.
- Replace overlap-specific tests with single-dot validation coverage and update affected baselines.
| File | Description |
|---|---|
tsc/testdata/tests/cases/compiler/contentMapperSingleDotExtensions.ts |
Adds validation and emit regression coverage. |
tsc/testdata/tests/cases/compiler/contentMapperOutputExtensionsOverlap.ts |
Removes obsolete overlap test. |
tsc/testdata/tests/cases/compiler/contentMapperOutputExtensions.ts |
Uses single-dot sources with dotted filenames. |
tsc/testdata/tests/cases/compiler/contentMapperDeclarationEmit.ts |
Updates declaration emit fixture. |
tsc/testdata/baselines/reference/conformance/emitModuleCommonJS(module=nodenext).js |
Updates emitted rewrite helper. |
tsc/testdata/baselines/reference/conformance/emitModuleCommonJS(module=commonjs).js |
Updates emitted rewrite helper. |
tsc/testdata/baselines/reference/conformance/emit(jsx=react).js |
Updates emitted rewrite helper. |
tsc/testdata/baselines/reference/conformance/emit(jsx=preserve).js |
Updates emitted rewrite helper. |
tsc/testdata/baselines/reference/compiler/rewriteRelativeImportExtensionsDynamicImportCjs.js |
Updates dynamic-import helper baseline. |
tsc/testdata/baselines/reference/compiler/contentMapperSingleDotExtensions.types |
Records new fixture’s inferred types. |
tsc/testdata/baselines/reference/compiler/contentMapperSingleDotExtensions.symbols |
Records new fixture’s symbols. |
tsc/testdata/baselines/reference/compiler/contentMapperSingleDotExtensions.js |
Records import and declaration output. |
tsc/testdata/baselines/reference/compiler/contentMapperSingleDotExtensions.errors.txt |
Records compound-source diagnostics. |
tsc/testdata/baselines/reference/compiler/contentMapperSingleDotExtensions.contentmapper |
Records accepted mapper transformations. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensionsOverlap.types |
Removes obsolete type baseline. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensionsOverlap.symbols |
Removes obsolete symbol baseline. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensionsOverlap.js |
Removes obsolete emit baseline. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensionsOverlap.contentmapper |
Removes obsolete transformation baseline. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.types |
Updates filename and import types. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.symbols |
Updates filename and import symbols. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.sourcemap.txt |
Updates declaration mapping records. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.js.map |
Updates declaration source maps. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.js |
Updates rewritten imports and declarations. |
tsc/testdata/baselines/reference/compiler/contentMapperOutputExtensions.contentmapper |
Updates registered extensions and filenames. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.types |
Updates declaration fixture’s type references. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.symbols |
Updates declaration fixture’s symbol references. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.sourcemap.txt |
Updates declaration mapping records. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.js.map |
Updates declaration source maps. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.js |
Records dotted-filename declaration output. |
tsc/testdata/baselines/reference/compiler/contentMapperDeclarationEmit.contentmapper |
Updates mapper transformation filename. |
tsc/internal/tspath/rooted_path.go |
Removes longest-extension wrapper. |
tsc/internal/tspath/path.go |
Removes longest-extension lookup. |
tsc/internal/tspath/path_test.go |
Removes longest-extension tests. |
tsc/internal/tspath/extensionrewrite.go |
Simplifies rewrite matching and eligibility. |
tsc/internal/tspath/extensionrewrite_test.go |
Updates rewrite and case-sensitivity coverage. |
tsc/internal/tsoptions/tsconfigparsing.go |
Rejects compound registration and mapping sources. |
tsc/internal/tsoptions/tsconfigparsing_test.go |
Updates configuration validation tests. |
tsc/internal/tsoptions/parsedcommandline.go |
Simplifies mapper lookup and rewrite lists. |
tsc/internal/tsoptions/contentmappers.go |
Validates manifest mapping source extensions. |
tsc/internal/tsoptions/contentmappers_test.go |
Updates lookup, caching, and manifest tests. |
tsc/internal/printer/helpers.go |
Simplifies runtime extension rewriting. |
tsc/internal/outputpaths/outputpaths.go |
Simplifies mapped-file and declaration paths. |
tsc/internal/outputpaths/outputpaths_test.go |
Covers dotted filenames and output suffixes. |
tsc/internal/module/resolver.go |
Simplifies candidate extension splitting. |
tsc/internal/lsp/server.go |
Enforces single-dot contribution sources. |
tsc/internal/lsp/server_contentmapper_internal_test.go |
Updates contribution validation coverage. |
tsc/internal/diagnostics/diagnostics_generated.go |
Adds generated single-dot diagnostic. |
tsc/internal/diagnostics/diagnosticMessages.json |
Defines the single-dot diagnostic. |
tsc/internal/diagnostics/diagnosticMessages.generated.json |
Adds generated diagnostic text. |
tsc/internal/contentmapper/contentmapper.go |
Adds source validation and simplifies reserved matching. |
tsc/internal/checker/checker.go |
Uses the final extension in mapper diagnostics. |
tools/scripts/tsc/options.test.ts |
Adds schema rejection cases. |
tools/scripts/tsc/options-schema.ts |
Defines the source-extension schema constraint. |
packages/vscode-typescript/test/contentMapperContributions.test.ts |
Tests source restrictions and compound outputs. |
packages/vscode-typescript/src/contentMapperContributions.ts |
Validates single-dot contribution sources. |
packages/typescript/schemas/tsconfig.schema.json |
Adds source-extension pattern and description. |
packages/typescript/schemas/jsconfig.schema.json |
Adds source-extension pattern and description. |
Review effort: Balanced
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Content mappers registering extensions with multiple dots like
.foo.barseemed like something I should test when I was writing the initial implementation, but has become a source of surprising complexity, especially in #65047. Since this is something nobody was asking for, and has shockingly confusing interactions with things likemoduleSuffixes, I decided it would be better to prohibit it.