tstyche 3.2.0 → 3.3.0

package/build/tstyche.d.ts

@@ -61,7 +61,7 @@ declare class Diagnostic {
     }): this;
     static error(text: string | Array<string>, origin?: DiagnosticOrigin): Diagnostic;
     extendWith(text: string | Array<string>, origin?: DiagnosticOrigin): Diagnostic;
-    static fromDiagnostics(diagnostics: Array<ts.Diagnostic>, compiler: typeof ts): Array<Diagnostic>;
+    static fromDiagnostics(diagnostics: Array<ts.Diagnostic>): Array<Diagnostic>;
     static warning(text: string | Array<string>, origin?: DiagnosticOrigin): Diagnostic;
 }
 

package/build/tstyche.js

@@ -75,6 +75,12 @@ class ConfigDiagnosticText {
     }
 }
 
+var DiagnosticCategory;
+(function (DiagnosticCategory) {
+    DiagnosticCategory["Error"] = "error";
+    DiagnosticCategory["Warning"] = "warning";
+})(DiagnosticCategory || (DiagnosticCategory = {}));
+
 class DiagnosticOrigin {
     assertion;
     end;
@@ -116,40 +122,42 @@ class Diagnostic {
         return this;
     }
     static error(text, origin) {
-        return new Diagnostic(text, "error", origin);
+        return new Diagnostic(text, DiagnosticCategory.Error, origin);
     }
     extendWith(text, origin) {
         return new Diagnostic([this.text, text].flat(), this.category, origin ?? this.origin);
     }
-    static fromDiagnostics(diagnostics, compiler) {
+    static fromDiagnostics(diagnostics) {
         return diagnostics.map((diagnostic) => {
             const code = `ts(${diagnostic.code})`;
             let origin;
-            if (Diagnostic.#isTsDiagnosticWithLocation(diagnostic)) {
+            if (diagnostic.file != null && diagnostic.start != null && diagnostic.length != null) {
                 origin = new DiagnosticOrigin(diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file);
             }
             let related;
             if (diagnostic.relatedInformation != null) {
-                related = Diagnostic.fromDiagnostics(diagnostic.relatedInformation, compiler);
+                related = Diagnostic.fromDiagnostics(diagnostic.relatedInformation);
             }
-            const text = compiler.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
-            return new Diagnostic(text, "error", origin).add({ code, related });
+            const text = typeof diagnostic.messageText === "string"
+                ? diagnostic.messageText
+                : Diagnostic.#toMessageText(diagnostic.messageText);
+            return new Diagnostic(text, DiagnosticCategory.Error, origin).add({ code, related });
         });
     }
-    static #isTsDiagnosticWithLocation(diagnostic) {
-        return diagnostic.file != null && diagnostic.start != null && diagnostic.length != null;
+    static #toMessageText(chain) {
+        const result = [chain.messageText];
+        if (chain.next != null) {
+            for (const nextChain of chain.next) {
+                result.push(...Diagnostic.#toMessageText(nextChain));
+            }
+        }
+        return result;
     }
     static warning(text, origin) {
-        return new Diagnostic(text, "warning", origin);
+        return new Diagnostic(text, DiagnosticCategory.Warning, origin);
     }
 }
 
-var DiagnosticCategory;
-(function (DiagnosticCategory) {
-    DiagnosticCategory["Error"] = "error";
-    DiagnosticCategory["Warning"] = "warning";
-})(DiagnosticCategory || (DiagnosticCategory = {}));
-
 class SourceFile {
     fileName;
     #lineMap;
@@ -255,6 +263,22 @@ class Path {
     }
 }
 
+var OptionBrand;
+(function (OptionBrand) {
+    OptionBrand["String"] = "string";
+    OptionBrand["Number"] = "number";
+    OptionBrand["Boolean"] = "boolean";
+    OptionBrand["BareTrue"] = "bareTrue";
+    OptionBrand["List"] = "list";
+})(OptionBrand || (OptionBrand = {}));
+
+var OptionGroup;
+(function (OptionGroup) {
+    OptionGroup[OptionGroup["CommandLine"] = 2] = "CommandLine";
+    OptionGroup[OptionGroup["ConfigFile"] = 4] = "ConfigFile";
+    OptionGroup[OptionGroup["ResolvedConfig"] = 6] = "ResolvedConfig";
+})(OptionGroup || (OptionGroup = {}));
+
 class Environment {
     static resolve() {
         return {
@@ -864,157 +888,157 @@ class Target {
 class Options {
     static #definitions = [
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "The Url to the config file validation schema.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             name: "$schema",
         },
         {
-            brand: "boolean",
+            brand: OptionBrand.Boolean,
             description: "Enable type error reporting for source files.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             name: "checkSourceFiles",
         },
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "The path to a TSTyche configuration file.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "config",
         },
         {
-            brand: "boolean",
+            brand: OptionBrand.Boolean,
             description: "Stop running tests after the first failed assertion.",
-            group: 4 | 2,
+            group: OptionGroup.ConfigFile | OptionGroup.CommandLine,
             name: "failFast",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Print the list of command line options with brief descriptions and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "help",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Install specified versions of the 'typescript' package and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "install",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Print the list of supported versions of the 'typescript' package and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "list",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Print the list of the selected test files and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "listFiles",
         },
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "Only run tests with matching name.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "only",
         },
         {
-            brand: "list",
+            brand: OptionBrand.List,
             description: "The list of plugins to use.",
-            group: 2 | 4,
+            group: OptionGroup.CommandLine | OptionGroup.ConfigFile,
             items: {
-                brand: "string",
+                brand: OptionBrand.String,
                 name: "plugins",
             },
             name: "plugins",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Remove all installed versions of the 'typescript' package and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "prune",
         },
         {
-            brand: "boolean",
+            brand: OptionBrand.Boolean,
             description: "Reject the 'any' type passed as an argument to the 'expect()' function or a matcher.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             name: "rejectAnyType",
         },
         {
-            brand: "boolean",
+            brand: OptionBrand.Boolean,
             description: "Reject the 'never' type passed as an argument to the 'expect()' function or a matcher.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             name: "rejectNeverType",
         },
         {
-            brand: "list",
+            brand: OptionBrand.List,
             description: "The list of reporters to use.",
-            group: 2 | 4,
+            group: OptionGroup.CommandLine | OptionGroup.ConfigFile,
             items: {
-                brand: "string",
+                brand: OptionBrand.String,
                 name: "reporters",
             },
             name: "reporters",
         },
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "The path to a directory containing files of a test project.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             name: "rootPath",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Print the resolved configuration and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "showConfig",
         },
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "Skip tests with matching name.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "skip",
         },
         {
-            brand: "list",
+            brand: OptionBrand.List,
             description: "The list of TypeScript versions to be tested on.",
-            group: 2 | 4,
+            group: OptionGroup.CommandLine | OptionGroup.ConfigFile,
             items: {
-                brand: "string",
+                brand: OptionBrand.String,
                 name: "target",
             },
             name: "target",
         },
         {
-            brand: "list",
+            brand: OptionBrand.List,
             description: "The list of glob patterns matching the test files.",
-            group: 4,
+            group: OptionGroup.ConfigFile,
             items: {
-                brand: "string",
+                brand: OptionBrand.String,
                 name: "testFileMatch",
             },
             name: "testFileMatch",
         },
         {
-            brand: "string",
+            brand: OptionBrand.String,
             description: "The look up strategy to be used to find the TSConfig file.",
-            group: 2 | 4,
+            group: OptionGroup.CommandLine | OptionGroup.ConfigFile,
             name: "tsconfig",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Fetch the 'typescript' package metadata from the registry and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "update",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Print the version number and exit.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "version",
         },
         {
-            brand: "bareTrue",
+            brand: OptionBrand.BareTrue,
             description: "Watch for changes and rerun related test files.",
-            group: 2,
+            group: OptionGroup.CommandLine,
             name: "watch",
         },
     ];
@@ -1131,7 +1155,7 @@ class CommandLineParser {
         this.#commandLineOptions = commandLine;
         this.#pathMatch = pathMatch;
         this.#onDiagnostics = onDiagnostics;
-        this.#options = Options.for(2);
+        this.#options = Options.for(OptionGroup.CommandLine);
     }
     async #onExpectsValue(optionName, optionBrand) {
         const text = [
@@ -1166,18 +1190,18 @@ class CommandLineParser {
     async #parseOptionValue(commandLineArgs, index, optionName, optionDefinition) {
         let optionValue = this.#resolveOptionValue(commandLineArgs[index]);
         switch (optionDefinition.brand) {
-            case "bareTrue":
+            case OptionBrand.BareTrue:
                 await Options.validate(optionName, optionValue, optionDefinition.brand, this.#onDiagnostics);
                 this.#commandLineOptions[optionDefinition.name] = true;
                 break;
-            case "boolean":
+            case OptionBrand.Boolean:
                 await Options.validate(optionName, optionValue, optionDefinition.brand, this.#onDiagnostics);
                 this.#commandLineOptions[optionDefinition.name] = optionValue !== "false";
                 if (optionValue === "false" || optionValue === "true") {
                     index++;
                 }
                 break;
-            case "list":
+            case OptionBrand.List:
                 if (optionValue !== "") {
                     const optionValues = optionValue
                         .split(",")
@@ -1193,7 +1217,7 @@ class CommandLineParser {
                 }
                 await this.#onExpectsValue(optionName, optionDefinition.brand);
                 break;
-            case "string":
+            case OptionBrand.String:
                 if (optionValue !== "") {
                     optionValue = Options.resolve(optionName, optionValue);
                     await Options.validate(optionName, optionValue, optionDefinition.brand, this.#onDiagnostics);
@@ -1349,7 +1373,7 @@ class ConfigFileParser {
         this.#configFileOptions = configFileOptions;
         this.#sourceFile = sourceFile;
         this.#onDiagnostics = onDiagnostics;
-        this.#options = Options.for(4);
+        this.#options = Options.for(OptionGroup.ConfigFile);
         this.#jsonScanner = new JsonScanner(this.#sourceFile);
     }
     #onRequiresValue(optionDefinition, jsonNode, isListItem) {
@@ -1362,7 +1386,7 @@ class ConfigFileParser {
         let jsonNode;
         let optionValue;
         switch (optionDefinition.brand) {
-            case "boolean": {
+            case OptionBrand.Boolean: {
                 jsonNode = this.#jsonScanner.read();
                 optionValue = jsonNode.getValue();
                 if (typeof optionValue !== "boolean") {
@@ -1371,7 +1395,7 @@ class ConfigFileParser {
                 }
                 break;
             }
-            case "string": {
+            case OptionBrand.String: {
                 jsonNode = this.#jsonScanner.read();
                 optionValue = jsonNode.getValue();
                 if (typeof optionValue !== "string") {
@@ -1383,7 +1407,7 @@ class ConfigFileParser {
                 await Options.validate(optionDefinition.name, optionValue, optionDefinition.brand, this.#onDiagnostics, jsonNode.origin);
                 break;
             }
-            case "list": {
+            case OptionBrand.List: {
                 optionValue = [];
                 const leftBracketToken = this.#jsonScanner.readToken("[");
                 if (!leftBracketToken.text) {
@@ -1542,22 +1566,6 @@ class Config {
     }
 }
 
-var OptionBrand;
-(function (OptionBrand) {
-    OptionBrand["String"] = "string";
-    OptionBrand["Number"] = "number";
-    OptionBrand["Boolean"] = "boolean";
-    OptionBrand["BareTrue"] = "bareTrue";
-    OptionBrand["List"] = "list";
-})(OptionBrand || (OptionBrand = {}));
-
-var OptionGroup;
-(function (OptionGroup) {
-    OptionGroup[OptionGroup["CommandLine"] = 2] = "CommandLine";
-    OptionGroup[OptionGroup["ConfigFile"] = 4] = "ConfigFile";
-    OptionGroup[OptionGroup["ResolvedConfig"] = 6] = "ResolvedConfig";
-})(OptionGroup || (OptionGroup = {}));
-
 class CancellationHandler {
     #cancellationToken;
     #cancellationReason;
@@ -1567,7 +1575,7 @@ class CancellationHandler {
     }
     on([, payload]) {
         if ("diagnostics" in payload) {
-            if (payload.diagnostics.some((diagnostic) => diagnostic.category === "error")) {
+            if (payload.diagnostics.some((diagnostic) => diagnostic.category === DiagnosticCategory.Error)) {
                 this.#cancellationToken.cancel(this.#cancellationReason);
             }
         }
@@ -1581,7 +1589,7 @@ class ExitCodeHandler {
             return;
         }
         if ("diagnostics" in payload) {
-            if (payload.diagnostics.some((diagnostic) => diagnostic.category === "error")) {
+            if (payload.diagnostics.some((diagnostic) => diagnostic.category === DiagnosticCategory.Error)) {
                 this.#setCode(1);
             }
         }
@@ -1613,11 +1621,20 @@ class DescribeResult {
     }
 }
 
+var ResultStatus;
+(function (ResultStatus) {
+    ResultStatus["Runs"] = "runs";
+    ResultStatus["Passed"] = "passed";
+    ResultStatus["Failed"] = "failed";
+    ResultStatus["Skipped"] = "skipped";
+    ResultStatus["Todo"] = "todo";
+})(ResultStatus || (ResultStatus = {}));
+
 class ExpectResult {
     assertion;
     diagnostics = [];
     parent;
-    status = "runs";
+    status = ResultStatus.Runs;
     timing = new ResultTiming();
     constructor(assertion, parent) {
         this.assertion = assertion;
@@ -1661,18 +1678,9 @@ class Result {
     }
 }
 
-var ResultStatus;
-(function (ResultStatus) {
-    ResultStatus["Runs"] = "runs";
-    ResultStatus["Passed"] = "passed";
-    ResultStatus["Failed"] = "failed";
-    ResultStatus["Skipped"] = "skipped";
-    ResultStatus["Todo"] = "todo";
-})(ResultStatus || (ResultStatus = {}));
-
 class TargetResult {
     results = new Map();
-    status = "runs";
+    status = ResultStatus.Runs;
     target;
     tasks;
     timing = new ResultTiming();
@@ -1686,7 +1694,7 @@ class TaskResult {
     diagnostics = [];
     expectCount = new ResultCount();
     results = [];
-    status = "runs";
+    status = ResultStatus.Runs;
     task;
     testCount = new ResultCount();
     timing = new ResultTiming();
@@ -1700,7 +1708,7 @@ class TestResult {
     expectCount = new ResultCount();
     parent;
     results = [];
-    status = "runs";
+    status = ResultStatus.Runs;
     test;
     timing = new ResultTiming();
     constructor(test, parent) {
@@ -1733,19 +1741,19 @@ class ResultHandler {
                 this.#targetResult.timing.start = Date.now();
                 break;
             case "target:end":
-                if (this.#targetResult.status === "failed") {
+                if (this.#targetResult.status === ResultStatus.Failed) {
                     this.#result.targetCount.failed++;
                 }
                 else {
                     this.#result.targetCount.passed++;
-                    this.#targetResult.status = "passed";
+                    this.#targetResult.status = ResultStatus.Passed;
                 }
                 this.#targetResult.timing.end = Date.now();
                 this.#targetResult = undefined;
                 break;
             case "store:error":
-                if (payload.diagnostics.some(({ category }) => category === "error")) {
-                    this.#targetResult.status = "failed";
+                if (payload.diagnostics.some(({ category }) => category === DiagnosticCategory.Error)) {
+                    this.#targetResult.status = ResultStatus.Failed;
                 }
                 break;
             case "project:uses": {
@@ -1758,7 +1766,7 @@ class ResultHandler {
                 break;
             }
             case "project:error":
-                this.#targetResult.status = "failed";
+                this.#targetResult.status = ResultStatus.Failed;
                 this.#projectResult.diagnostics.push(...payload.diagnostics);
                 break;
             case "task:start":
@@ -1767,21 +1775,21 @@ class ResultHandler {
                 this.#taskResult.timing.start = Date.now();
                 break;
             case "task:error":
-                this.#targetResult.status = "failed";
-                this.#taskResult.status = "failed";
+                this.#targetResult.status = ResultStatus.Failed;
+                this.#taskResult.status = ResultStatus.Failed;
                 this.#taskResult.diagnostics.push(...payload.diagnostics);
                 break;
             case "task:end":
-                if (this.#taskResult.status === "failed" ||
+                if (this.#taskResult.status === ResultStatus.Failed ||
                     this.#taskResult.expectCount.failed > 0 ||
                     this.#taskResult.testCount.failed > 0) {
                     this.#result.fileCount.failed++;
-                    this.#targetResult.status = "failed";
-                    this.#taskResult.status = "failed";
+                    this.#targetResult.status = ResultStatus.Failed;
+                    this.#taskResult.status = ResultStatus.Failed;
                 }
                 else {
                     this.#result.fileCount.passed++;
-                    this.#taskResult.status = "passed";
+                    this.#taskResult.status = ResultStatus.Passed;
                 }
                 this.#taskResult.timing.end = Date.now();
                 this.#taskResult = undefined;
@@ -1813,7 +1821,7 @@ class ResultHandler {
             case "test:error":
                 this.#result.testCount.failed++;
                 this.#taskResult.testCount.failed++;
-                this.#testResult.status = "failed";
+                this.#testResult.status = ResultStatus.Failed;
                 this.#testResult.diagnostics.push(...payload.diagnostics);
                 this.#testResult.timing.end = Date.now();
                 this.#testResult = undefined;
@@ -1821,28 +1829,28 @@ class ResultHandler {
             case "test:fail":
                 this.#result.testCount.failed++;
                 this.#taskResult.testCount.failed++;
-                this.#testResult.status = "failed";
+                this.#testResult.status = ResultStatus.Failed;
                 this.#testResult.timing.end = Date.now();
                 this.#testResult = undefined;
                 break;
             case "test:pass":
                 this.#result.testCount.passed++;
                 this.#taskResult.testCount.passed++;
-                this.#testResult.status = "passed";
+                this.#testResult.status = ResultStatus.Passed;
                 this.#testResult.timing.end = Date.now();
                 this.#testResult = undefined;
                 break;
             case "test:skip":
                 this.#result.testCount.skipped++;
                 this.#taskResult.testCount.skipped++;
-                this.#testResult.status = "skipped";
+                this.#testResult.status = ResultStatus.Skipped;
                 this.#testResult.timing.end = Date.now();
                 this.#testResult = undefined;
                 break;
             case "test:todo":
                 this.#result.testCount.todo++;
                 this.#taskResult.testCount.todo++;
-                this.#testResult.status = "todo";
+                this.#testResult.status = ResultStatus.Todo;
                 this.#testResult.timing.end = Date.now();
                 this.#testResult = undefined;
                 break;
@@ -1862,7 +1870,7 @@ class ResultHandler {
                 if (this.#testResult) {
                     this.#testResult.expectCount.failed++;
                 }
-                this.#expectResult.status = "failed";
+                this.#expectResult.status = ResultStatus.Failed;
                 this.#expectResult.diagnostics.push(...payload.diagnostics);
                 this.#expectResult.timing.end = Date.now();
                 this.#expectResult = undefined;
@@ -1873,7 +1881,7 @@ class ResultHandler {
                 if (this.#testResult) {
                     this.#testResult.expectCount.failed++;
                 }
-                this.#expectResult.status = "failed";
+                this.#expectResult.status = ResultStatus.Failed;
                 this.#expectResult.timing.end = Date.now();
                 this.#expectResult = undefined;
                 break;
@@ -1883,7 +1891,7 @@ class ResultHandler {
                 if (this.#testResult) {
                     this.#testResult.expectCount.passed++;
                 }
-                this.#expectResult.status = "passed";
+                this.#expectResult.status = ResultStatus.Passed;
                 this.#expectResult.timing.end = Date.now();
                 this.#expectResult = undefined;
                 break;
@@ -1893,7 +1901,7 @@ class ResultHandler {
                 if (this.#testResult) {
                     this.#testResult.expectCount.skipped++;
                 }
-                this.#expectResult.status = "skipped";
+                this.#expectResult.status = ResultStatus.Skipped;
                 this.#expectResult.timing.end = Date.now();
                 this.#expectResult = undefined;
                 break;
@@ -1922,7 +1930,7 @@ function Text({ children, color, indent }) {
     if (color != null) {
         ansiEscapes.push(color);
     }
-    return (jsx("text", { indent: indent ?? 0, children: [ansiEscapes.length > 0 ? jsx("ansi", { escapes: ansiEscapes }) : undefined, children, ansiEscapes.length > 0 ? jsx("ansi", { escapes: "0" }) : undefined] }));
+    return (jsx("text", { indent: indent ?? 0, children: [ansiEscapes.length > 0 ? jsx("ansi", { escapes: ansiEscapes }) : undefined, children, ansiEscapes.length > 0 ? jsx("ansi", { escapes: Color.Reset }) : undefined] }));
 }
 
 function Line({ children, color, indent }) {
@@ -1983,7 +1991,7 @@ class Scribbler {
 }
 
 function addsPackageText(packageVersion, packagePath) {
-    return (jsx(Line, { children: [jsx(Text, { color: "90", children: "adds" }), " TypeScript ", packageVersion, jsx(Text, { color: "90", children: [" to ", packagePath] })] }));
+    return (jsx(Line, { children: [jsx(Text, { color: Color.Gray, children: "adds" }), " TypeScript ", packageVersion, jsx(Text, { color: Color.Gray, children: [" to ", packagePath] })] }));
 }
 
 function describeNameText(name, indent = 0) {
@@ -1997,13 +2005,13 @@ function BreadcrumbsText({ ancestor }) {
         ancestor = ancestor.parent;
     }
     text.push("");
-    return jsx(Text, { color: "90", children: text.reverse().join(" ❭ ") });
+    return jsx(Text, { color: Color.Gray, children: text.reverse().join(" ❭ ") });
 }
-function CodeLineText({ gutterWidth, lineNumber, lineNumberColor = "90", lineText }) {
-    return (jsx(Line, { children: [jsx(Text, { color: lineNumberColor, children: lineNumber.toString().padStart(gutterWidth) }), jsx(Text, { color: "90", children: " | " }), lineText] }));
+function CodeLineText({ gutterWidth, lineNumber, lineNumberColor = Color.Gray, lineText }) {
+    return (jsx(Line, { children: [jsx(Text, { color: lineNumberColor, children: lineNumber.toString().padStart(gutterWidth) }), jsx(Text, { color: Color.Gray, children: " | " }), lineText] }));
 }
 function SquiggleLineText({ gutterWidth, indentWidth = 0, squiggleColor, squiggleWidth }) {
-    return (jsx(Line, { children: [" ".repeat(gutterWidth), jsx(Text, { color: "90", children: " | " }), " ".repeat(indentWidth), jsx(Text, { color: squiggleColor, children: "~".repeat(squiggleWidth === 0 ? 1 : squiggleWidth) })] }));
+    return (jsx(Line, { children: [" ".repeat(gutterWidth), jsx(Text, { color: Color.Gray, children: " | " }), " ".repeat(indentWidth), jsx(Text, { color: squiggleColor, children: "~".repeat(squiggleWidth === 0 ? 1 : squiggleWidth) })] }));
 }
 function CodeSpanText({ diagnosticCategory, diagnosticOrigin }) {
     const lineMap = diagnosticOrigin.sourceFile.getLineStarts();
@@ -2014,11 +2022,11 @@ function CodeSpanText({ diagnosticCategory, diagnosticOrigin }) {
     const gutterWidth = (lastLine + 1).toString().length + 2;
     let highlightColor;
     switch (diagnosticCategory) {
-        case "error":
-            highlightColor = "31";
+        case DiagnosticCategory.Error:
+            highlightColor = Color.Red;
             break;
-        case "warning":
-            highlightColor = "33";
+        case DiagnosticCategory.Warning:
+            highlightColor = Color.Yellow;
             break;
     }
     const codeSpan = [];
@@ -2045,14 +2053,14 @@ function CodeSpanText({ diagnosticCategory, diagnosticOrigin }) {
             codeSpan.push(jsx(CodeLineText, { gutterWidth: gutterWidth, lineNumber: index + 1, lineText: lineText }));
         }
     }
-    const location = (jsx(Line, { children: [" ".repeat(gutterWidth + 2), jsx(Text, { color: "90", children: " at " }), jsx(Text, { color: "36", children: Path.relative("", diagnosticOrigin.sourceFile.fileName) }), jsx(Text, { color: "90", children: `:${firstMarkedLine + 1}:${firstMarkedLineCharacter + 1}` }), diagnosticOrigin.assertion && jsx(BreadcrumbsText, { ancestor: diagnosticOrigin.assertion.parent })] }));
+    const location = (jsx(Line, { children: [" ".repeat(gutterWidth + 2), jsx(Text, { color: Color.Gray, children: " at " }), jsx(Text, { color: Color.Cyan, children: Path.relative("", diagnosticOrigin.sourceFile.fileName) }), jsx(Text, { color: Color.Gray, children: `:${firstMarkedLine + 1}:${firstMarkedLineCharacter + 1}` }), diagnosticOrigin.assertion && jsx(BreadcrumbsText, { ancestor: diagnosticOrigin.assertion.parent })] }));
     return (jsx(Text, { children: [codeSpan, jsx(Line, {}), location] }));
 }
 
 function DiagnosticText({ diagnostic }) {
-    const code = diagnostic.code ? jsx(Text, { color: "90", children: [" ", diagnostic.code] }) : undefined;
+    const code = diagnostic.code ? jsx(Text, { color: Color.Gray, children: [" ", diagnostic.code] }) : undefined;
     const text = Array.isArray(diagnostic.text) ? diagnostic.text : [diagnostic.text];
-    const message = text.map((text, index) => (jsx(Text, { children: [index === 1 ? jsx(Line, {}) : undefined, jsx(Line, { children: [text, code] })] })));
+    const message = text.map((text, index) => (jsx(Text, { children: [index === 1 ? jsx(Line, {}) : undefined, jsx(Line, { children: [text, index === 0 ? code : undefined] })] })));
     const related = diagnostic.related?.map((relatedDiagnostic) => jsx(DiagnosticText, { diagnostic: relatedDiagnostic }));
     const codeSpan = diagnostic.origin ? (jsx(Text, { children: [jsx(Line, {}), jsx(CodeSpanText, { diagnosticCategory: diagnostic.category, diagnosticOrigin: diagnostic.origin })] })) : undefined;
     return (jsx(Text, { children: [message, codeSpan, jsx(Line, {}), jsx(Text, { indent: 2, children: related })] }));
@@ -2060,11 +2068,11 @@ function DiagnosticText({ diagnostic }) {
 function diagnosticText(diagnostic) {
     let prefix;
     switch (diagnostic.category) {
-        case "error":
-            prefix = jsx(Text, { color: "31", children: "Error: " });
+        case DiagnosticCategory.Error:
+            prefix = jsx(Text, { color: Color.Red, children: "Error: " });
             break;
-        case "warning":
-            prefix = jsx(Text, { color: "33", children: "Warning: " });
+        case DiagnosticCategory.Warning:
+            prefix = jsx(Text, { color: Color.Yellow, children: "Warning: " });
             break;
     }
     return (jsx(Text, { children: [prefix, jsx(DiagnosticText, { diagnostic: diagnostic })] }));
@@ -2075,22 +2083,22 @@ function FileNameText({ filePath }) {
     const lastPathSeparator = relativePath.lastIndexOf("/");
     const directoryNameText = relativePath.slice(0, lastPathSeparator + 1);
     const fileNameText = relativePath.slice(lastPathSeparator + 1);
-    return (jsx(Text, { children: [jsx(Text, { color: "90", children: directoryNameText }), fileNameText] }));
+    return (jsx(Text, { children: [jsx(Text, { color: Color.Gray, children: directoryNameText }), fileNameText] }));
 }
 function taskStatusText(status, task) {
     let statusColor;
     let statusText;
     switch (status) {
-        case "runs":
-            statusColor = "33";
+        case ResultStatus.Runs:
+            statusColor = Color.Yellow;
             statusText = "runs";
             break;
-        case "passed":
-            statusColor = "32";
+        case ResultStatus.Passed:
+            statusColor = Color.Green;
             statusText = "pass";
             break;
-        case "failed":
-            statusColor = "31";
+        case ResultStatus.Failed:
+            statusColor = Color.Red;
             statusText = "fail";
             break;
     }
@@ -2120,13 +2128,13 @@ function formattedText(input) {
 }
 
 function HintText({ children }) {
-    return (jsx(Text, { indent: 1, color: "90", children: children }));
+    return (jsx(Text, { indent: 1, color: Color.Gray, children: children }));
 }
 function HelpHeaderText({ tstycheVersion }) {
     return (jsx(Line, { children: ["The TSTyche Type Test Runner", jsx(HintText, { children: tstycheVersion })] }));
 }
 function CommandText({ hint, text }) {
-    return (jsx(Line, { indent: 1, children: [jsx(Text, { color: "34", children: text }), hint && jsx(HintText, { children: hint })] }));
+    return (jsx(Line, { indent: 1, children: [jsx(Text, { color: Color.Blue, children: text }), hint && jsx(HintText, { children: hint })] }));
 }
 function OptionDescriptionText({ text }) {
     return jsx(Line, { indent: 1, children: text });
@@ -2144,7 +2152,7 @@ function CommandLineOptionNameText({ text }) {
     return jsx(Text, { children: `--${text}` });
 }
 function CommandLineOptionHintText({ definition }) {
-    if (definition.brand === "list") {
+    if (definition.brand === OptionBrand.List) {
         return jsx(Text, { children: `${definition.brand} of ${definition.items.brand}s` });
     }
     return jsx(Text, { children: definition.brand });
@@ -2153,7 +2161,7 @@ function CommandLineOptionsText({ optionDefinitions }) {
     const definitions = [...optionDefinitions.values()];
     const optionsText = definitions.map((definition) => {
         let hint;
-        if (definition.brand !== "bareTrue") {
+        if (definition.brand !== OptionBrand.BareTrue) {
             hint = jsx(CommandLineOptionHintText, { definition: definition });
         }
         return (jsx(Text, { children: [jsx(CommandText, { text: jsx(CommandLineOptionNameText, { text: definition.name }), hint: hint }), jsx(OptionDescriptionText, { text: definition.description }), jsx(Line, {})] }));
@@ -2203,7 +2211,7 @@ function RowText({ label, text }) {
     return (jsx(Line, { children: [`${label}:`.padEnd(12), text] }));
 }
 function CountText({ failed, passed, skipped, todo, total }) {
-    return (jsx(Text, { children: [failed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "31", children: [failed, " failed"] }), jsx(Text, { children: ", " })] })) : undefined, skipped > 0 ? (jsx(Text, { children: [jsx(Text, { color: "33", children: [skipped, " skipped"] }), jsx(Text, { children: ", " })] })) : undefined, todo > 0 ? (jsx(Text, { children: [jsx(Text, { color: "35", children: [todo, " todo"] }), jsx(Text, { children: ", " })] })) : undefined, passed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "32", children: [passed, " passed"] }), jsx(Text, { children: ", " })] })) : undefined, jsx(Text, { children: [total, " total"] })] }));
+    return (jsx(Text, { children: [failed > 0 ? (jsx(Text, { children: [jsx(Text, { color: Color.Red, children: [failed, " failed"] }), jsx(Text, { children: ", " })] })) : undefined, skipped > 0 ? (jsx(Text, { children: [jsx(Text, { color: Color.Yellow, children: [skipped, " skipped"] }), jsx(Text, { children: ", " })] })) : undefined, todo > 0 ? (jsx(Text, { children: [jsx(Text, { color: Color.Magenta, children: [todo, " todo"] }), jsx(Text, { children: ", " })] })) : undefined, passed > 0 ? (jsx(Text, { children: [jsx(Text, { color: Color.Green, children: [passed, " passed"] }), jsx(Text, { children: ", " })] })) : undefined, jsx(Text, { children: [total, " total"] })] }));
 }
 function DurationText({ seconds }) {
     return jsx(Text, { children: `${Math.round(seconds * 10) / 10}s` });
@@ -2216,24 +2224,24 @@ function MatchText({ text }) {
         return jsx(Text, { children: ["'", ...text, "'"] });
     }
     const lastItem = text.pop();
-    return (jsx(Text, { children: [text.map((match, index, list) => (jsx(Text, { children: ["'", match, "'", index === list.length - 1 ? jsx(Text, { children: " " }) : jsx(Text, { color: "90", children: ", " })] }))), jsx(Text, { color: "90", children: "or" }), " '", lastItem, "'"] }));
+    return (jsx(Text, { children: [text.map((match, index, list) => (jsx(Text, { children: ["'", match, "'", index === list.length - 1 ? jsx(Text, { children: " " }) : jsx(Text, { color: Color.Gray, children: ", " })] }))), jsx(Text, { color: Color.Gray, children: "or" }), " '", lastItem, "'"] }));
 }
 function RanFilesText({ onlyMatch, pathMatch, skipMatch }) {
     const testNameMatchText = [];
     if (onlyMatch != null) {
-        testNameMatchText.push(jsx(Text, { children: [jsx(Text, { color: "90", children: "matching " }), jsx(MatchText, { text: onlyMatch })] }));
+        testNameMatchText.push(jsx(Text, { children: [jsx(Text, { color: Color.Gray, children: "matching " }), jsx(MatchText, { text: onlyMatch })] }));
     }
     if (skipMatch != null) {
-        testNameMatchText.push(jsx(Text, { children: [onlyMatch && jsx(Text, { color: "90", children: " and " }), jsx(Text, { color: "90", children: "not matching " }), jsx(MatchText, { text: skipMatch })] }));
+        testNameMatchText.push(jsx(Text, { children: [onlyMatch && jsx(Text, { color: Color.Gray, children: " and " }), jsx(Text, { color: Color.Gray, children: "not matching " }), jsx(MatchText, { text: skipMatch })] }));
     }
     let pathMatchText;
     if (pathMatch.length > 0) {
-        pathMatchText = (jsx(Text, { children: [jsx(Text, { color: "90", children: "test files matching " }), jsx(MatchText, { text: pathMatch }), jsx(Text, { color: "90", children: "." })] }));
+        pathMatchText = (jsx(Text, { children: [jsx(Text, { color: Color.Gray, children: "test files matching " }), jsx(MatchText, { text: pathMatch }), jsx(Text, { color: Color.Gray, children: "." })] }));
     }
     else {
-        pathMatchText = jsx(Text, { color: "90", children: "all test files." });
+        pathMatchText = jsx(Text, { color: Color.Gray, children: "all test files." });
     }
-    return (jsx(Line, { children: [jsx(Text, { color: "90", children: "Ran " }), testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: "tests " }) : undefined, testNameMatchText, testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: " in " }) : undefined, pathMatchText] }));
+    return (jsx(Line, { children: [jsx(Text, { color: Color.Gray, children: "Ran " }), testNameMatchText.length > 0 ? jsx(Text, { color: Color.Gray, children: "tests " }) : undefined, testNameMatchText, testNameMatchText.length > 0 ? jsx(Text, { color: Color.Gray, children: " in " }) : undefined, pathMatchText] }));
 }
 function summaryText({ duration, expectCount, fileCount, onlyMatch, pathMatch, skipMatch, targetCount, testCount, }) {
     const targetCountText = (jsx(RowText, { label: "Targets", text: jsx(CountText, { failed: targetCount.failed, passed: targetCount.passed, skipped: targetCount.skipped, todo: targetCount.todo, total: targetCount.total }) }));
@@ -2246,25 +2254,25 @@ function summaryText({ duration, expectCount, fileCount, onlyMatch, pathMatch, s
 function StatusText({ status }) {
     switch (status) {
         case "fail":
-            return jsx(Text, { color: "31", children: "\u00D7" });
+            return jsx(Text, { color: Color.Red, children: "\u00D7" });
         case "pass":
-            return jsx(Text, { color: "32", children: "+" });
+            return jsx(Text, { color: Color.Green, children: "+" });
         case "skip":
-            return jsx(Text, { color: "33", children: "- skip" });
+            return jsx(Text, { color: Color.Yellow, children: "- skip" });
         case "todo":
-            return jsx(Text, { color: "35", children: "- todo" });
+            return jsx(Text, { color: Color.Magenta, children: "- todo" });
     }
 }
 function testNameText(status, name, indent = 0) {
-    return (jsx(Line, { indent: indent + 1, children: [jsx(StatusText, { status: status }), " ", jsx(Text, { color: "90", children: name })] }));
+    return (jsx(Line, { indent: indent + 1, children: [jsx(StatusText, { status: status }), " ", jsx(Text, { color: Color.Gray, children: name })] }));
 }
 
 function usesCompilerText(compilerVersion, projectConfigFilePath, options) {
     let projectConfigPathText;
     if (projectConfigFilePath != null) {
-        projectConfigPathText = (jsx(Text, { color: "90", children: [" with ", Path.relative("", projectConfigFilePath)] }));
+        projectConfigPathText = (jsx(Text, { color: Color.Gray, children: [" with ", Path.relative("", projectConfigFilePath)] }));
     }
-    return (jsx(Text, { children: [options?.prependEmptyLine ? jsx(Line, {}) : undefined, jsx(Line, { children: [jsx(Text, { color: "34", children: "uses" }), " TypeScript ", compilerVersion, projectConfigPathText] }), jsx(Line, {})] }));
+    return (jsx(Text, { children: [options?.prependEmptyLine ? jsx(Line, {}) : undefined, jsx(Line, { children: [jsx(Text, { color: Color.Blue, children: "uses" }), " TypeScript ", compilerVersion, projectConfigPathText] }), jsx(Line, {})] }));
 }
 
 function waitingForFileChangesText() {
@@ -2277,7 +2285,7 @@ function watchUsageText() {
         ["x", "to exit."],
     ];
     const usageText = usage.map(([keyText, actionText]) => {
-        return (jsx(Line, { children: [jsx(Text, { color: "90", children: "Press" }), jsx(Text, { children: ` ${keyText} ` }), jsx(Text, { color: "90", children: actionText })] }));
+        return (jsx(Line, { children: [jsx(Text, { color: Color.Gray, children: "Press" }), jsx(Text, { children: ` ${keyText} ` }), jsx(Text, { color: Color.Gray, children: actionText })] }));
     });
     return jsx(Text, { children: usageText });
 }
@@ -2473,10 +2481,10 @@ class SetupReporter {
         if ("diagnostics" in payload) {
             for (const diagnostic of payload.diagnostics) {
                 switch (diagnostic.category) {
-                    case "error":
+                    case DiagnosticCategory.Error:
                         OutputService.writeError(diagnosticText(diagnostic));
                         break;
-                    case "warning":
+                    case DiagnosticCategory.Warning:
                         OutputService.writeWarning(diagnosticText(diagnostic));
                         break;
                 }
@@ -2840,7 +2848,7 @@ class WatchService {
                 case "\u001B":
                 case "q":
                 case "x":
-                    onClose("watchClose");
+                    onClose(CancellationReason.WatchClose);
                     break;
                 case "\u000D":
                 case "\u0020":
@@ -2875,7 +2883,7 @@ class WatchService {
         };
         this.#watchers.push(new Watcher(this.#resolvedConfig.rootPath, onChangedFile, onRemovedFile, { recursive: true }));
         const onChangedConfigFile = () => {
-            onClose("configChange");
+            onClose(CancellationReason.ConfigChange);
         };
         this.#watchers.push(new FileWatcher(this.#resolvedConfig.configFilePath, onChangedConfigFile));
         for (const watcher of this.#watchers) {
@@ -2890,6 +2898,13 @@ class WatchService {
     }
 }
 
+var TestMemberBrand;
+(function (TestMemberBrand) {
+    TestMemberBrand["Describe"] = "describe";
+    TestMemberBrand["Test"] = "test";
+    TestMemberBrand["Expect"] = "expect";
+})(TestMemberBrand || (TestMemberBrand = {}));
+
 class TestMember {
     brand;
     #compiler;
@@ -2931,17 +2946,17 @@ class TestMember {
             return node.parent;
         };
         switch (this.brand) {
-            case "describe":
+            case TestMemberBrand.Describe:
                 for (const member of this.members) {
-                    if (member.brand === "expect") {
+                    if (member.brand === TestMemberBrand.Expect) {
                         diagnostics.push(Diagnostic.error(getText(member.node), DiagnosticOrigin.fromNode(getParentCallExpression(member.node))));
                     }
                 }
                 break;
-            case "test":
-            case "expect":
+            case TestMemberBrand.Test:
+            case TestMemberBrand.Expect:
                 for (const member of this.members) {
-                    if (member.brand !== "expect") {
+                    if (member.brand !== TestMemberBrand.Expect) {
                         diagnostics.push(Diagnostic.error(getText(member.node), DiagnosticOrigin.fromNode(member.node)));
                     }
                 }
@@ -2976,6 +2991,15 @@ class Assertion extends TestMember {
     }
 }
 
+var TestMemberFlags;
+(function (TestMemberFlags) {
+    TestMemberFlags[TestMemberFlags["None"] = 0] = "None";
+    TestMemberFlags[TestMemberFlags["Fail"] = 1] = "Fail";
+    TestMemberFlags[TestMemberFlags["Only"] = 2] = "Only";
+    TestMemberFlags[TestMemberFlags["Skip"] = 4] = "Skip";
+    TestMemberFlags[TestMemberFlags["Todo"] = 8] = "Todo";
+})(TestMemberFlags || (TestMemberFlags = {}));
+
 class IdentifierLookup {
     #compiler;
     #identifiers;
@@ -3020,7 +3044,7 @@ class IdentifierLookup {
         }
     }
     resolveTestMemberMeta(node) {
-        let flags = 0;
+        let flags = TestMemberFlags.None;
         let expression = node.expression;
         while (this.#compiler.isPropertyAccessExpression(expression)) {
             if (expression.expression.getText() === this.#identifiers.namespace) {
@@ -3028,16 +3052,16 @@ class IdentifierLookup {
             }
             switch (expression.name.getText()) {
                 case "fail":
-                    flags |= 1;
+                    flags |= TestMemberFlags.Fail;
                     break;
                 case "only":
-                    flags |= 2;
+                    flags |= TestMemberFlags.Only;
                     break;
                 case "skip":
-                    flags |= 4;
+                    flags |= TestMemberFlags.Skip;
                     break;
                 case "todo":
-                    flags |= 8;
+                    flags |= TestMemberFlags.Todo;
                     break;
             }
             expression = expression.expression;
@@ -3055,12 +3079,12 @@ class IdentifierLookup {
         }
         switch (identifierName) {
             case "describe":
-                return { brand: "describe", flags };
+                return { brand: TestMemberBrand.Describe, flags };
             case "it":
             case "test":
-                return { brand: "test", flags };
+                return { brand: TestMemberBrand.Test, flags };
             case "expect":
-                return { brand: "expect", flags };
+                return { brand: TestMemberBrand.Expect, flags };
         }
         return;
     }
@@ -3076,7 +3100,7 @@ class TestTree {
     }
     get hasOnly() {
         function hasOnly(root) {
-            return root.members.some((branch) => branch.flags & 2 || ("members" in branch && hasOnly(branch)));
+            return root.members.some((branch) => branch.flags & TestMemberFlags.Only || ("members" in branch && hasOnly(branch)));
         }
         return hasOnly(this);
     }
@@ -3090,7 +3114,7 @@ class CollectService {
     #collectTestMembers(node, identifiers, parent) {
         if (this.#compiler.isCallExpression(node)) {
             const meta = identifiers.resolveTestMemberMeta(node);
-            if (meta != null && (meta.brand === "describe" || meta.brand === "test")) {
+            if (meta != null && (meta.brand === TestMemberBrand.Describe || meta.brand === TestMemberBrand.Test)) {
                 const testMember = new TestMember(this.#compiler, meta.brand, node, parent, meta.flags);
                 parent.members.push(testMember);
                 this.#compiler.forEachChild(node, (node) => {
@@ -3098,7 +3122,7 @@ class CollectService {
                 });
                 return;
             }
-            if (meta != null && meta.brand === "expect") {
+            if (meta != null && meta.brand === TestMemberBrand.Expect) {
                 const modifierNode = this.#getChainedNode(node, "type");
                 if (!modifierNode) {
                     return;
@@ -3143,22 +3167,6 @@ class CollectService {
     }
 }
 
-var TestMemberBrand;
-(function (TestMemberBrand) {
-    TestMemberBrand["Describe"] = "describe";
-    TestMemberBrand["Test"] = "test";
-    TestMemberBrand["Expect"] = "expect";
-})(TestMemberBrand || (TestMemberBrand = {}));
-
-var TestMemberFlags;
-(function (TestMemberFlags) {
-    TestMemberFlags[TestMemberFlags["None"] = 0] = "None";
-    TestMemberFlags[TestMemberFlags["Fail"] = 1] = "Fail";
-    TestMemberFlags[TestMemberFlags["Only"] = 2] = "Only";
-    TestMemberFlags[TestMemberFlags["Skip"] = 4] = "Skip";
-    TestMemberFlags[TestMemberFlags["Todo"] = 8] = "Todo";
-})(TestMemberFlags || (TestMemberFlags = {}));
-
 class ProjectService {
     #compiler;
     #lastSeenProject = "";
@@ -3261,7 +3269,7 @@ class ProjectService {
         if (configFileErrors && configFileErrors.length > 0) {
             EventEmitter.dispatch([
                 "project:error",
-                { diagnostics: Diagnostic.fromDiagnostics(configFileErrors, this.#compiler) },
+                { diagnostics: Diagnostic.fromDiagnostics(configFileErrors) },
             ]);
         }
         if (this.#resolvedConfig.checkSourceFiles) {
@@ -3285,16 +3293,22 @@ class ProjectService {
                 diagnostics.push(...program.getSyntacticDiagnostics(sourceFile), ...program.getSemanticDiagnostics(sourceFile));
             }
             if (diagnostics.length > 0) {
-                EventEmitter.dispatch([
-                    "project:error",
-                    { diagnostics: Diagnostic.fromDiagnostics(diagnostics, this.#compiler) },
-                ]);
+                EventEmitter.dispatch(["project:error", { diagnostics: Diagnostic.fromDiagnostics(diagnostics) }]);
                 return;
             }
         }
     }
 }
 
+var RunMode;
+(function (RunMode) {
+    RunMode[RunMode["Normal"] = 0] = "Normal";
+    RunMode[RunMode["Fail"] = 1] = "Fail";
+    RunMode[RunMode["Only"] = 2] = "Only";
+    RunMode[RunMode["Skip"] = 4] = "Skip";
+    RunMode[RunMode["Todo"] = 8] = "Todo";
+})(RunMode || (RunMode = {}));
+
 class Format {
     static capitalize(text) {
         return text.replace(/^./, text.charAt(0).toUpperCase());
@@ -3462,7 +3476,13 @@ class MatchWorker {
     #checkIsRelatedTo(sourceNode, targetNode, relation) {
         const sourceType = this.getType(sourceNode);
         const targetType = this.getType(targetNode);
-        return this.#typeChecker.isTypeRelatedTo(sourceType, targetType, relation);
+        let result = this.#typeChecker.isTypeRelatedTo(sourceType, targetType, relation);
+        if (!result &&
+            relation === this.#typeChecker.relation.identity &&
+            (sourceType.isIntersection() || sourceType.isUnion())) {
+            result = sourceType.types.every((type) => this.#typeChecker.isTypeRelatedTo(type, targetType, relation));
+        }
+        return result;
     }
     extendsObjectType(type) {
         const nonPrimitiveType = { flags: this.#compiler.TypeFlags.NonPrimitive };
@@ -3867,7 +3887,7 @@ class ToRaiseError {
             const text = ExpectDiagnosticText.typeRaisedError(isTypeNode, count, targetNodes.length);
             const related = [
                 Diagnostic.error(ExpectDiagnosticText.raisedTypeError(count)),
-                ...Diagnostic.fromDiagnostics([...matchWorker.assertion.diagnostics], this.#compiler),
+                ...Diagnostic.fromDiagnostics([...matchWorker.assertion.diagnostics]),
             ];
             return [Diagnostic.error(text, origin).add({ related })];
         }
@@ -3881,7 +3901,7 @@ class ToRaiseError {
                 const origin = DiagnosticOrigin.fromNode(targetNode, matchWorker.assertion);
                 const related = [
                     Diagnostic.error(ExpectDiagnosticText.raisedTypeError()),
-                    ...Diagnostic.fromDiagnostics([diagnostic], this.#compiler),
+                    ...Diagnostic.fromDiagnostics([diagnostic]),
                 ];
                 accumulator.push(Diagnostic.error(text, origin).add({ related }));
             }
@@ -4100,23 +4120,23 @@ class TestTreeWalker {
         this.#expectService = new ExpectService(compiler, typeChecker, this.#resolvedConfig);
     }
     #resolveRunMode(mode, member) {
-        if (member.flags & 1) {
-            mode |= 1;
+        if (member.flags & TestMemberFlags.Fail) {
+            mode |= RunMode.Fail;
         }
-        if (member.flags & 2 ||
+        if (member.flags & TestMemberFlags.Only ||
             (this.#resolvedConfig.only != null && member.name.toLowerCase().includes(this.#resolvedConfig.only.toLowerCase()))) {
-            mode |= 2;
+            mode |= RunMode.Only;
         }
-        if (member.flags & 4 ||
+        if (member.flags & TestMemberFlags.Skip ||
             (this.#resolvedConfig.skip != null && member.name.toLowerCase().includes(this.#resolvedConfig.skip.toLowerCase()))) {
-            mode |= 4;
+            mode |= RunMode.Skip;
         }
-        if (member.flags & 8) {
-            mode |= 8;
+        if (member.flags & TestMemberFlags.Todo) {
+            mode |= RunMode.Todo;
         }
         if (this.#position != null && member.node.getStart() === this.#position) {
-            mode |= 2;
-            mode &= ~4;
+            mode |= RunMode.Only;
+            mode &= ~RunMode.Skip;
         }
         return mode;
     }
@@ -4131,13 +4151,13 @@ class TestTreeWalker {
                 break;
             }
             switch (member.brand) {
-                case "describe":
+                case TestMemberBrand.Describe:
                     this.#visitDescribe(member, runMode, parentResult);
                     break;
-                case "test":
+                case TestMemberBrand.Test:
                     this.#visitTest(member, runMode, parentResult);
                     break;
-                case "expect":
+                case TestMemberBrand.Expect:
                     this.#visitAssertion(member, runMode, parentResult);
                     break;
             }
@@ -4148,7 +4168,7 @@ class TestTreeWalker {
         const expectResult = new ExpectResult(assertion, parentResult);
         EventEmitter.dispatch(["expect:start", { result: expectResult }]);
         runMode = this.#resolveRunMode(runMode, assertion);
-        if (runMode & 4 || (this.#hasOnly && !(runMode & 2))) {
+        if (runMode & RunMode.Skip || (this.#hasOnly && !(runMode & RunMode.Only))) {
             EventEmitter.dispatch(["expect:skip", { result: expectResult }]);
             return;
         }
@@ -4159,7 +4179,7 @@ class TestTreeWalker {
             ]);
         };
         if (assertion.diagnostics.size > 0 && assertion.matcherName.getText() !== "toRaiseError") {
-            onExpectDiagnostics(Diagnostic.fromDiagnostics([...assertion.diagnostics], this.#compiler));
+            onExpectDiagnostics(Diagnostic.fromDiagnostics([...assertion.diagnostics]));
             return;
         }
         const matchResult = this.#expectService.match(assertion, onExpectDiagnostics);
@@ -4167,7 +4187,7 @@ class TestTreeWalker {
             return;
         }
         if (assertion.isNot ? !matchResult.isMatch : matchResult.isMatch) {
-            if (runMode & 1) {
+            if (runMode & RunMode.Fail) {
                 const text = ["The assertion was supposed to fail, but it passed.", "Consider removing the '.fail' flag."];
                 const origin = DiagnosticOrigin.fromNode(assertion.node.expression.name);
                 onExpectDiagnostics(Diagnostic.error(text, origin));
@@ -4176,7 +4196,7 @@ class TestTreeWalker {
                 EventEmitter.dispatch(["expect:pass", { result: expectResult }]);
             }
         }
-        else if (runMode & 1) {
+        else if (runMode & RunMode.Fail) {
             EventEmitter.dispatch(["expect:pass", { result: expectResult }]);
         }
         else {
@@ -4187,12 +4207,12 @@ class TestTreeWalker {
         const describeResult = new DescribeResult(describe, parentResult);
         EventEmitter.dispatch(["describe:start", { result: describeResult }]);
         runMode = this.#resolveRunMode(runMode, describe);
-        if (!(runMode & 4 || (this.#hasOnly && !(runMode & 2)) || runMode & 8) &&
+        if (!(runMode & RunMode.Skip || (this.#hasOnly && !(runMode & RunMode.Only)) || runMode & RunMode.Todo) &&
             describe.diagnostics.size > 0) {
             EventEmitter.dispatch([
                 "task:error",
                 {
-                    diagnostics: Diagnostic.fromDiagnostics([...describe.diagnostics], this.#compiler),
+                    diagnostics: Diagnostic.fromDiagnostics([...describe.diagnostics]),
                     result: this.#taskResult,
                 },
             ]);
@@ -4206,22 +4226,22 @@ class TestTreeWalker {
         const testResult = new TestResult(test, parentResult);
         EventEmitter.dispatch(["test:start", { result: testResult }]);
         runMode = this.#resolveRunMode(runMode, test);
-        if (runMode & 8) {
+        if (runMode & RunMode.Todo) {
             EventEmitter.dispatch(["test:todo", { result: testResult }]);
             return;
         }
-        if (!(runMode & 4 || (this.#hasOnly && !(runMode & 2))) && test.diagnostics.size > 0) {
+        if (!(runMode & RunMode.Skip || (this.#hasOnly && !(runMode & RunMode.Only))) && test.diagnostics.size > 0) {
             EventEmitter.dispatch([
                 "test:error",
                 {
-                    diagnostics: Diagnostic.fromDiagnostics([...test.diagnostics], this.#compiler),
+                    diagnostics: Diagnostic.fromDiagnostics([...test.diagnostics]),
                     result: testResult,
                 },
             ]);
             return;
         }
         this.visit(test.members, runMode, testResult);
-        if (runMode & 4 || (this.#hasOnly && !(runMode & 2))) {
+        if (runMode & RunMode.Skip || (this.#hasOnly && !(runMode & RunMode.Only))) {
             EventEmitter.dispatch(["test:skip", { result: testResult }]);
             return;
         }
@@ -4272,7 +4292,7 @@ class TaskRunner {
         if (syntacticDiagnostics.length > 0) {
             EventEmitter.dispatch([
                 "task:error",
-                { diagnostics: Diagnostic.fromDiagnostics(syntacticDiagnostics, this.#compiler), result: taskResult },
+                { diagnostics: Diagnostic.fromDiagnostics(syntacticDiagnostics), result: taskResult },
             ]);
             return;
         }
@@ -4289,7 +4309,7 @@ class TaskRunner {
         if (testTree.diagnostics.size > 0) {
             EventEmitter.dispatch([
                 "task:error",
-                { diagnostics: Diagnostic.fromDiagnostics([...testTree.diagnostics], this.#compiler), result: taskResult },
+                { diagnostics: Diagnostic.fromDiagnostics([...testTree.diagnostics]), result: taskResult },
             ]);
             return;
         }
@@ -4300,14 +4320,14 @@ class TaskRunner {
             hasOnly: testTree.hasOnly,
             position: task.position,
         });
-        testTreeWalker.visit(testTree.members, 0, undefined);
+        testTreeWalker.visit(testTree.members, RunMode.Normal, undefined);
     }
 }
 
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "3.2.0";
+    static version = "3.3.0";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -4342,7 +4362,7 @@ class Runner {
         this.#eventEmitter.addHandler(resultHandler);
         await this.#addReporters();
         if (this.#resolvedConfig.failFast) {
-            const cancellationHandler = new CancellationHandler(cancellationToken, "failFast");
+            const cancellationHandler = new CancellationHandler(cancellationToken, CancellationReason.FailFast);
             this.#eventEmitter.addHandler(cancellationHandler);
         }
         await this.#run(tasks, cancellationToken);
@@ -4368,7 +4388,7 @@ class Runner {
             EventEmitter.dispatch(["target:end", { result: targetResult }]);
         }
         EventEmitter.dispatch(["run:end", { result }]);
-        if (cancellationToken.reason === "failFast") {
+        if (cancellationToken.reason === CancellationReason.FailFast) {
             cancellationToken.reset();
         }
     }
@@ -4383,14 +4403,14 @@ class Runner {
 class Cli {
     #eventEmitter = new EventEmitter();
     async run(commandLine, cancellationToken = new CancellationToken()) {
-        const cancellationHandler = new CancellationHandler(cancellationToken, "configError");
+        const cancellationHandler = new CancellationHandler(cancellationToken, CancellationReason.ConfigError);
         this.#eventEmitter.addHandler(cancellationHandler);
         const exitCodeHandler = new ExitCodeHandler();
         this.#eventEmitter.addHandler(exitCodeHandler);
         const setupReporter = new SetupReporter();
         this.#eventEmitter.addReporter(setupReporter);
         if (commandLine.includes("--help")) {
-            const options = Options.for(2);
+            const options = Options.for(OptionGroup.CommandLine);
             OutputService.writeMessage(helpText(options, Runner.version));
             return;
         }
@@ -4418,7 +4438,7 @@ class Cli {
             return;
         }
         do {
-            if (cancellationToken.reason === "configChange") {
+            if (cancellationToken.reason === CancellationReason.ConfigChange) {
                 cancellationToken.reset();
                 exitCodeHandler.resetCode();
                 OutputService.clearTerminal();
@@ -4473,7 +4493,7 @@ class Cli {
             const runner = new Runner(resolvedConfig);
             await runner.run(testFiles, cancellationToken);
             PluginService.removeHandlers();
-        } while (cancellationToken.reason === "configChange");
+        } while (cancellationToken.reason === CancellationReason.ConfigChange);
         this.#eventEmitter.removeHandlers();
     }
     #waitForChangedFiles(resolvedConfig, cancellationToken) {
@@ -4482,7 +4502,7 @@ class Cli {
             cancellationToken.reset();
             OutputService.writeMessage(waitingForFileChangesText());
             const onChanged = () => {
-                cancellationToken.cancel("configChange");
+                cancellationToken.cancel(CancellationReason.ConfigChange);
                 for (const watcher of watchers) {
                     watcher.close();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -83,7 +83,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "engines": {
     "node": ">=18.19"
   }