Merge pull request #140 from h-joo/delete-empty-diff-files

Update baselines + Logic change in reference checking

Author: dragomirtitian

src/harness/harnessIO.ts

@@ -1063,7 +1063,12 @@ export namespace Compiler {
         tsSources: readonly TestFile[],
         prettyErrors: boolean | undefined,
         reason: string | undefined,
+        expectNull?: boolean,
     ) {
+        if (expectNull) {
+          // eslint-disable-next-line no-null/no-null
+          return Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts.diff`), /*actual*/ null);
+        }
         const Diff = require("diff");
         const dteContent = declarationContent(dteDeclarationFiles, tsSources, dteDiagnostics, prettyErrors);
         const tscContent = declarationContent(tscDeclarationFiles, tsSources, tscDiagnostics, prettyErrors);
@@ -1122,17 +1127,21 @@ export namespace Compiler {
         errors: readonly ts.Diagnostic[],
         tsSources: readonly TestFile[],
         prettyErrors?: boolean,
+        expectNull?: boolean,
     ) {
-        let code = "";
-        code += "//// [" + header + "] ////\r\n\r\n";
+        if (expectNull) {
+          // eslint-disable-next-line no-null/no-null
+          return Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts`), /*actual*/ null);
+        }
+
+        let code = "//// [" + header + "] ////\r\n\r\n";
 
         code += sourceContent(tsSources);
 
         code += "\r\n\r\n/// [Declarations] ////\r\n\r\n";
         code += declarationContent(declarationFiles, tsSources, errors, prettyErrors);
 
