Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/checker/pseudotypenodebuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,15 @@ func (b *NodeBuilderImpl) pseudoTypeToNode(t *pseudochecker.PseudoType) *ast.Nod
if len(d.TypeParameters) > 0 {
res := make([]*ast.Node, 0, len(d.TypeParameters))
for _, tp := range d.TypeParameters {
res = append(res, b.reuseNode(tp.AsNode()))
node := tp.AsNode()
reused := b.reuseNode(node)
if reused == nil {
// Reuse fails when the constraint references a name inaccessible from the emit target.
// A nil here would reach the printer, which dereferences it in NodeList.HasTrailingComma.
b.ctx.tracker.ReportInferenceFallback(node)
reused = b.typeParameterToDeclaration(b.ch.getDeclaredTypeOfTypeParameter(node.Symbol()))
}
res = append(res, reused)
}
typeParams = b.f.NewNodeList(res)
}
Expand Down
34 changes: 34 additions & 0 deletions internal/execute/tsctests/tsc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,40 @@ func TestTscDeclarationEmit(t *testing.T) {
},
},
},
{
// The declaration signature computed for b.ts inlines `setField` structurally. Its type

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a compiler test in testdata\tests\cases\compiler and not a full stack test, since it's not concerned with incremental/watch/CLI stuff.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that first and verified against the unpatched code — as a compiler test this repro is green, because it never reaches the failing path. The shape necessarily carries declaration diagnostics (TS2527/TS4023), and declaration emit skips printing a file that has them:

declBlocked := len(diags) > 0 && !e.forceEmit && e.emitOnly != EmitOnlyForcedDts

The malformed list is still built — the diagnostics come from that same transform — but only EmitOnlyForcedDts prints in spite of them, and its sole production caller is the incremental d.ts signature computation in affectedfileshandler.go. The compiler runner sets neither forceEmit nor emitOnly, so the same two files under cases/compiler pass with and without the fix, while this scenario panics without it.

Agreed the defect itself is in the node builder/printer, not in anything incremental — incremental is just the only path that prints the result. If there's a diagnostics-free shape that makes type-parameter reuse fail (I went looking via the silent markError(nil) paths in the reuse visitor and couldn't build one), I'll gladly move this to a compiler test; otherwise I'd prefer to keep the incremental regression test, since it's the only harness that reaches the crash.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. Unfortunate. I'd have suggested a fourslash regression test as a fallback, but our current fourslash APIs are a bit lacking compared to the old ones and don't have LS emit functions exposed to the test runner right now (eg, baselineGetEmitOutput/getEmitOutput).

I'm just not a fun of stuffing regression tests into these unit test files, but I guess this'll do for now.

