Whenver we cant use state delay signature calculation and use source …

…file version as signature
microsoft · Mar 19, 2021 · dd1cef2 · dd1cef2
1 parent 925e70e
commit dd1cef2
Show file tree

Hide file tree

Showing 196 changed files with 3,079 additions and 2,361 deletions.
diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts
@@ -45,6 +45,12 @@ namespace ts {
  * Otherwise undefined
  */
  readonly exportedModulesMap: ESMap<Path, BuilderState.ReferencedSet> | undefined;
+
+ /**
+ * true if file version is used as signature
+ * This helps in delaying the calculation of the d.ts hash as version for the file till reasonable time
+ */
+ useFileVersionAsSignature: boolean;
  /**
  * Map of files that have already called update signature.
  * That means hence forth these files are assumed to have
@@ -236,7 +242,8 @@ namespace ts {
  fileInfos,
  referencedMap,
  exportedModulesMap,
- hasCalledUpdateShapeSignature
+ hasCalledUpdateShapeSignature,
+ useFileVersionAsSignature: !useOldState
  };
  }
 
@@ -258,6 +265,7 @@ namespace ts {
  referencedMap: state.referencedMap && new Map(state.referencedMap),
  exportedModulesMap: state.exportedModulesMap && new Map(state.exportedModulesMap),
  hasCalledUpdateShapeSignature: new Set(state.hasCalledUpdateShapeSignature),
+ useFileVersionAsSignature: state.useFileVersionAsSignature,
  };
  }
 
@@ -317,7 +325,7 @@ namespace ts {
 
  const prevSignature = info.signature;
  let latestSignature: string | undefined;
- if (!sourceFile.isDeclarationFile) {
+ if (!sourceFile.isDeclarationFile && !state.useFileVersionAsSignature) {
  const emitOutput = getFileEmitOutput(
  programOfThisState,
  sourceFile,

diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts
@@ -164,12 +164,12 @@ namespace ts.tscWatch {
  });
  assert.deepEqual(state.fileInfos.get(file1.path as Path), {
  version: system.createHash(file1.content),
- signature: system.createHash(`${file1.content.replace("export ", "export declare ")}\n`),
+ signature: system.createHash(file1.content),
  affectsGlobalScope: false,
  });
  assert.deepEqual(state.fileInfos.get(file2.path as Path), {
  version: system.createHash(fileModified.content),
- signature: system.createHash("export declare const y: string;\n"),
+ signature: system.createHash(fileModified.content),
  affectsGlobalScope: false,
  });
 

diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts
@@ -951,7 +951,7 @@ function bar() {
  }
 
  // Change file1 get affected file list
- verifyLocalEdit(file1, "hello", "world");
+ verifyLocalEdit(file1, "hello", "world", /*returnsAllFilesAsAffected*/ !declaration); // Signatures are not initialized before this request
  verifyLocalEdit(file1, "world", "hello");
  verifyLocalEdit(file1, "hello", "world");
 

diff --git a/...onfigFileErrors/incremental-declaration-changes/builds-after-fixing-config-file-errors.js b/...onfigFileErrors/incremental-declaration-changes/builds-after-fixing-config-file-errors.js
@@ -34,7 +34,7 @@ exports.bar = bar;
 
 
 //// [/src/tsconfig.tsbuildinfo]
-{"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; };","signature":"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":"4646078106-export function foo() { }","signature":"-6972466928-export declare function foo(): void;\r\n","affectsGlobalScope":false},{"version":"1045484683-export function bar() { }","signature":"-1357953631-export declare function bar(): void;\r\n","affectsGlobalScope":false}],"options":{"composite":true,"declaration":true,"configFilePath":"./tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,3]},"version":"FakeTSVersion"}
+{"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; };","signature":"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":"4646078106-export function foo() { }","signature":"4646078106-export function foo() { }","affectsGlobalScope":false},{"version":"1045484683-export function bar() { }","signature":"1045484683-export function bar() { }","affectsGlobalScope":false}],"options":{"composite":true,"declaration":true,"configFilePath":"./tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,3]},"version":"FakeTSVersion"}
 
 //// [/src/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -52,12 +52,12 @@ exports.bar = bar;
  },
  "./a.ts": {
  "version": "4646078106-export function foo() { }",
- "signature": "-6972466928-export declare function foo(): void;\r\n",
+ "signature": "4646078106-export function foo() { }",
  "affectsGlobalScope": false
  },
  "./b.ts": {
  "version": "1045484683-export function bar() { }",
- "signature": "-1357953631-export declare function bar(): void;\r\n",
+ "signature": "1045484683-export function bar() { }",
  "affectsGlobalScope": false
  }
  },