-        // eslint-disable-next-line no-null/no-null
-        Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts`), code.length > 0 ? code : null);
+        Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts`), code);
     }
 
     export function doDeclarationMapBaseline(
@@ -1143,8 +1152,7 @@ export namespace Compiler {
         declarationMapFiles: readonly TestFile[],
         tsSources: readonly TestFile[],
     ) {
-        let code = "";
-        code += "//// [" + header + "] ////\r\n\r\n";
+        let code = "//// [" + header + "] ////\r\n\r\n";
 
         code += sourceContent(tsSources);
 
@@ -1153,8 +1161,7 @@ export namespace Compiler {
         code += "\r\n\r\n/// [Declarations Maps] ////\r\n\r\n";
         code += declarationSourceMapContent(declarationFiles, declarationMapFiles, tsSources);
 
-        // eslint-disable-next-line no-null/no-null
-        Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts.map`), code.length > 0 ? code : null);
+        Baseline.runBaseline(type + "/" + baselinePath.replace(/\.tsx?/, `.d.ts.map`), code);
     }
 
     export function doJsEmitBaseline(baselinePath: string, header: string, options: ts.CompilerOptions, result: compiler.CompilationResult, tsConfigFiles: readonly TestFile[], toBeCompiled: readonly TestFile[], otherFiles: readonly TestFile[], harnessSettings: TestCaseParser.CompilerSettings) {

src/testRunner/compilerRunner.ts

@@ -615,7 +615,6 @@ class IsolatedDeclarationTest extends CompilerTestBase {
         return this.harnessSettings.isolatedDeclarationDiffReason;
     }
     verifyDteOutput() {
-        if (this.isOutputEquivalent && this.isDiagnosticEquivalent) return;
         Compiler.doDeclarationBaseline(
             this.configuredName,
             this.baselinePath + "/dte",
@@ -624,10 +623,10 @@ class IsolatedDeclarationTest extends CompilerTestBase {
             ts.concatenate(this.dteDiagnostics, this.tscNonIsolatedDeclarationsErrors),
             this.allFiles,
             this.options.pretty,
+            this.isOutputEquivalent && this.isDiagnosticEquivalent,
         );
     }
     verifyTscOutput() {
-        if (this.isOutputEquivalent && this.isDiagnosticEquivalent) return;
         Compiler.doDeclarationBaseline(
             this.configuredName,
             this.baselinePath + "/tsc",
@@ -636,6 +635,7 @@ class IsolatedDeclarationTest extends CompilerTestBase {
             ts.concatenate(this.tscIsolatedDeclarationsErrors, this.tscNonIsolatedDeclarationsErrors),
             this.allFiles,
             this.options.pretty,
+            this.isOutputEquivalent && this.isDiagnosticEquivalent,
         );
     }
     verifyDteMapOutput() {
@@ -672,9 +672,6 @@ class IsolatedDeclarationTest extends CompilerTestBase {
         }
     }
     verifyDiff() {
-        if (this.isOutputEquivalent && this.isDiagnosticEquivalent) {
-            return;
-        }
         Compiler.doDeclarationDiffBaseline(
             this.configuredName,
             this.baselinePath + "/diff",
@@ -686,6 +683,7 @@ class IsolatedDeclarationTest extends CompilerTestBase {
             this.allFiles,
             this.options.pretty,
             this.diffReason,
+            this.isOutputEquivalent && this.isDiagnosticEquivalent
         );
     }
 

tests/baselines/reference/declFileTypeofFunction.js

@@ -70,6 +70,6 @@ declare function b1(): typeof b1;
 declare function foo(): typeof foo;
 declare var foo1: typeof foo;
 declare var foo2: typeof foo;
-declare var foo3: () => any;
-declare var x: () => any;
+declare var foo3: () => () => any;
+declare var x: () => () => any;
 declare function foo5(x: number): (x: number) => number;

tests/baselines/reference/functionExpressionReturningItself.js

@@ -8,4 +8,4 @@ var x = function somefn() { return somefn; };
 
 
 //// [functionExpressionReturningItself.d.ts]
-declare var x: () => any;
+declare var x: () => () => any;

tests/baselines/reference/parseImportAttributesError.js

@@ -47,5 +47,5 @@ ImportInterface;
 
 //// [index.d.ts]
 export type LocalInterface = import("pkg", { with: {} });
-export declare const a: any;
-export declare const b: any;
+export declare const a: import("pkg", { with: {} });
+export declare const b: import("pkg", { with: {} });

tests/baselines/reference/tsc/incremental/change-to-modifier-of-class-expression-field-with-declaration-emit-enabled.js

@@ -188,10 +188,10 @@ Output::
 3     console.log( person.message );
                           ~~~~~~~
 
-[96msrc/project/MessageablePerson.ts[0m:[93m6[0m:[93m7[0m - [91merror[0m[90m TS4094: [0mProperty 'message' of exported class expression may not be private or protected.
+[96msrc/project/MessageablePerson.ts[0m:[93m6[0m:[93m17[0m - [91merror[0m[90m TS4094: [0mProperty 'message' of exported class expression may not be private or protected.
 
 6 const wrapper = () => Messageable();
-[7m [0m [91m      ~~~~~~~[0m
+[7m [0m [91m                ~~~~~~~~~~~~~~~~~~~[0m
 
 
 Found 2 errors in 2 files.
@@ -206,7 +206,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 //// [/src/project/main.js] file written with same contents
 //// [/src/project/MessageablePerson.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <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; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-21450256696-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2],"emitDiagnosticsPerFile":[[2,[{"file":"./messageableperson.ts","start":116,"length":7,"messageText":"Property 'message' of exported class expression may not be private or protected.","category":1,"code":4094}]]]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./messageableperson.ts","./main.ts"],"fileInfos":[{"version":"5700251342-/// <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; };type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;\ntype InstanceType<T extends abstract new (...args: any) => any> = T extends abstract new (...args: any) => infer R ? R : any;","affectsGlobalScope":true},{"version":"3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;","signature":"-36832008228-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(126,19)Error4094: Property 'message' of exported class expression may not be private or protected."},{"version":"4191603667-import MessageablePerson from './MessageablePerson.js';\nfunction logMessage( person: MessageablePerson ) {\n    console.log( person.message );\n}","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"declaration":true},"fileIdsList":[[2]],"referencedMap":[[3,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,[3,[{"file":"./main.ts","start":131,"length":7,"messageText":"Property 'message' is protected and only accessible within class 'MessageableClass' and its subclasses.","category":1,"code":2445}]],2],"emitDiagnosticsPerFile":[[2,[{"file":"./messageableperson.ts","start":126,"length":19,"messageText":"Property 'message' of exported class expression may not be private or protected.","category":1,"code":4094}]]]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -234,10 +234,10 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
       "./messageableperson.ts": {
         "original": {
           "version": "3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-          "signature": "-21450256696-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
+          "signature": "-36832008228-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(126,19)Error4094: Property 'message' of exported class expression may not be private or protected."
         },
         "version": "3462418372-const Messageable = () => {\n    return class MessageableClass {\n        protected message = 'hello';\n    }\n};\nconst wrapper = () => Messageable();\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;",
-        "signature": "-21450256696-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(116,7)Error4094: Property 'message' of exported class expression may not be private or protected."
+        "signature": "-36832008228-declare const wrapper: () => {\n    new (): {\n        message: string;\n    };\n};\ntype MessageablePerson = InstanceType<ReturnType<typeof wrapper>>;\nexport default MessageablePerson;\n(126,19)Error4094: Property 'message' of exported class expression may not be private or protected."
       },
       "./main.ts": {
         "original": {
@@ -290,8 +290,8 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
         [
           {
             "file": "./messageableperson.ts",
-            "start": 116,
-            "length": 7,
+            "start": 126,
+            "length": 19,
             "messageText": "Property 'message' of exported class expression may not be private or protected.",
             "category": 1,
             "code": 4094
@@ -301,7 +301,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
     ]
   },
   "version": "FakeTSVersion",
-  "size": 2187
+  "size": 2189
 }
 
 
@@ -317,10 +317,10 @@ Output::
 3     console.log( person.message );
                           ~~~~~~~
 
-[96msrc/project/MessageablePerson.ts[0m:[93m6[0m:[93m7[0m - [91merror[0m[90m TS4094: [0mProperty 'message' of exported class expression may not be private or protected.
+[96msrc/project/MessageablePerson.ts[0m:[93m6[0m:[93m17[0m - [91merror[0m[90m TS4094: [0mProperty 'message' of exported class expression may not be private or protected.
 
 6 const wrapper = () => Messageable();
-[7m [0m [91m      ~~~~~~~[0m
+[7m [0m [91m                ~~~~~~~~~~~~~~~~~~~[0m
 
 
 Found 2 errors in 2 files.