Do not include sourceMapUrl text in the sourceFile version

 with only incremental and --out the compilerOptions need to be serialized
 only js emit enabling
 retain d.ts emit flags even if current options dont specify it?
 --out tsbuildinfo manipulation needed or not
 Verify all the new test outputs

Author: sheetalkamat

Diff for: src/compiler/sourcemap.ts

@@ -322,9 +322,10 @@ namespace ts {
     }
 
     // Sometimes tools can see the following line as a source mapping url comment, so we mangle it a bit (the [M])
-    const sourceMapCommentRegExp = /^\/\/[@#] source[M]appingURL=(.+)\r?\n?$/;
+    export const sourceMapCommentRegExpDontCareLineStart = /\/\/[@#] source[M]appingURL=(.+)\r?\n?$/;
+    export const sourceMapCommentRegExp = /^\/\/[@#] source[M]appingURL=(.+)\r?\n?$/;
 
-    const whitespaceOrMapCommentRegExp = /^\s*(\/\/[@#] .*)?$/;
+    export const whitespaceOrMapCommentRegExp = /^\s*(\/\/[@#] .*)?$/;
 
     export interface LineInfo {
         getLineCount(): number;

Diff for: src/compiler/tsbuildPublic.ts

@@ -1670,7 +1670,7 @@ namespace ts {
                     if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath!, host);
                     version = buildInfoVersionMap.get(toPath(state, inputFile));
                     const text = version ? state.readFileWithCache(inputFile) : undefined;
-                    currentVersion = text && (host.createHash || generateDjb2Hash)(text);
+                    currentVersion = text && getSourceFileVersionAsHashFromText(host, text);
                     if (version && version === currentVersion) pseudoInputUpToDate = true;
                 }
 

Diff for: src/compiler/watch.ts

@@ -659,13 +659,49 @@ namespace ts {
         }
     }
 
+    export function getSourceFileVersionAsHashFromText(host: Pick<CompilerHost, "createHash">, text: string) {
+        if (text.match(sourceMapCommentRegExpDontCareLineStart)) {
+            let lineEnd = text.length;
+            let lineStart = lineEnd;
+            for (let pos = lineEnd - 1; pos >= 0; pos--) {
+                const ch = text.charCodeAt(pos);
+                switch (ch) {
+                    case CharacterCodes.lineFeed:
+                        if (pos && text.charCodeAt(pos - 1) === CharacterCodes.carriageReturn) {
+                            pos--;
+                        }
+                    // falls through
+                    case CharacterCodes.carriageReturn:
+                        break;
+                    default:
+                        if (ch < CharacterCodes.maxAsciiCharacter || !isLineBreak(ch)) {
+                            lineStart = pos;
+                            continue;
+                        }
+                        break;
+                }
+                // This is start of the line
+                const line = text.substring(lineStart, lineEnd);
+                if (line.match(sourceMapCommentRegExp)) {
+                    text = text.substring(0, lineStart);
+                    break;
+                }
+                // If we see a non-whitespace/map comment-like line, break, to avoid scanning up the entire file
+                else if (!line.match(whitespaceOrMapCommentRegExp)){
+                    break;
+                }
+                lineEnd = lineStart;
+            }
+        }
+        return (host.createHash || generateDjb2Hash)(text);
+    }
+
     export function setGetSourceFileAsHashVersioned(compilerHost: CompilerHost, host: { createHash?(data: string): string; }) {
         const originalGetSourceFile = compilerHost.getSourceFile;
-        const computeHash = maybeBind(host, host.createHash) || generateDjb2Hash;
         compilerHost.getSourceFile = (...args) => {
             const result = originalGetSourceFile.call(compilerHost, ...args);
             if (result) {
-                result.version = computeHash(result.text);
+                result.version = getSourceFileVersionAsHashFromText(host, result.text);
             }
             return result;
         };

Diff for: tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js

@@ -369,7 +369,7 @@ c.doSomething();
 {"version":3,"file":"third_part1.js","sourceRoot":"","sources":["third_part1.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"}
 
 //// [/src/third/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","../first/first_part1.d.ts","../first/first_part2.d.ts","../first/first_part3.d.ts","../second/second_part1.d.ts","../second/second_part2.d.ts","./third_part1.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":"-17939996161-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n//# sourceMappingURL=first_PART1.d.ts.map","affectsGlobalScope":true},"-2054710634-//# sourceMappingURL=first_part2.d.ts.map",{"version":"-4577888121-declare function f(): string;\r\n//# sourceMappingURL=first_part3.d.ts.map","affectsGlobalScope":true},{"version":"-3134340341-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n//# sourceMappingURL=second_part1.d.ts.map","affectsGlobalScope":true},{"version":"6579734441-declare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second_part2.d.ts.map","affectsGlobalScope":true},{"version":"10470273651-var c = new C();\r\nc.doSomething();\r\n","signature":"2394638288-declare var c: C;\r\n","affectsGlobalScope":true}],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"latestChangedDtsFile":"./third_part1.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","../first/first_part1.d.ts","../first/first_part2.d.ts","../first/first_part3.d.ts","../second/second_part1.d.ts","../second/second_part2.d.ts","./third_part1.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":"-12382020913-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n","affectsGlobalScope":true},"-2054710634-//# sourceMappingURL=first_part2.d.ts.map",{"version":"-5732730923-declare function f(): string;\r\n","affectsGlobalScope":true},{"version":"-4200194009-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n","affectsGlobalScope":true},{"version":"1950347108-declare class C {\r\n    doSomething(): void;\r\n}\r\n","affectsGlobalScope":true},{"version":"10470273651-var c = new C();\r\nc.doSomething();\r\n","signature":"2394638288-declare var c: C;\r\n","affectsGlobalScope":true}],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"latestChangedDtsFile":"./third_part1.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/third/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -390,27 +390,27 @@ c.doSomething();
         "affectsGlobalScope": true
       },
       "../first/first_part1.d.ts": {
-        "version": "-17939996161-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n//# sourceMappingURL=first_PART1.d.ts.map",
-        "signature": "-17939996161-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n//# sourceMappingURL=first_PART1.d.ts.map",
+        "version": "-12382020913-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n",
+        "signature": "-12382020913-interface TheFirst {\r\n    none: any;\r\n}\r\ndeclare const s = \"Hello, world\";\r\ninterface NoJsForHereEither {\r\n    none: any;\r\n}\r\n",
         "affectsGlobalScope": true
       },
       "../first/first_part2.d.ts": {
         "version": "-2054710634-//# sourceMappingURL=first_part2.d.ts.map",
         "signature": "-2054710634-//# sourceMappingURL=first_part2.d.ts.map"
       },
       "../first/first_part3.d.ts": {
-        "version": "-4577888121-declare function f(): string;\r\n//# sourceMappingURL=first_part3.d.ts.map",
-        "signature": "-4577888121-declare function f(): string;\r\n//# sourceMappingURL=first_part3.d.ts.map",
+        "version": "-5732730923-declare function f(): string;\r\n",
+        "signature": "-5732730923-declare function f(): string;\r\n",
         "affectsGlobalScope": true
       },
       "../second/second_part1.d.ts": {
-        "version": "-3134340341-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n//# sourceMappingURL=second_part1.d.ts.map",
-        "signature": "-3134340341-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n//# sourceMappingURL=second_part1.d.ts.map",
+        "version": "-4200194009-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n",
+        "signature": "-4200194009-declare namespace N {\r\n}\r\ndeclare namespace N {\r\n}\r\n",
         "affectsGlobalScope": true
       },
       "../second/second_part2.d.ts": {
-        "version": "6579734441-declare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second_part2.d.ts.map",
-        "signature": "6579734441-declare class C {\r\n    doSomething(): void;\r\n}\r\n//# sourceMappingURL=second_part2.d.ts.map",
+        "version": "1950347108-declare class C {\r\n    doSomething(): void;\r\n}\r\n",
+        "signature": "1950347108-declare class C {\r\n    doSomething(): void;\r\n}\r\n",
         "affectsGlobalScope": true
       },
       "./third_part1.ts": {
@@ -442,6 +442,6 @@ c.doSomething();
     "latestChangedDtsFile": "./third_part1.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1855
+  "size": 1689
 }