// parameter cannot be reused, because rewriting `typeof state` hits an inaccessible
// `unique symbol`. The pseudo type node builder used to store the resulting nil in the
// type parameter list, which crashed the printer.
subScenario: "dts signature update with a type parameter that cannot be reused",
files: FileMap{
"/home/src/workspaces/project/tsconfig.json": stringtestutil.Dedent(`
{
"compilerOptions": {
"strict": true,
"incremental": true,
"skipLibCheck": true,
"skipDefaultLibCheck": true,
},
}`),
"/home/src/workspaces/project/a.ts": stringtestutil.Dedent(`
declare const brand: unique symbol;
const state = { name: "", count: 0, [brand]: true };
export const api = {
setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {
state[key] = value;
},
};`),
"/home/src/workspaces/project/b.ts": stringtestutil.Dedent(`
import { api } from "./a";
export const merged = { ...api };`),
},
edits: []*tscEdit{
newTscEdit("modify b.ts", func(sys *TestSys) {
sys.appendFile("/home/src/workspaces/project/b.ts", "\nexport const touched = 1;")
}),
},
},
{
subScenario: "when using Windows paths and uppercase letters",
files: FileMap{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
currentDirectory::/home/src/workspaces/project
useCaseSensitiveFileNames::true
Input::
//// [/home/src/workspaces/project/a.ts] *new*
declare const brand: unique symbol;
const state = { name: "", count: 0, [brand]: true };
export const api = {
setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {
state[key] = value;
},
};
//// [/home/src/workspaces/project/b.ts] *new*
import { api } from "./a";
export const merged = { ...api };
//// [/home/src/workspaces/project/tsconfig.json] *new*
{
"compilerOptions": {
"strict": true,
"incremental": true,
"skipLibCheck": true,
"skipDefaultLibCheck": true,
},
}

tsgo
ExitStatus:: Success
Output::
//// [/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts] *Lib*
/// <reference no-default-lib="true"/>
interface Boolean {}
interface Function {}
interface CallableFunction {}
interface NewableFunction {}
interface IArguments {}
interface Number { toExponential: any; }
interface Object {}
interface RegExp {}
interface String { charAt: any; }
interface Array<T> { length: number; [n: number]: T; }
interface ReadonlyArray<T> {}
interface SymbolConstructor {
(desc?: string | number): symbol;
for(name: string): symbol;
readonly toStringTag: symbol;
}
declare var Symbol: SymbolConstructor;
interface Symbol {
readonly [Symbol.toStringTag]: string;
}
declare const console: { log(msg: any): void; };
//// [/home/src/workspaces/project/a.js] *new*
const state = { name: "", count: 0, [brand]: true };
export const api = {
setField: (key, value) => {
state[key] = value;
},
};

//// [/home/src/workspaces/project/b.js] *new*
import { api } from "./a";
export const merged = { ...api };

//// [/home/src/workspaces/project/tsconfig.tsbuildinfo] *new*
{"version":"FakeTSVersion","root":[[2,3]],"fileNames":["lib.es2025.full.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};","de62ab78d5ba64a5b325bfebf0f2e8d3-import { api } from \"./a\";\nexport const merged = { ...api };"],"fileIdsList":[[2]],"options":{"skipLibCheck":true,"strict":true,"skipDefaultLibCheck":true},"referencedMap":[[3,1]]}
//// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt] *new*
{
"version": "FakeTSVersion",
"root": [
{
"files": [
"./a.ts",
"./b.ts"
],
"original": [
2,
3
]
}
],
"fileNames": [
"lib.es2025.full.d.ts",
"./a.ts",
"./b.ts"
],
"fileInfos": [
{
"fileName": "lib.es2025.full.d.ts",
"version": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"signature": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"affectsGlobalScope": true,
"impliedNodeFormat": "CommonJS",
"original": {
"version": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"affectsGlobalScope": true,
"impliedNodeFormat": 1
}
},
{
"fileName": "./a.ts",
"version": "420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};",
"signature": "420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};",
"impliedNodeFormat": "CommonJS"
},
{
"fileName": "./b.ts",
"version": "de62ab78d5ba64a5b325bfebf0f2e8d3-import { api } from \"./a\";\nexport const merged = { ...api };",
"signature": "de62ab78d5ba64a5b325bfebf0f2e8d3-import { api } from \"./a\";\nexport const merged = { ...api };",
"impliedNodeFormat": "CommonJS"
}
],
"fileIdsList": [
[
"./a.ts"
]
],
"options": {
"skipLibCheck": true,
"strict": true,
"skipDefaultLibCheck": true
},
"referencedMap": {
"./b.ts": [
"./a.ts"
]
},
"size": 1378
}

tsconfig.json::
SemanticDiagnostics::
*refresh* /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
*refresh* /home/src/workspaces/project/a.ts
*refresh* /home/src/workspaces/project/b.ts
Signatures::


Edit [0]:: modify b.ts
//// [/home/src/workspaces/project/b.ts] *modified*
import { api } from "./a";
export const merged = { ...api };
export const touched = 1;

tsgo
ExitStatus:: Success
Output::
//// [/home/src/workspaces/project/b.js] *modified*
import { api } from "./a";
export const merged = { ...api };
export const touched = 1;

//// [/home/src/workspaces/project/tsconfig.tsbuildinfo] *modified*
{"version":"FakeTSVersion","root":[[2,3]],"fileNames":["lib.es2025.full.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};",{"version":"6fa50051a3b923ced64e589b1e168966-import { api } from \"./a\";\nexport const merged = { ...api };\nexport const touched = 1;","signature":"49d11e9dbd07ad5b91e829e73838e2a1-export declare const merged: {\n setField: <K extends \"count\" | \"name\" | unique symbol>(key: K, value: ({\n name: string;\n count: number;\n [brand]: boolean;\n })[K]) => void;\n};\nexport declare const touched = 1;\n\n(40,6): error2527: The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary_2527\nmerged\nunique symbol\n\n(40,6): error4023: Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023\nmerged\nbrand\n\"/home/src/workspaces/project/a\"\n","impliedNodeFormat":1}],"fileIdsList":[[2]],"options":{"skipLibCheck":true,"strict":true,"skipDefaultLibCheck":true},"referencedMap":[[3,1]]}
//// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt] *modified*
{
"version": "FakeTSVersion",
"root": [
{
"files": [
"./a.ts",
"./b.ts"
],
"original": [
2,
3
]
}
],
"fileNames": [
"lib.es2025.full.d.ts",
"./a.ts",
"./b.ts"
],
"fileInfos": [
{
"fileName": "lib.es2025.full.d.ts",
"version": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"signature": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"affectsGlobalScope": true,
"impliedNodeFormat": "CommonJS",
"original": {
"version": "8859c12c614ce56ba9a18e58384a198f-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };",
"affectsGlobalScope": true,
"impliedNodeFormat": 1
}
},
{
"fileName": "./a.ts",
"version": "420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};",
"signature": "420f0324953654bb26e57da1857dc6a2-declare const brand: unique symbol;\nconst state = { name: \"\", count: 0, [brand]: true };\nexport const api = {\n setField: <K extends keyof typeof state>(key: K, value: (typeof state)[K]): void => {\n state[key] = value;\n },\n};",
"impliedNodeFormat": "CommonJS"
},
{
"fileName": "./b.ts",
"version": "6fa50051a3b923ced64e589b1e168966-import { api } from \"./a\";\nexport const merged = { ...api };\nexport const touched = 1;",
"signature": "49d11e9dbd07ad5b91e829e73838e2a1-export declare const merged: {\n setField: <K extends \"count\" | \"name\" | unique symbol>(key: K, value: ({\n name: string;\n count: number;\n [brand]: boolean;\n })[K]) => void;\n};\nexport declare const touched = 1;\n\n(40,6): error2527: The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary_2527\nmerged\nunique symbol\n\n(40,6): error4023: Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023\nmerged\nbrand\n\"/home/src/workspaces/project/a\"\n",
"impliedNodeFormat": "CommonJS",
"original": {
"version": "6fa50051a3b923ced64e589b1e168966-import { api } from \"./a\";\nexport const merged = { ...api };\nexport const touched = 1;",
"signature": "49d11e9dbd07ad5b91e829e73838e2a1-export declare const merged: {\n setField: <K extends \"count\" | \"name\" | unique symbol>(key: K, value: ({\n name: string;\n count: number;\n [brand]: boolean;\n })[K]) => void;\n};\nexport declare const touched = 1;\n\n(40,6): error2527: The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary_2527\nmerged\nunique symbol\n\n(40,6): error4023: Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023\nmerged\nbrand\n\"/home/src/workspaces/project/a\"\n",
"impliedNodeFormat": 1
}
}
],
"fileIdsList": [
[
"./a.ts"
]
],
"options": {
"skipLibCheck": true,
"strict": true,
"skipDefaultLibCheck": true
},
"referencedMap": {
"./b.ts": [
"./a.ts"
]
},
"size": 2037
}

tsconfig.json::
SemanticDiagnostics::
*refresh* /home/src/workspaces/project/b.ts
Signatures::
(computed .d.ts) /home/src/workspaces/project/b.ts