tstyche 6.2.0 → 7.0.0-beta.0

package/dist/tag.js

@@ -25,12 +25,9 @@ async function tstyche(template, ...substitutions) {
     eventEmitter.addHandler(statusHandler);
     await cli.run(commandLine, new CancellationToken());
     eventEmitter.removeHandler(statusHandler);
-    return new Promise((resolve, reject) => {
-        if (statusHandler.hasError()) {
-            reject(new Error("TSTyche test run failed. Check the output above for details."));
-        }
-        resolve();
-    });
+    if (statusHandler.hasError()) {
+        throw new Error("TSTyche test run failed. Check the output above for details.");
+    }
 }
 
 export { tstyche as default };

package/dist/tstyche.d.ts

@@ -169,7 +169,6 @@ interface ConfigFileOptions {
     rejectAnyType?: boolean;
     rejectNeverType?: boolean;
     reporters?: Array<string>;
-    rootPath?: string;
     target?: Array<string>;
     testFileMatch?: Array<string>;
     tsconfig?: string;
@@ -183,9 +182,10 @@ interface InlineConfig {
     };
     template?: boolean;
 }
-interface ResolvedConfig extends Omit<CommandLineOptions, "config" | keyof ConfigFileOptions>, Required<ConfigFileOptions> {
+interface ResolvedConfig extends Omit<CommandLineOptions, "config" | "root" | keyof ConfigFileOptions>, Required<ConfigFileOptions> {
     configFilePath: string;
     pathMatch: Array<string>;
+    rootPath: string;
 }
 interface TextRange {
     start: number;
@@ -205,17 +205,16 @@ declare class Config {
         commandLineOptions: CommandLineOptions;
         pathMatch: Array<string>;
     }>;
-    static parseConfigFile(configPath?: string, rootPath?: string): Promise<{
+    static parseConfigFile(configPath?: string | undefined, rootPath?: string | undefined): Promise<{
         configFileOptions: ConfigFileOptions;
-        configFilePath: string;
     }>;
     static resolve(options?: {
         configFileOptions?: ConfigFileOptions;
-        configFilePath?: string;
-        commandLineOptions?: Omit<CommandLineOptions, "config">;
+        commandLineOptions?: CommandLineOptions;
         pathMatch?: Array<string>;
     }): ResolvedConfig;
-    static resolveConfigFilePath(configPath?: string, rootPath?: string): string;
+    static resolveConfigFilePath(configPath?: string | undefined, rootPath?: string | undefined): string;
+    static resolveRootPath(rootPath?: string | undefined): string;
 }
 
 declare enum OptionBrand {
@@ -283,6 +282,7 @@ type OptionDefinition = PrimitiveTypeOptionDefinition | ListTypeOptionDefinition
 declare class Options {
     #private;
     static for(optionGroup: OptionGroup): Map<string, OptionDefinition>;
+    static isJsonString(text: string): boolean;
     static resolve(optionName: string, optionValue: string, rootPath?: string): string;
     static validate(optionName: string, optionValue: string, onDiagnostics: DiagnosticsHandler, origin?: DiagnosticOrigin): Promise<void>;
 }
@@ -332,6 +332,13 @@ declare class WatchReporter extends BaseReporter {
     on([event, payload]: ReporterEvent): void;
 }
 
+declare enum ProjectConfigKind {
+    Discovered = 0,
+    Default = 1,
+    Provided = 2,
+    Synthetic = 3
+}
+
 declare enum ResultStatus {
     Runs = "runs",
     Passed = "passed",
@@ -343,6 +350,10 @@ declare enum ResultStatus {
     Todo = "todo"
 }
 
+type ProjectConfig = {
+    kind: ProjectConfigKind;
+    specifier: string;
+};
 type TargetResultStatus = ResultStatus.Runs | ResultStatus.Passed | ResultStatus.Failed;
 type TargetCounts = {
     [K in Exclude<TargetResultStatus, ResultStatus.Runs>]: number;
@@ -415,9 +426,9 @@ declare class FileResult {
 
 declare class ProjectResult {
     compilerVersion: string;
-    projectConfigFilePath: string | undefined;
+    projectConfig: ProjectConfig;
     results: Array<FileResult>;
-    constructor(compilerVersion: string, projectConfigFilePath: string | undefined);
+    constructor(compilerVersion: string, projectConfig: ProjectConfig);
 }
 
 declare class TargetResult {
@@ -468,7 +479,7 @@ type Event = ["config:error", {
     result: TargetResult;
 }] | ["project:uses", {
     compilerVersion: string;
-    projectConfigFilePath: string | undefined;
+    projectConfig: ProjectConfig;
 }] | ["project:error", {
     diagnostics: Array<Diagnostic>;
 }] | ["file:start", {
@@ -599,7 +610,7 @@ interface TextProps {
 }
 declare function Text({ children, color, indent }: TextProps): ScribblerJsx.Element;
 
-declare function addsPackageText(packageVersion: string, packagePath: string, options?: {
+declare function addsText(packageVersion: string, packagePath: string, options?: {
     short?: boolean;
 }): ScribblerJsx.Element;
 
@@ -655,8 +666,7 @@ declare function summaryText({ targetCounts, fileCounts, testCounts, assertionCo
 
 declare function testNameText(status: Exclude<TestResultStatus, ResultStatus.Runs>, name: string, indent?: number): ScribblerJsx.Element;
 
-declare function usesCompilerText(compilerVersion: string, projectConfigFilePath: string | undefined, options?: {
-    prependEmptyLine?: boolean;
+declare function usesText(compilerVersion: string, projectConfig: ProjectConfig, options?: {
     short?: boolean;
 }): ScribblerJsx.Element;
 
@@ -743,5 +753,5 @@ declare class Version {
     static isSatisfiedWith(source: string, target: string): boolean;
 }
 
-export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, DotReporter, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, ProjectResult, Result, ResultStatus, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, Store, StreamController, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, dotText, environmentOptions, fileStatusText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
-export type { AssertionCounts, AssertionResultStatus, CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, EnvironmentOptions, Event, EventHandler, FileCounts, FileResultStatus, InlineConfig, ItemDefinition, OptionDefinition, Reporter, ReporterEvent, ResolvedConfig, ResultCounts, ResultTiming, ScribblerOptions, SuppressedCounts, SuppressedResultStatus, TargetCounts, TargetResultStatus, TestCounts, TestResultStatus, TextRange };
+export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, DotReporter, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, ProjectConfigKind, ProjectResult, Result, ResultStatus, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, Store, StreamController, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, dotText, environmentOptions, fileStatusText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesText, waitingForFileChangesText, watchUsageText };
+export type { AssertionCounts, AssertionResultStatus, CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, EnvironmentOptions, Event, EventHandler, FileCounts, FileResultStatus, InlineConfig, ItemDefinition, OptionDefinition, ProjectConfig, Reporter, ReporterEvent, ResolvedConfig, ResultCounts, ResultTiming, ScribblerOptions, SuppressedCounts, SuppressedResultStatus, TargetCounts, TargetResultStatus, TestCounts, TestResultStatus, TextRange };

package/dist/tstyche.js

@@ -60,7 +60,7 @@ class JsonNode {
             return undefined;
         }
         if (/^['"]/.test(this.text)) {
-            return this.text.slice(1, -1);
+            return this.text.slice(1, -1).replaceAll("\\", "");
         }
         if (options?.expectsIdentifier) {
             return this.text;
@@ -244,7 +244,8 @@ class JsonScanner {
         }
         while (!this.isRead()) {
             text += this.#readCharacter();
-            if (text.slice(-1) === closingTokenText || (!closingTokenText && /[\s,:\]}]/.test(this.#peekCharacter()))) {
+            if ((text.at(-2) !== "\\" && text.at(-1) === closingTokenText) ||
+                (!closingTokenText && /[\s,:\]}]/.test(this.#peekCharacter()))) {
                 break;
             }
         }
@@ -1083,7 +1084,7 @@ class Options {
         },
         {
             brand: "true",
-            description: "Print the list of the selected test files and exit.",
+            description: "Print the list of selected test files and exit.",
             group: 2,
             name: "listFiles",
         },
@@ -1133,12 +1134,6 @@ class Options {
             group: 2,
             name: "root",
         },
-        {
-            brand: "string",
-            description: "The path to a directory containing files of a test project.",
-            group: 4,
-            name: "rootPath",
-        },
         {
             brand: "true",
             description: "Print the resolved configuration and exit.",
@@ -1153,7 +1148,7 @@ class Options {
         },
         {
             brand: "range",
-            description: "The range of TypeScript versions to be tested against.",
+            description: "The range of TypeScript versions to test against.",
             group: 2 | 4 | 8,
             name: "target",
         },
@@ -1169,7 +1164,7 @@ class Options {
         },
         {
             brand: "string",
-            description: "The look up strategy to be used to find the TSConfig file.",
+            description: "The TSConfig to load.",
             group: 2 | 4,
             name: "tsconfig",
         },
@@ -1214,16 +1209,19 @@ class Options {
         return ["dot", "list", "summary"].includes(optionValue);
     }
     static #isLookupStrategy(optionValue) {
-        return ["findup", "ignore"].includes(optionValue);
+        return ["findup", "baseline"].includes(optionValue);
+    }
+    static isJsonString(text) {
+        return text.startsWith("{");
     }
     static resolve(optionName, optionValue, rootPath = ".") {
         const canonicalOptionName = Options.#getCanonicalOptionName(optionName);
         switch (canonicalOptionName) {
             case "config":
             case "root":
-            case "rootPath":
             case "tsconfig":
-                if (canonicalOptionName === "tsconfig" && Options.#isLookupStrategy(optionValue)) {
+                if (canonicalOptionName === "tsconfig" &&
+                    (Options.#isLookupStrategy(optionValue) || Options.isJsonString(optionValue))) {
                     break;
                 }
                 if (optionValue.startsWith("file:")) {
@@ -1232,7 +1230,7 @@ class Options {
                 optionValue = Path.resolve(rootPath, optionValue);
                 break;
             case "reporters":
-                if (canonicalOptionName === "reporters" && Options.#isBuiltinReporter(optionValue)) {
+                if (Options.#isBuiltinReporter(optionValue)) {
                     break;
                 }
                 try {
@@ -1254,9 +1252,9 @@ class Options {
         switch (canonicalOptionName) {
             case "config":
             case "root":
-            case "rootPath":
             case "tsconfig":
-                if (canonicalOptionName === "tsconfig" && Options.#isLookupStrategy(optionValue)) {
+                if (canonicalOptionName === "tsconfig" &&
+                    (Options.#isLookupStrategy(optionValue) || Options.isJsonString(optionValue))) {
                     break;
                 }
                 if (existsSync(optionValue)) {
@@ -1265,7 +1263,7 @@ class Options {
                 onDiagnostics(Diagnostic.error(ConfigDiagnosticText.fileDoesNotExist(optionValue), origin));
                 break;
             case "reporters":
-                if (canonicalOptionName === "reporters" && Options.#isBuiltinReporter(optionValue)) {
+                if (Options.#isBuiltinReporter(optionValue)) {
                     break;
                 }
                 if (optionValue.startsWith("file:") && existsSync(new URL(optionValue))) {
@@ -1580,7 +1578,6 @@ const defaultOptions = {
     rejectAnyType: true,
     rejectNeverType: true,
     reporters: ["list", "summary"],
-    rootPath: Path.resolve("./"),
     target: ["*"],
     testFileMatch: ["**/*.tst.*", "**/__typetests__/*.test.*", "**/typetests/*.test.*"],
     tsconfig: "findup",
@@ -1599,10 +1596,8 @@ class Config {
         return { commandLineOptions, pathMatch };
     }
     static async parseConfigFile(configPath, rootPath) {
+        const configFileOptions = {};
         const configFilePath = Config.resolveConfigFilePath(configPath, rootPath);
-        const configFileOptions = {
-            rootPath: rootPath ?? Path.dirname(configFilePath),
-        };
         if (existsSync(configFilePath)) {
             const configFileText = await fs.readFile(configFilePath, {
                 encoding: "utf8",
@@ -1611,12 +1606,13 @@ class Config {
             const configFileParser = new ConfigParser(configFileOptions, 4, sourceFile, new JsonScanner(sourceFile), Config.#onDiagnostics);
             await configFileParser.parse();
         }
-        return { configFileOptions, configFilePath };
+        return { configFileOptions };
     }
     static resolve(options) {
         const resolvedConfig = {
-            configFilePath: Config.resolveConfigFilePath(options?.configFilePath),
+            configFilePath: Config.resolveConfigFilePath(options?.commandLineOptions?.config, options?.commandLineOptions?.root),
             pathMatch: options?.pathMatch ?? [],
+            rootPath: Config.resolveRootPath(options?.commandLineOptions?.root),
             ...defaultOptions,
             ...options?.configFileOptions,
             ...options?.commandLineOptions,
@@ -1629,11 +1625,13 @@ class Config {
         }
         return resolvedConfig;
     }
-    static resolveConfigFilePath(configPath, rootPath = ".") {
-        if (configPath != null) {
-            return Path.resolve(configPath);
-        }
-        return Path.resolve(rootPath, "./tstyche.config.json");
+    static resolveConfigFilePath(configPath, rootPath) {
+        return configPath != null
+            ? Path.resolve(configPath)
+            : Path.resolve(Config.resolveRootPath(rootPath), "./tstyche.json");
+    }
+    static resolveRootPath(rootPath) {
+        return Path.resolve(rootPath ?? ".");
     }
 }
 
@@ -1709,13 +1707,13 @@ class Directive {
             sourceFile,
             namespace: { start: comment.pos, end: comment.pos + namespaceText.length, text: namespaceText },
         };
-        const directiveSeparatorText = match?.[2];
-        const directiveText = match?.[3];
+        const directiveSeparatorText = match[2];
+        const directiveText = match[3];
         if (typeof directiveText === "string" && typeof directiveSeparatorText === "string") {
             const start = range.namespace.end + directiveSeparatorText.length;
             range.directive = { start, end: start + directiveText.length, text: directiveText };
-            const argumentSeparatorText = match?.[4];
-            const argumentText = match?.[5]?.trimEnd();
+            const argumentSeparatorText = match[4];
+            const argumentText = match[5]?.trimEnd();
             if (typeof argumentSeparatorText === "string" && typeof argumentText === "string") {
                 const start = range.directive.end + argumentSeparatorText.length;
                 range.argument = { start, end: start + argumentText.length, text: argumentText };
@@ -1747,10 +1745,10 @@ class Directive {
                     const origin = new DiagnosticOrigin(range.argument.start, range.argument.end, range.sourceFile);
                     Directive.#onDiagnostics(Diagnostic.error(text, origin));
                 }
-                inlineConfig[range.directive?.text] = true;
+                inlineConfig[range.directive.text] = true;
                 return;
         }
-        const target = range?.directive ?? range.namespace;
+        const target = range.directive ?? range.namespace;
         const text = DirectiveDiagnosticText.isNotSupported(target.text);
         const origin = new DiagnosticOrigin(target.start, target.end, range.sourceFile);
         Directive.#onDiagnostics(Diagnostic.error(text, origin));
@@ -1874,13 +1872,21 @@ class FileResult {
     }
 }
 
+var ProjectConfigKind;
+(function (ProjectConfigKind) {
+    ProjectConfigKind[ProjectConfigKind["Discovered"] = 0] = "Discovered";
+    ProjectConfigKind[ProjectConfigKind["Default"] = 1] = "Default";
+    ProjectConfigKind[ProjectConfigKind["Provided"] = 2] = "Provided";
+    ProjectConfigKind[ProjectConfigKind["Synthetic"] = 3] = "Synthetic";
+})(ProjectConfigKind || (ProjectConfigKind = {}));
+
 class ProjectResult {
     compilerVersion;
-    projectConfigFilePath;
+    projectConfig;
     results = [];
-    constructor(compilerVersion, projectConfigFilePath) {
+    constructor(compilerVersion, projectConfig) {
         this.compilerVersion = compilerVersion;
-        this.projectConfigFilePath = projectConfigFilePath;
+        this.projectConfig = projectConfig;
     }
 }
 
@@ -1982,10 +1988,10 @@ class ResultHandler {
                 }
                 break;
             case "project:uses": {
-                let projectResult = this.#targetResult.results.get(payload.projectConfigFilePath);
+                let projectResult = this.#targetResult.results.get(payload.projectConfig.specifier);
                 if (!projectResult) {
-                    projectResult = new ProjectResult(payload.compilerVersion, payload.projectConfigFilePath);
-                    this.#targetResult.results.set(payload.projectConfigFilePath, projectResult);
+                    projectResult = new ProjectResult(payload.compilerVersion, payload.projectConfig);
+                    this.#targetResult.results.set(payload.projectConfig.specifier, projectResult);
                 }
                 this.#projectResult = projectResult;
                 break;
@@ -2229,7 +2235,7 @@ class Scribbler {
     }
 }
 
-function addsPackageText(packageVersion, packagePath, options) {
+function addsText(packageVersion, packagePath, options) {
     if (options?.short) {
         return (jsx(Line, { children: jsx(Text, { color: "90", children: packageVersion }) }));
     }
@@ -2563,15 +2569,24 @@ function testNameText(status, name, indent = 0) {
     return (jsx(Line, { indent: indent + 1, children: [jsx(Text, { color: getStatusColor(status), children: statusText }), " ", jsx(Text, { color: "90", children: name })] }));
 }
 
-function usesCompilerText(compilerVersion, projectConfigFilePath, options) {
+function usesText(compilerVersion, projectConfig, options) {
     if (options?.short) {
         return jsx(Text, { color: "34", children: compilerVersion });
     }
-    let projectConfigPathText;
-    if (projectConfigFilePath != null) {
-        projectConfigPathText = (jsx(Text, { color: "90", children: [" with ", Path.relative("", projectConfigFilePath)] }));
+    let projectConfigText;
+    switch (projectConfig.kind) {
+        case 0:
+        case 2:
+            projectConfigText = (jsx(Text, { color: "90", children: [" with ", Path.relative("", projectConfig.specifier)] }));
+            break;
+        case 1:
+            projectConfigText = (jsx(Text, { color: "90", children: [" with ", projectConfig.specifier, " TSConfig"] }));
+            break;
+        case 3:
+            projectConfigText = jsx(Text, { color: "90", children: " with inline TSConfig" });
+            break;
     }
-    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: [jsx(Line, { children: [jsx(Text, { color: "34", children: "uses" }), " TypeScript ", compilerVersion, projectConfigText] }), jsx(Line, {})] }));
 }
 
 function waitingForFileChangesText() {
@@ -2602,7 +2617,7 @@ class DotReporter extends BaseReporter {
     on([event, payload]) {
         switch (event) {
             case "store:adds":
-                OutputService.writeMessage(addsPackageText(payload.packageVersion, payload.packagePath, { short: true }));
+                OutputService.writeMessage(addsText(payload.packageVersion, payload.packagePath, { short: true }));
                 this.#hasReportedAdds = true;
                 break;
             case "store:error":
@@ -2618,7 +2633,7 @@ class DotReporter extends BaseReporter {
                     this.#hasReportedAdds = false;
                 }
                 if (this.resolvedConfig.target.length > 1) {
-                    OutputService.writeMessage(usesCompilerText(payload.compilerVersion, payload.projectConfigFilePath, { short: true }));
+                    OutputService.writeMessage(usesText(payload.compilerVersion, payload.projectConfig, { short: true }));
                 }
                 break;
             case "target:end":
@@ -2692,7 +2707,7 @@ class ListReporter extends BaseReporter {
                     this.resolvedConfig.verbose || (payload.result.files.length === 1 && this.resolvedConfig.watch !== true);
                 break;
             case "store:adds":
-                OutputService.writeMessage(addsPackageText(payload.packageVersion, payload.packagePath));
+                OutputService.writeMessage(addsText(payload.packageVersion, payload.packagePath));
                 this.#hasReportedAdds = true;
                 break;
             case "store:error":
@@ -2705,9 +2720,10 @@ class ListReporter extends BaseReporter {
                 this.#hasReportedUses = false;
                 break;
             case "project:uses":
-                OutputService.writeMessage(usesCompilerText(payload.compilerVersion, payload.projectConfigFilePath, {
-                    prependEmptyLine: this.#hasReportedUses && !this.#hasReportedAdds && !this.#hasReportedError,
-                }));
+                if (this.#hasReportedUses && !(this.#hasReportedAdds || this.#hasReportedError)) {
+                    OutputService.writeBlankLine();
+                }
+                OutputService.writeMessage(usesText(payload.compilerVersion, payload.projectConfig));
                 this.#hasReportedAdds = false;
                 this.#hasReportedUses = true;
                 break;
@@ -2802,7 +2818,7 @@ class ListReporter extends BaseReporter {
 class SetupReporter {
     on([event, payload]) {
         if (event === "store:adds") {
-            OutputService.writeMessage(addsPackageText(payload.packageVersion, payload.packagePath));
+            OutputService.writeMessage(addsText(payload.packageVersion, payload.packagePath));
             return;
         }
         if ("diagnostics" in payload) {
@@ -3562,11 +3578,11 @@ class SuppressedLayer {
     #collectSuppressedErrors(text) {
         const ranges = [];
         for (const match of text.matchAll(this.#expectErrorRegex)) {
-            const offsetText = match?.[1];
-            const directiveText = match?.[2];
-            const ignoreText = match?.[3];
-            const argumentSeparatorText = match?.[4];
-            const argumentText = match?.[5]?.split(/--+/)[0]?.trimEnd();
+            const offsetText = match[1];
+            const directiveText = match[2];
+            const ignoreText = match[3];
+            const argumentSeparatorText = match[4];
+            const argumentText = match[5]?.split(/--+/)[0]?.trimEnd();
             if (typeof offsetText !== "string" || !directiveText) {
                 continue;
             }
@@ -4051,7 +4067,9 @@ var TestTreeNodeFlags;
 
 class ProjectService {
     #compiler;
+    #host;
     #lastSeenProject = "";
+    #projectConfig;
     #resolvedConfig;
     #seenPrograms = new WeakSet();
     #seenTestFiles = new Set();
@@ -4059,6 +4077,7 @@ class ProjectService {
     constructor(compiler, resolvedConfig) {
         this.#compiler = compiler;
         this.#resolvedConfig = resolvedConfig;
+        this.#projectConfig = this.#resolveProjectConfig(resolvedConfig.tsconfig);
         const noop = () => undefined;
         const noopLogger = {
             close: noop,
@@ -4074,8 +4093,8 @@ class ProjectService {
         const noopWatcher = {
             close: noop,
         };
-        const host = {
-            ...this.#compiler.sys,
+        this.#host = {
+            ...compiler.sys,
             clearImmediate,
             clearTimeout,
             setImmediate,
@@ -4083,10 +4102,13 @@ class ProjectService {
             watchDirectory: () => noopWatcher,
             watchFile: () => noopWatcher,
         };
+        if (this.#projectConfig.kind === 3) {
+            this.#host.readFile = (path) => path === this.#projectConfig.specifier ? resolvedConfig.tsconfig : compiler.sys.readFile(path);
+        }
         this.#service = new this.#compiler.server.ProjectService({
             allowLocalPluginLoads: true,
             cancellationToken: this.#compiler.server.nullCancellationToken,
-            host,
+            host: this.#host,
             logger: noopLogger,
             session: undefined,
             useInferredProjectPerProjectRoot: true,
@@ -4140,29 +4162,44 @@ class ProjectService {
         return project?.getLanguageService(true);
     }
     #isFileIncluded(filePath) {
-        const configSourceFile = this.#compiler.readJsonConfigFile(this.#resolvedConfig.tsconfig, this.#compiler.sys.readFile);
-        const { fileNames } = this.#compiler.parseJsonSourceFileConfigFileContent(configSourceFile, this.#compiler.sys, Path.dirname(this.#resolvedConfig.tsconfig), undefined, this.#resolvedConfig.tsconfig);
+        const configSourceFile = this.#compiler.readJsonConfigFile(this.#projectConfig.specifier, this.#host.readFile);
+        const { fileNames } = this.#compiler.parseJsonSourceFileConfigFileContent(configSourceFile, this.#host, Path.dirname(this.#projectConfig.specifier), undefined, this.#projectConfig.specifier);
         return fileNames.includes(filePath);
     }
+    #resolveProjectConfig(specifier) {
+        if (specifier === "baseline") {
+            return { kind: 1, specifier: "baseline" };
+        }
+        if (specifier === "findup") {
+            return { kind: 0, specifier: "" };
+        }
+        if (Options.isJsonString(specifier)) {
+            return {
+                kind: 3,
+                specifier: Path.resolve(this.#resolvedConfig.rootPath, `${Math.random().toString(32).slice(2)}.tsconfig.json`),
+            };
+        }
+        return { kind: 2, specifier };
+    }
     openFile(filePath, sourceText) {
-        switch (this.#resolvedConfig.tsconfig) {
-            case "findup":
+        switch (this.#projectConfig.kind) {
+            case 0:
                 break;
-            case "ignore":
+            case 1:
                 this.#service.getConfigFileNameForFile = () => undefined;
                 break;
             default:
                 this.#service.getConfigFileNameForFile = this.#isFileIncluded(filePath)
-                    ? () => this.#resolvedConfig.tsconfig
+                    ? () => this.#projectConfig.specifier
                     : () => undefined;
         }
         const { configFileErrors, configFileName } = this.#service.openClientFile(filePath, sourceText, undefined, this.#resolvedConfig.rootPath);
         if (configFileName !== this.#lastSeenProject) {
             this.#lastSeenProject = configFileName;
-            EventEmitter.dispatch([
-                "project:uses",
-                { compilerVersion: this.#compiler.version, projectConfigFilePath: configFileName },
-            ]);
+            const projectConfig = configFileName != null
+                ? { ...this.#projectConfig, specifier: configFileName }
+                : { kind: 1, specifier: "baseline" };
+            EventEmitter.dispatch(["project:uses", { compilerVersion: this.#compiler.version, projectConfig }]);
             if (configFileErrors && configFileErrors.length > 0) {
                 EventEmitter.dispatch([
                     "project:error",
@@ -5557,7 +5594,7 @@ class ExpectService {
             return;
         }
         const matchWorker = new MatchWorker(this.#compiler, this.#program, assertionNode);
-        if (!(matcherNameText === "toRaiseError" && assertionNode.isNot === false) &&
+        if (!(matcherNameText === "toRaiseError" && !assertionNode.isNot) &&
             this.#reject.argumentType([
                 ["source", assertionNode.source[0]],
                 ["target", assertionNode.target?.[0]],
@@ -5623,10 +5660,10 @@ class Reject {
     constructor(compiler, program, resolvedConfig) {
         this.#compiler = compiler;
         this.#typeChecker = program.getTypeChecker();
-        if (resolvedConfig?.rejectAnyType) {
+        if (resolvedConfig.rejectAnyType) {
             this.#rejectedArgumentTypes.add("any");
         }
-        if (resolvedConfig?.rejectNeverType) {
+        if (resolvedConfig.rejectNeverType) {
             this.#rejectedArgumentTypes.add("never");
         }
     }
@@ -5756,11 +5793,11 @@ class FixmeService {
         let isFail;
         if (owner === FixmeService.#expectRange?.owner) {
             isFail = FixmeService.#expectRange.isFail;
-            FixmeService.#expectRange = FixmeService.#expectRange?.previous;
+            FixmeService.#expectRange = FixmeService.#expectRange.previous;
         }
         if (owner === FixmeService.#range?.owner) {
-            isFail = FixmeService.#range?.isFail;
-            FixmeService.#range = FixmeService.#range?.previous;
+            isFail = FixmeService.#range.isFail;
+            FixmeService.#range = FixmeService.#range.previous;
         }
         if (isFail === false) {
             const text = [FixmeDiagnosticText.wasSupposedToFail(owner.brand), FixmeDiagnosticText.considerRemoving()];
@@ -6028,7 +6065,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "6.2.0";
+    static version = "7.0.0-beta.0";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -6115,7 +6152,17 @@ class Runner {
     }
 }
 
+class CliDiagnosticText {
+    static configLocationChanged(oldConfigFilePath, newConfigFilePath) {
+        return [
+            "The default configuration file location has changed.",
+            `The discovered file has been automatically renamed from '${Path.relative(".", oldConfigFilePath)}' to '${Path.relative(".", newConfigFilePath)}'.`,
+        ];
+    }
+}
+
 class Cli {
+    #deferredDiagnostics;
     #eventEmitter = new EventEmitter();
     #noErrorExitCode;
     constructor(options) {
@@ -6156,6 +6203,14 @@ class Cli {
         if (cancellationToken.isCancellationRequested()) {
             return;
         }
+        if (!commandLineOptions.config) {
+            const oldConfigFilePath = Path.resolve(Config.resolveRootPath(commandLineOptions.root), "./tstyche.config.json");
+            if (existsSync(oldConfigFilePath) && !environmentOptions.isCi) {
+                const newConfigFilePath = Path.resolve(Config.resolveConfigFilePath(undefined, commandLineOptions.root));
+                await fs.rename(oldConfigFilePath, newConfigFilePath);
+                this.#deferredDiagnostics = Diagnostic.warning(CliDiagnosticText.configLocationChanged(oldConfigFilePath, newConfigFilePath));
+            }
+        }
         do {
             if (cancellationToken.getReason() === "configChange") {
                 cancellationToken.reset();
@@ -6164,13 +6219,8 @@ class Cli {
                 this.#eventEmitter.addHandler(cancellationHandler);
                 this.#eventEmitter.addReporter(setupReporter);
             }
-            const { configFileOptions, configFilePath } = await Config.parseConfigFile(commandLineOptions.config, commandLineOptions.root);
-            const resolvedConfig = Config.resolve({
-                configFileOptions,
-                configFilePath,
-                commandLineOptions,
-                pathMatch,
-            });
+            const { configFileOptions } = await Config.parseConfigFile(commandLineOptions.config, commandLineOptions.root);
+            const resolvedConfig = Config.resolve({ configFileOptions, commandLineOptions, pathMatch });
             if (cancellationToken.isCancellationRequested()) {
                 if (commandLine.includes("--watch")) {
                     await this.#waitForChangedFiles(resolvedConfig, cancellationToken);
@@ -6198,7 +6248,7 @@ class Cli {
                 }
             }
             if (commandLine.includes("--listFiles")) {
-                OutputService.writeMessage(formattedText(testFiles.map((testFile) => testFile.toString())));
+                OutputService.writeMessage(formattedText(testFiles));
                 continue;
             }
             this.#eventEmitter.removeHandler(cancellationHandler);
@@ -6206,6 +6256,10 @@ class Cli {
             const runner = new Runner(resolvedConfig);
             await runner.run(testFiles, cancellationToken);
         } while (cancellationToken.getReason() === "configChange");
+        if (this.#deferredDiagnostics != null) {
+            OutputService.writeBlankLine();
+            OutputService.writeWarning(diagnosticText(this.#deferredDiagnostics));
+        }
         this.#eventEmitter.removeHandlers();
     }
     #waitForChangedFiles(resolvedConfig, cancellationToken) {
@@ -6236,4 +6290,4 @@ class Cli {
     }
 }
 
-export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, DotReporter, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, ProjectResult, Result, ResultStatus, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, Store, StreamController, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, dotText, environmentOptions, fileStatusText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, DotReporter, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, ProjectConfigKind, ProjectResult, Result, ResultStatus, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, Store, StreamController, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, dotText, environmentOptions, fileStatusText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesText, waitingForFileChangesText, watchUsageText };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "6.2.0",
+  "version": "7.0.0-beta.0",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",