ttsc 0.28.5 → 0.28.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cmd/ttsc/api_compile.go +6 -4
- package/cmd/ttsc/api_transform.go +6 -4
- package/cmd/ttsc/build.go +7 -6
- package/cmd/ttscgraph/serve.go +70 -77
- package/cmd/ttscgraph/serve_session_reloads_superseding_module_candidates_test.go +26 -0
- package/cmd/ttscgraph/serve_session_tracks_all_module_specifier_forms_test.go +1 -2
- package/driver/graph.go +67 -35
- package/driver/input_observation.go +305 -115
- package/driver/input_observation_test.go +203 -0
- package/driver/program.go +28 -4
- package/driver/resolution_candidates.go +247 -741
- package/driver/resolution_candidates_test.go +341 -0
- package/lib/compiler/internal/project/readProjectConfig.js +9 -7
- package/lib/compiler/internal/project/readProjectConfig.js.map +1 -1
- package/lib/compiler/internal/runBuild.js +1 -0
- package/lib/compiler/internal/runBuild.js.map +1 -1
- package/lib/compiler/internal/sharedHostHelpers.d.ts +4 -0
- package/lib/compiler/internal/sharedHostHelpers.js +11 -1
- package/lib/compiler/internal/sharedHostHelpers.js.map +1 -1
- package/lib/compiler/internal/startResidentTransform.js +1 -0
- package/lib/compiler/internal/startResidentTransform.js.map +1 -1
- package/lib/compiler/internal/transformProjectInMemory.js +165 -8
- package/lib/compiler/internal/transformProjectInMemory.js.map +1 -1
- package/lib/internal/projectInputPathIdentity.js +8 -7
- package/lib/internal/projectInputPathIdentity.js.map +1 -1
- package/lib/structures/ITtscCompilerTransformation.d.ts +57 -19
- package/package.json +8 -8
- package/shim/compiler/incremental.go +52 -0
- package/shim/compiler/resolution.go +444 -0
- package/shim/core/shim.go +15 -1
- package/src/compiler/internal/project/readProjectConfig.ts +9 -7
- package/src/compiler/internal/runBuild.ts +2 -0
- package/src/compiler/internal/sharedHostHelpers.ts +14 -0
- package/src/compiler/internal/startResidentTransform.ts +2 -0
- package/src/compiler/internal/transformProjectInMemory.ts +193 -8
- package/src/internal/projectInputPathIdentity.ts +8 -7
- package/src/structures/ITtscCompilerTransformation.ts +65 -19
- package/utility/host.go +8 -7
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
package driver
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"fmt"
|
|
5
|
+
"os"
|
|
6
|
+
"path/filepath"
|
|
7
|
+
"slices"
|
|
8
|
+
"testing"
|
|
9
|
+
)
|
|
10
|
+
|
|
11
|
+
func TestTransformGraphReplaysCompilerResolutionSemantics(t *testing.T) {
|
|
12
|
+
root := t.TempDir()
|
|
13
|
+
files := map[string]string{
|
|
14
|
+
"package.json": `{
|
|
15
|
+
"name": "resolver-fixture",
|
|
16
|
+
"type": "module",
|
|
17
|
+
"imports": { "#internal": "./src/internal.js" },
|
|
18
|
+
"exports": { "./self": "./src/self.js" }
|
|
19
|
+
}`,
|
|
20
|
+
"tsconfig.json": `{
|
|
21
|
+
"compilerOptions": {
|
|
22
|
+
"allowJs": true,
|
|
23
|
+
"module": "nodenext",
|
|
24
|
+
"moduleResolution": "nodenext",
|
|
25
|
+
"moduleSuffixes": [".native", ""],
|
|
26
|
+
"target": "es2022",
|
|
27
|
+
"types": ["*"]
|
|
28
|
+
},
|
|
29
|
+
"files": ["src/main.ts"]
|
|
30
|
+
}`,
|
|
31
|
+
"src/main.ts": `/// <reference path="./ambient" />
|
|
32
|
+
/// <reference types="fixture-types" />
|
|
33
|
+
import { internal } from "#internal";
|
|
34
|
+
import { self } from "resolver-fixture/self";
|
|
35
|
+
import type { Folder } from "./folder/index.js";
|
|
36
|
+
export const value: Folder = { value: internal + self };
|
|
37
|
+
`,
|
|
38
|
+
"src/ambient.d.ts": `declare const fixturePathGlobal: string;
|
|
39
|
+
`,
|
|
40
|
+
"src/internal.js": `export const internal = "internal";
|
|
41
|
+
`,
|
|
42
|
+
"src/self.js": `export const self = "self";
|
|
43
|
+
`,
|
|
44
|
+
"src/folder/index.d.ts": `export interface Folder { value: string }
|
|
45
|
+
`,
|
|
46
|
+
"node_modules/@types/fixture-types/package.json": `{"name":"@types/fixture-types","types":"index.d.ts","version":"1.0.0"}
|
|
47
|
+
`,
|
|
48
|
+
"node_modules/@types/fixture-types/index.d.ts": `declare const fixtureGlobal: string;
|
|
49
|
+
`,
|
|
50
|
+
}
|
|
51
|
+
for name, contents := range files {
|
|
52
|
+
location := filepath.Join(root, filepath.FromSlash(name))
|
|
53
|
+
if err := os.MkdirAll(filepath.Dir(location), 0o755); err != nil {
|
|
54
|
+
t.Fatal(err)
|
|
55
|
+
}
|
|
56
|
+
if err := os.WriteFile(location, []byte(contents), 0o644); err != nil {
|
|
57
|
+
t.Fatal(err)
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
prog, diagnostics, err := LoadProgram(root, "tsconfig.json", LoadProgramOptions{ForceNoEmit: true})
|
|
62
|
+
if err != nil {
|
|
63
|
+
t.Fatal(err)
|
|
64
|
+
}
|
|
65
|
+
if len(diagnostics) != 0 {
|
|
66
|
+
t.Fatalf("unexpected diagnostics: %#v", diagnostics)
|
|
67
|
+
}
|
|
68
|
+
defer prog.Close()
|
|
69
|
+
|
|
70
|
+
graph := NewTransformGraph(prog, root)
|
|
71
|
+
if graph == nil {
|
|
72
|
+
t.Fatal("NewTransformGraph returned nil")
|
|
73
|
+
}
|
|
74
|
+
source := filepath.ToSlash(filepath.Join("src", "main.ts"))
|
|
75
|
+
candidates := graph.Candidates[source]
|
|
76
|
+
for _, expected := range []string{
|
|
77
|
+
"package.json",
|
|
78
|
+
"src/ambient.ts",
|
|
79
|
+
"src/folder/index.native.d.ts",
|
|
80
|
+
"src/internal.native.ts",
|
|
81
|
+
"src/self.native.ts",
|
|
82
|
+
} {
|
|
83
|
+
if !slices.Contains(candidates, filepath.ToSlash(expected)) {
|
|
84
|
+
t.Errorf("exact resolver inputs omit %q: %v", expected, candidates)
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
typeRoot := filepath.ToSlash(filepath.Join("node_modules", "@types"))
|
|
88
|
+
if !slices.Contains(graph.ResolutionInputs, typeRoot) {
|
|
89
|
+
t.Fatalf("automatic type-root inputs omit %q: %v", typeRoot, graph.ResolutionInputs)
|
|
90
|
+
}
|
|
91
|
+
entries := graph.InputObservations[typeRoot].AccessibleEntries
|
|
92
|
+
if entries == nil || !slices.Contains(entries.Directories, "fixture-types") {
|
|
93
|
+
t.Fatalf("automatic type-root listing = %#v", entries)
|
|
94
|
+
}
|
|
95
|
+
if len(graph.InputProofFailures) != 0 {
|
|
96
|
+
t.Fatalf("stable exact replay reported failures: %#v", graph.InputProofFailures)
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
for _, resolveJSON := range []bool{false, true} {
|
|
100
|
+
jsonReferenceRoot := t.TempDir()
|
|
101
|
+
jsonReferenceFiles := map[string]string{
|
|
102
|
+
"tsconfig.json": fmt.Sprintf(`{
|
|
103
|
+
"compilerOptions": {
|
|
104
|
+
"module": "commonjs",
|
|
105
|
+
"resolveJsonModule": %t,
|
|
106
|
+
"target": "es2022"
|
|
107
|
+
},
|
|
108
|
+
"files": ["src/main.ts"]
|
|
109
|
+
}`, resolveJSON),
|
|
110
|
+
"src/main.ts": `/// <reference path="./appearing.json" />
|
|
111
|
+
/// <reference path="./appearing.JSON" />
|
|
112
|
+
export const value = true;
|
|
113
|
+
`,
|
|
114
|
+
}
|
|
115
|
+
for name, contents := range jsonReferenceFiles {
|
|
116
|
+
location := filepath.Join(jsonReferenceRoot, filepath.FromSlash(name))
|
|
117
|
+
if err := os.MkdirAll(filepath.Dir(location), 0o755); err != nil {
|
|
118
|
+
t.Fatal(err)
|
|
119
|
+
}
|
|
120
|
+
if err := os.WriteFile(location, []byte(contents), 0o644); err != nil {
|
|
121
|
+
t.Fatal(err)
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
jsonReferenceProgram, _, err := LoadProgram(jsonReferenceRoot, "tsconfig.json", LoadProgramOptions{ForceNoEmit: true})
|
|
125
|
+
if err != nil {
|
|
126
|
+
t.Fatal(err)
|
|
127
|
+
}
|
|
128
|
+
defer jsonReferenceProgram.Close()
|
|
129
|
+
jsonReferenceGraph := NewTransformGraph(jsonReferenceProgram, jsonReferenceRoot)
|
|
130
|
+
jsonReferenceSource := filepath.ToSlash(filepath.Join("src", "main.ts"))
|
|
131
|
+
jsonReferenceCandidate := filepath.ToSlash(filepath.Join("src", "appearing.json"))
|
|
132
|
+
uppercaseJSONCandidate := filepath.ToSlash(filepath.Join("src", "appearing.JSON"))
|
|
133
|
+
containsCandidate := slices.Contains(jsonReferenceGraph.Candidates[jsonReferenceSource], jsonReferenceCandidate)
|
|
134
|
+
if containsCandidate != resolveJSON {
|
|
135
|
+
t.Fatalf("resolveJsonModule=%t JSON candidates = %v", resolveJSON, jsonReferenceGraph.Candidates[jsonReferenceSource])
|
|
136
|
+
}
|
|
137
|
+
containsUppercaseCandidate := slices.Contains(jsonReferenceGraph.Candidates[jsonReferenceSource], uppercaseJSONCandidate)
|
|
138
|
+
expectsUppercaseCandidate := resolveJSON && !jsonReferenceProgram.FS.UseCaseSensitiveFileNames()
|
|
139
|
+
if containsUppercaseCandidate != expectsUppercaseCandidate {
|
|
140
|
+
t.Fatalf("resolveJsonModule=%t uppercase JSON candidates = %v", resolveJSON, jsonReferenceGraph.Candidates[jsonReferenceSource])
|
|
141
|
+
}
|
|
142
|
+
if resolveJSON {
|
|
143
|
+
observation := jsonReferenceGraph.InputObservations[jsonReferenceCandidate]
|
|
144
|
+
if observation.FileExists == nil || *observation.FileExists {
|
|
145
|
+
t.Fatalf("missing JSON path observation = %#v", observation)
|
|
146
|
+
}
|
|
147
|
+
if expectsUppercaseCandidate {
|
|
148
|
+
uppercaseObservation := jsonReferenceGraph.InputObservations[uppercaseJSONCandidate]
|
|
149
|
+
if uppercaseObservation.FileExists == nil || *uppercaseObservation.FileExists {
|
|
150
|
+
t.Fatalf("missing uppercase JSON path observation = %#v", uppercaseObservation)
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
noResolveRoot := t.TempDir()
|
|
157
|
+
noResolveFiles := map[string]string{
|
|
158
|
+
"tsconfig.json": `{
|
|
159
|
+
"compilerOptions": {
|
|
160
|
+
"allowJs": true,
|
|
161
|
+
"module": "commonjs",
|
|
162
|
+
"noResolve": true,
|
|
163
|
+
"target": "es2022"
|
|
164
|
+
},
|
|
165
|
+
"files": ["src/main.ts"]
|
|
166
|
+
}`,
|
|
167
|
+
"src/main.ts": `import { detached } from "./detached"; export { detached };`,
|
|
168
|
+
"src/detached.js": `export const detached = true;`,
|
|
169
|
+
}
|
|
170
|
+
for name, contents := range noResolveFiles {
|
|
171
|
+
location := filepath.Join(noResolveRoot, filepath.FromSlash(name))
|
|
172
|
+
if err := os.MkdirAll(filepath.Dir(location), 0o755); err != nil {
|
|
173
|
+
t.Fatal(err)
|
|
174
|
+
}
|
|
175
|
+
if err := os.WriteFile(location, []byte(contents), 0o644); err != nil {
|
|
176
|
+
t.Fatal(err)
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
noResolveProgram, _, err := LoadProgram(noResolveRoot, "tsconfig.json", LoadProgramOptions{ForceNoEmit: true})
|
|
180
|
+
if err != nil {
|
|
181
|
+
t.Fatal(err)
|
|
182
|
+
}
|
|
183
|
+
defer noResolveProgram.Close()
|
|
184
|
+
noResolveGraph := NewTransformGraph(noResolveProgram, noResolveRoot)
|
|
185
|
+
noResolveCandidates := noResolveGraph.Candidates[filepath.ToSlash(filepath.Join("src", "main.ts"))]
|
|
186
|
+
if !slices.Contains(noResolveCandidates, filepath.ToSlash(filepath.Join("src", "detached.js"))) {
|
|
187
|
+
t.Fatalf("successful resolution outside the Program graph was dropped: %v", noResolveCandidates)
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
projectReferenceRoot := t.TempDir()
|
|
191
|
+
projectReferenceFiles := map[string]string{
|
|
192
|
+
"tsconfig.json": `{
|
|
193
|
+
"compilerOptions": {
|
|
194
|
+
"module": "commonjs",
|
|
195
|
+
"moduleResolution": "node10",
|
|
196
|
+
"target": "es2022"
|
|
197
|
+
},
|
|
198
|
+
"files": ["src/main.ts", "src/anchor.ts"],
|
|
199
|
+
"references": [{ "path": "./child" }]
|
|
200
|
+
}`,
|
|
201
|
+
"src/main.ts": `/// <reference path="../child/lib/reference" />
|
|
202
|
+
/// <reference path="../child/lib/index" />
|
|
203
|
+
export const parent = true;`,
|
|
204
|
+
"src/anchor.ts": `import { child } from "../child/lib/index.js"; export { child };`,
|
|
205
|
+
"child/tsconfig.json": `{
|
|
206
|
+
"compilerOptions": {
|
|
207
|
+
"composite": true,
|
|
208
|
+
"declaration": true,
|
|
209
|
+
"module": "commonjs",
|
|
210
|
+
"outDir": "lib",
|
|
211
|
+
"rootDir": "src",
|
|
212
|
+
"target": "es2022"
|
|
213
|
+
},
|
|
214
|
+
"files": ["src/index.ts", "src/reference.ts"]
|
|
215
|
+
}`,
|
|
216
|
+
"child/src/index.ts": `export const child = true;`,
|
|
217
|
+
"child/src/reference.ts": `export interface ChildReference { value: string }`,
|
|
218
|
+
}
|
|
219
|
+
for name, contents := range projectReferenceFiles {
|
|
220
|
+
location := filepath.Join(projectReferenceRoot, filepath.FromSlash(name))
|
|
221
|
+
if err := os.MkdirAll(filepath.Dir(location), 0o755); err != nil {
|
|
222
|
+
t.Fatal(err)
|
|
223
|
+
}
|
|
224
|
+
if err := os.WriteFile(location, []byte(contents), 0o644); err != nil {
|
|
225
|
+
t.Fatal(err)
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
unbuiltDeclaration := filepath.Join(projectReferenceRoot, "child", "lib", "index.d.ts")
|
|
229
|
+
if _, err := os.Stat(unbuiltDeclaration); !os.IsNotExist(err) {
|
|
230
|
+
t.Fatalf("unbuilt project-reference declaration unexpectedly exists: %v", err)
|
|
231
|
+
}
|
|
232
|
+
projectReferenceProgram, projectReferenceDiagnostics, err := LoadProgram(projectReferenceRoot, "tsconfig.json", LoadProgramOptions{ForceNoEmit: true})
|
|
233
|
+
if err != nil {
|
|
234
|
+
t.Fatal(err)
|
|
235
|
+
}
|
|
236
|
+
if len(projectReferenceDiagnostics) != 0 {
|
|
237
|
+
t.Fatalf("unexpected project-reference diagnostics: %#v", projectReferenceDiagnostics)
|
|
238
|
+
}
|
|
239
|
+
defer projectReferenceProgram.Close()
|
|
240
|
+
projectReferenceGraph := NewTransformGraph(projectReferenceProgram, projectReferenceRoot)
|
|
241
|
+
if len(projectReferenceGraph.InputProofFailures) != 0 {
|
|
242
|
+
t.Fatalf("unbuilt project-reference replay reported failures: %#v", projectReferenceGraph.InputProofFailures)
|
|
243
|
+
}
|
|
244
|
+
projectReferenceSource := filepath.ToSlash(filepath.Join("src", "main.ts"))
|
|
245
|
+
projectReferenceCandidates := projectReferenceGraph.Candidates[projectReferenceSource]
|
|
246
|
+
for _, expected := range []string{
|
|
247
|
+
filepath.ToSlash(filepath.Join("child", "lib", "index.d.ts")),
|
|
248
|
+
filepath.ToSlash(filepath.Join("child", "lib", "reference.d.ts")),
|
|
249
|
+
filepath.ToSlash(filepath.Join("child", "src", "reference.ts")),
|
|
250
|
+
} {
|
|
251
|
+
if !slices.Contains(projectReferenceCandidates, expected) {
|
|
252
|
+
t.Errorf("project-reference resolution input %q was not observed: %v", expected, projectReferenceCandidates)
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
projectReferenceEdges := projectReferenceGraph.Edges[projectReferenceSource]
|
|
256
|
+
residentReferenceSource := filepath.ToSlash(filepath.Join("child", "src", "index.ts"))
|
|
257
|
+
if !slices.Contains(projectReferenceEdges, residentReferenceSource) {
|
|
258
|
+
t.Fatalf("resident project-reference source was omitted from realized edges: %v", projectReferenceEdges)
|
|
259
|
+
}
|
|
260
|
+
extensionlessReferenceSource := filepath.ToSlash(filepath.Join("child", "src", "reference.ts"))
|
|
261
|
+
if slices.Contains(projectReferenceEdges, extensionlessReferenceSource) {
|
|
262
|
+
t.Fatalf("nonresident project-reference source remained a realized edge: %v", projectReferenceEdges)
|
|
263
|
+
}
|
|
264
|
+
rawExtensionlessReference := filepath.ToSlash(filepath.Join("child", "lib", "reference"))
|
|
265
|
+
if slices.Contains(projectReferenceEdges, rawExtensionlessReference) {
|
|
266
|
+
t.Fatalf("raw extensionless project-reference path remained a realized edge: %v", projectReferenceEdges)
|
|
267
|
+
}
|
|
268
|
+
sourceObservation := projectReferenceGraph.InputObservations[extensionlessReferenceSource]
|
|
269
|
+
if sourceObservation.FileExists == nil || !*sourceObservation.FileExists {
|
|
270
|
+
t.Fatalf("project-reference source existence was not preserved: %#v", sourceObservation)
|
|
271
|
+
}
|
|
272
|
+
outputReference := filepath.ToSlash(filepath.Join("child", "lib", "reference.d.ts"))
|
|
273
|
+
outputObservation := projectReferenceGraph.InputObservations[outputReference]
|
|
274
|
+
if outputObservation.FileExists == nil || *outputObservation.FileExists {
|
|
275
|
+
t.Fatalf("unbuilt project-reference output absence was not preserved: %#v", outputObservation)
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
semanticRoot := t.TempDir()
|
|
279
|
+
semanticFiles := map[string]string{
|
|
280
|
+
"tsconfig.json": `{
|
|
281
|
+
"compilerOptions": { "module": "commonjs", "target": "es2022", "types": ["*"] },
|
|
282
|
+
"files": ["src/main.ts"]
|
|
283
|
+
}`,
|
|
284
|
+
"src/main.ts": `export const value = fixtureTypeGlobal;`,
|
|
285
|
+
"node_modules/@types/fixture-types/index.d.ts": `declare const fixtureTypeGlobal: string;`,
|
|
286
|
+
}
|
|
287
|
+
for name, contents := range semanticFiles {
|
|
288
|
+
location := filepath.Join(semanticRoot, filepath.FromSlash(name))
|
|
289
|
+
if err := os.MkdirAll(filepath.Dir(location), 0o755); err != nil {
|
|
290
|
+
t.Fatal(err)
|
|
291
|
+
}
|
|
292
|
+
if err := os.WriteFile(location, []byte(contents), 0o644); err != nil {
|
|
293
|
+
t.Fatal(err)
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
semanticConfig := filepath.Join(semanticRoot, "tsconfig.json")
|
|
297
|
+
generatedRoot := t.TempDir()
|
|
298
|
+
generatedConfig := filepath.Join(generatedRoot, "tsconfig.json")
|
|
299
|
+
generatedContents := fmt.Sprintf(`{"extends":%q,"compilerOptions":{"strict":true}}`, filepath.ToSlash(semanticConfig))
|
|
300
|
+
if err := os.WriteFile(generatedConfig, []byte(generatedContents), 0o644); err != nil {
|
|
301
|
+
t.Fatal(err)
|
|
302
|
+
}
|
|
303
|
+
t.Setenv(SemanticConfigPathEnv, semanticConfig)
|
|
304
|
+
semanticProgram, semanticDiagnostics, err := LoadProgram(semanticRoot, generatedConfig, LoadProgramOptions{
|
|
305
|
+
ForceNoEmit: true,
|
|
306
|
+
SemanticConfigPath: semanticConfig,
|
|
307
|
+
})
|
|
308
|
+
if err != nil {
|
|
309
|
+
t.Fatal(err)
|
|
310
|
+
}
|
|
311
|
+
if len(semanticDiagnostics) != 0 {
|
|
312
|
+
t.Fatalf("unexpected generated-wrapper diagnostics: %#v", semanticDiagnostics)
|
|
313
|
+
}
|
|
314
|
+
defer semanticProgram.Close()
|
|
315
|
+
if got := semanticProgram.TSProgram.Options().ConfigFilePath; got != filepath.ToSlash(semanticConfig) {
|
|
316
|
+
t.Fatalf("generated wrapper semantic config = %q, want %q", got, filepath.ToSlash(semanticConfig))
|
|
317
|
+
}
|
|
318
|
+
semanticGraph := NewTransformGraph(semanticProgram, semanticRoot)
|
|
319
|
+
semanticTypeRoot := filepath.ToSlash(filepath.Join("node_modules", "@types"))
|
|
320
|
+
if !slices.Contains(semanticGraph.ResolutionInputs, semanticTypeRoot) {
|
|
321
|
+
t.Fatalf("generated wrapper type-root inputs omit %q: %v", semanticTypeRoot, semanticGraph.ResolutionInputs)
|
|
322
|
+
}
|
|
323
|
+
unmarkedProgram, unmarkedDiagnostics, err := LoadProgram(semanticRoot, generatedConfig, LoadProgramOptions{ForceNoEmit: true})
|
|
324
|
+
if err != nil {
|
|
325
|
+
t.Fatal(err)
|
|
326
|
+
}
|
|
327
|
+
if len(unmarkedDiagnostics) != 0 {
|
|
328
|
+
t.Fatalf("unexpected unmarked-wrapper diagnostics: %#v", unmarkedDiagnostics)
|
|
329
|
+
}
|
|
330
|
+
defer unmarkedProgram.Close()
|
|
331
|
+
if got := unmarkedProgram.TSProgram.Options().ConfigFilePath; got != filepath.ToSlash(generatedConfig) {
|
|
332
|
+
t.Fatalf("unmarked wrapper inherited ambient semantic config = %q, want %q", got, filepath.ToSlash(generatedConfig))
|
|
333
|
+
}
|
|
334
|
+
invalidProgram, _, err := LoadProgram(semanticRoot, generatedConfig, LoadProgramOptions{SemanticConfigPath: "relative.json"})
|
|
335
|
+
if invalidProgram != nil {
|
|
336
|
+
defer invalidProgram.Close()
|
|
337
|
+
}
|
|
338
|
+
if err == nil {
|
|
339
|
+
t.Fatal("relative semantic config path was accepted")
|
|
340
|
+
}
|
|
341
|
+
}
|
|
@@ -205,9 +205,10 @@ function resolvePathOptions(options, baseDirs, configDir) {
|
|
|
205
205
|
* leading `${configDir}` from the final config consuming the merged preset.
|
|
206
206
|
*/
|
|
207
207
|
function resolveCompilerOptionPath(declaringDir, configDir, value) {
|
|
208
|
-
|
|
208
|
+
const normalized = value.replaceAll("\\", "/");
|
|
209
|
+
if (normalized.slice(0, CONFIG_DIR_TEMPLATE.length).toLowerCase() !==
|
|
209
210
|
CONFIG_DIR_TEMPLATE.toLowerCase()) {
|
|
210
|
-
return resolveAbsolutePath(declaringDir,
|
|
211
|
+
return resolveAbsolutePath(declaringDir, normalized);
|
|
211
212
|
}
|
|
212
213
|
// The compiler picks the base directory from a case-insensitive prefix but
|
|
213
214
|
// substitutes only the exact spelling, so a mis-cased template still anchors
|
|
@@ -218,10 +219,10 @@ function resolveCompilerOptionPath(declaringDir, configDir, value) {
|
|
|
218
219
|
// The exact spelling becomes "./" before the result is normalized, which
|
|
219
220
|
// keeps the value relative even when its remainder resembles an absolute
|
|
220
221
|
// Windows path. Either config-file separator is accepted on every host.
|
|
221
|
-
const substituted =
|
|
222
|
-
? `./${
|
|
223
|
-
:
|
|
224
|
-
return resolveAbsolutePath(configDir, substituted
|
|
222
|
+
const substituted = normalized.startsWith(CONFIG_DIR_TEMPLATE)
|
|
223
|
+
? `./${normalized.slice(CONFIG_DIR_TEMPLATE.length)}`
|
|
224
|
+
: normalized;
|
|
225
|
+
return resolveAbsolutePath(configDir, substituted);
|
|
225
226
|
}
|
|
226
227
|
/**
|
|
227
228
|
* Resolve an `extends` specifier to an absolute path using the same rules as
|
|
@@ -234,6 +235,7 @@ function resolveCompilerOptionPath(declaringDir, configDir, value) {
|
|
|
234
235
|
* also tries appending `.json` when the first attempt fails).
|
|
235
236
|
*/
|
|
236
237
|
function resolveExtendsConfig(tsconfig, specifier) {
|
|
238
|
+
specifier = specifier.replaceAll("\\", "/");
|
|
237
239
|
const baseDir = node_path_1.default.dirname(tsconfig);
|
|
238
240
|
if (node_path_1.default.isAbsolute(specifier)) {
|
|
239
241
|
return resolveExistingExtendsPath(specifier);
|
|
@@ -301,7 +303,7 @@ function resolvePackageManifestTsconfig(resolver, specifier) {
|
|
|
301
303
|
if (typeof field !== "string" || field.length === 0) {
|
|
302
304
|
return undefined;
|
|
303
305
|
}
|
|
304
|
-
return node_path_1.default.resolve(node_path_1.default.dirname(manifestPath), field);
|
|
306
|
+
return node_path_1.default.resolve(node_path_1.default.dirname(manifestPath), field.replaceAll("\\", "/"));
|
|
305
307
|
}
|
|
306
308
|
/**
|
|
307
309
|
* Return true when `specifier` is a bare package root (no subpath): a plain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readProjectConfig.js","sourceRoot":"","sources":["../../../../src/compiler/internal/project/readProjectConfig.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"readProjectConfig.js","sourceRoot":"","sources":["../../../../src/compiler/internal/project/readProjectConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,6 +131,7 @@ function nativePluginEnv(extra, execution, plugin, tsgoArgs) {
|
|
|
131
131
|
else {
|
|
132
132
|
(0, sharedHostHelpers_1.clearInheritedTsgoArgs)(env, extra);
|
|
133
133
|
}
|
|
134
|
+
(0, sharedHostHelpers_1.clearInheritedSemanticConfigPath)(env, extra);
|
|
134
135
|
// The anchor is per-invocation state owned by this host: when this run
|
|
135
136
|
// declared none (and the caller's env does not name one), drop any value
|
|
136
137
|
// inherited from an ancestor ttsc process so a nested build never
|