Skip to content

Commit 34e5ec2

Browse files
sheetalkamatsheetalkamat
committed
Adding comments and refactoring some of the code
1 parent cdcae30 commit 34e5ec2

File tree

6 files changed

+169
-217
lines changed

6 files changed

+169
-217
lines changed

‎src/compiler/builder.ts

+149-201
Large diffs are not rendered by default.

‎src/compiler/builderState.ts

+1
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ namespace ts {
300300
fileInfos.set(sourceFile.resolvedPath, {
301301
version,
302302
signature,
303+
// No need to calculate affectsGlobalScope with --out since its not used at all
303304
affectsGlobalScope: !isOutFile ? isFileAffectingGlobalScope(sourceFile) || undefined : undefined,
304305
impliedFormat: sourceFile.impliedNodeFormat
305306
});

‎src/compiler/watch.ts

+1
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ namespace ts {
660660
}
661661

662662
export function getSourceFileVersionAsHashFromText(host: Pick<CompilerHost, "createHash">, text: string) {
663+
// If text can contain the sourceMapUrl ignore sourceMapUrl for calcualting hash
663664
if (text.match(sourceMapCommentRegExpDontCareLineStart)) {
664665
let lineEnd = text.length;
665666
let lineStart = lineEnd;

‎src/testRunner/unittests/tsbuild/helpers.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,15 @@ interface Symbol {
200200
type ReadableProgramBuildInfoDiagnostic = string | [string, readonly ReusableDiagnostic[]];
201201
type ReadableBuilderFileEmit = string & { __readableBuilderFileEmit: any; };
202202
type ReadableProgramBuilderInfoFilePendingEmit = [original: string | [string], emitKind: ReadableBuilderFileEmit];
203-
type ReadableProgramBuildInfoEmitSignature = string | [string, string];
203+
type ReadableProgramBuildInfoEmitSignature = string | [string, EmitSignature | []];
204204
type ReadableProgramBuildInfoFileInfo<T> = Omit<BuilderState.FileInfo, "impliedFormat"> & {
205205
impliedFormat: string | undefined;
206206
original: T | undefined;
207207
};
208208
type ReadableProgramMultiFileEmitBuildInfo = Omit<ProgramMultiFileEmitBuildInfo,
209209
"fileIdsList" | "fileInfos" |
210210
"referencedMap" | "exportedModulesMap" | "semanticDiagnosticsPerFile" |
211-
"affectedFilesPendingEmit" | "changeFileSet" | "emitSignatures" | "emitSignatureDtsMapDiffers"
211+
"affectedFilesPendingEmit" | "changeFileSet" | "emitSignatures"
212212
> & {
213213
fileNamesList: readonly (readonly string[])[] | undefined;
214214
fileInfos: MapLike<ReadableProgramBuildInfoFileInfo<ProgramMultiFileEmitBuildInfoFileInfo>>;
@@ -218,7 +218,6 @@ interface Symbol {
218218
affectedFilesPendingEmit: readonly ReadableProgramBuilderInfoFilePendingEmit[] | undefined;
219219
changeFileSet: readonly string[] | undefined;
220220
emitSignatures: readonly ReadableProgramBuildInfoEmitSignature[] | undefined;
221-
emitSignatureDtsMapDiffers: readonly string[] | undefined;
222221
};
223222
type ReadableProgramBuildInfoBundlePendingEmit = [emitKind: ReadableBuilderFileEmit, original: ProgramBuildInfoBundlePendingEmit];
224223
type ReadableProgramBundleEmitBuildInfo = Omit<ProgramBundleEmitBuildInfo, "fileInfos" | "pendingEmit"> & {
@@ -278,7 +277,6 @@ interface Symbol {
278277
toFileName(s) :
279278
[toFileName(s[0]), s[1]]
280279
),
281-
emitSignatureDtsMapDiffers: buildInfo.program.emitSignatureDtsMapDiffers?.map(toFileName),
282280
latestChangedDtsFile: buildInfo.program.latestChangedDtsFile,
283281
};
284282
}

‎tests/baselines/reference/tsc/incremental/when-declarationMap-changes-discrepancies.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,15 @@ IncrementalBuild:
9595
"emitSignatures": [
9696
[
9797
"./a.ts",
98-
"-3198459068-declare const x = 10;\r\n"
98+
[
99+
"-3198459068-declare const x = 10;\r\n"
100+
]
101+
],
102+
[
103+
"./b.ts",
104+
[]
99105
]
100106
],
101-
"emitSignatureDtsMapDiffers": [
102-
"./a.ts",
103-
"./b.ts"
104-
],
105107
"latestChangedDtsFile": "FakeFileName"
106108
},
107109
"version": "FakeTSVersion"

‎tests/baselines/reference/tsc/incremental/when-declarationMap-changes.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
129129

130130

131131
//// [/src/project/tsconfig.tsbuildinfo]
132-
{"program":{"fileNames":["../../lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <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> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"5515933561-const x: 20 = 10;","signature":"-1601647902-declare const x: 20;\r\n","affectsGlobalScope":true},{"version":"2026006654-const y = 10;","signature":"-5539113915-declare const y = 10;\r\n","affectsGlobalScope":true}],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[2,[{"file":"./a.ts","start":6,"length":1,"code":2322,"category":1,"messageText":"Type '10' is not assignable to type '20'."}]],3],"affectedFilesPendingEmit":[2,3],"emitSignatures":[[2,"-3198459068-declare const x = 10;\r\n"]],"emitSignatureDtsMapDiffers":[2,3],"latestChangedDtsFile":"./b.d.ts"},"version":"FakeTSVersion"}
132+
{"program":{"fileNames":["../../lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <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> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"5515933561-const x: 20 = 10;","signature":"-1601647902-declare const x: 20;\r\n","affectsGlobalScope":true},{"version":"2026006654-const y = 10;","signature":"-5539113915-declare const y = 10;\r\n","affectsGlobalScope":true}],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[2,[{"file":"./a.ts","start":6,"length":1,"code":2322,"category":1,"messageText":"Type '10' is not assignable to type '20'."}]],3],"affectedFilesPendingEmit":[2,3],"emitSignatures":[[2,["-3198459068-declare const x = 10;\r\n"]],[3,[]]],"latestChangedDtsFile":"./b.d.ts"},"version":"FakeTSVersion"}
133133

134134
//// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
135135
{
@@ -208,17 +208,19 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
208208
"emitSignatures": [
209209
[
210210
"./a.ts",
211-
"-3198459068-declare const x = 10;\r\n"
211+
[
212+
"-3198459068-declare const x = 10;\r\n"
213+
]
214+
],
215+
[
216+
"./b.ts",
217+
[]
212218
]
213219
],
214-
"emitSignatureDtsMapDiffers": [
215-
"./a.ts",
216-
"./b.ts"
217-
],
218220
"latestChangedDtsFile": "./b.d.ts"
219221
},
220222
"version": "FakeTSVersion",
221-
"size": 1284
223+
"size": 1258
222224
}
223225

224226

0 commit comments

Comments
 (0)