@@ -75,6 +75,6 @@ exports.bar = bar;
  ]
  },
  "version": "FakeTSVersion",
- "size": 1488
+ "size": 1456
 }
 
diff --git a/...initial-build/when-building-project-uses-reference-and-both-extend-config-with-include.js b/...initial-build/when-building-project-uses-reference-and-both-extend-config-with-include.js
@@ -72,7 +72,7 @@ exports.a = 1;
 
 
 //// [/src/target-tsc-build/shared/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../../shared/index.ts","../../shared/typings-base/globals.d.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; };","signature":"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":"-22125360210-export const a: Unrestricted = 1;","signature":"-478734393-export declare const a: Unrestricted;\r\n","affectsGlobalScope":false},{"version":"4725476611-type Unrestricted = any;","signature":"4725476611-type Unrestricted = any;","affectsGlobalScope":true}],"options":{"composite":true,"outDir":"..","rootDir":"../..","listFiles":true,"configFilePath":"../../shared/tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,3]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../../shared/index.ts","../../shared/typings-base/globals.d.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; };","signature":"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":"-22125360210-export const a: Unrestricted = 1;","signature":"-22125360210-export const a: Unrestricted = 1;","affectsGlobalScope":false},{"version":"4725476611-type Unrestricted = any;","signature":"4725476611-type Unrestricted = any;","affectsGlobalScope":true}],"options":{"composite":true,"outDir":"..","rootDir":"../..","listFiles":true,"configFilePath":"../../shared/tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,3]},"version":"FakeTSVersion"}
 
 //// [/src/target-tsc-build/shared/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -90,7 +90,7 @@ exports.a = 1;
  },
  "../../shared/index.ts": {
  "version": "-22125360210-export const a: Unrestricted = 1;",
- "signature": "-478734393-export declare const a: Unrestricted;\r\n",
+ "signature": "-22125360210-export const a: Unrestricted = 1;",
  "affectsGlobalScope": false
  },
  "../../shared/typings-base/globals.d.ts": {
@@ -115,7 +115,7 @@ exports.a = 1;
  ]
  },
  "version": "FakeTSVersion",
- "size": 1573
+ "size": 1567
 }
 
 //// [/src/target-tsc-build/webpack/index.d.ts]
@@ -130,7 +130,7 @@ exports.b = 1;
 
 
 //// [/src/target-tsc-build/webpack/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../../webpack/index.ts","../../shared/typings-base/globals.d.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; };","signature":"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":"-14405273073-export const b: Unrestricted = 1;","signature":"-5074241048-export declare const b: Unrestricted;\r\n","affectsGlobalScope":false},{"version":"4725476611-type Unrestricted = any;","signature":"4725476611-type Unrestricted = any;","affectsGlobalScope":true}],"options":{"composite":true,"outDir":"..","rootDir":"../..","listFiles":true,"configFilePath":"../../webpack/tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../../webpack/index.ts","../../shared/typings-base/globals.d.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; };","signature":"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":"-14405273073-export const b: Unrestricted = 1;","signature":"-14405273073-export const b: Unrestricted = 1;","affectsGlobalScope":false},{"version":"4725476611-type Unrestricted = any;","signature":"4725476611-type Unrestricted = any;","affectsGlobalScope":true}],"options":{"composite":true,"outDir":"..","rootDir":"../..","listFiles":true,"configFilePath":"../../webpack/tsconfig.json"},"referencedMap":[],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,3,2]},"version":"FakeTSVersion"}
 
 //// [/src/target-tsc-build/webpack/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -148,7 +148,7 @@ exports.b = 1;
  },
  "../../webpack/index.ts": {
  "version": "-14405273073-export const b: Unrestricted = 1;",
- "signature": "-5074241048-export declare const b: Unrestricted;\r\n",
+ "signature": "-14405273073-export const b: Unrestricted = 1;",
  "affectsGlobalScope": false
  },
  "../../shared/typings-base/globals.d.ts": {
@@ -173,6 +173,6 @@ exports.b = 1;
  ]
  },
  "version": "FakeTSVersion",
- "size": 1576
+ "size": 1569
 }