tstyche 4.2.0 → 4.3.0

package/build/tstyche.d.ts

@@ -43,6 +43,7 @@ interface ConfigFileOptions {
     checkSourceFiles?: boolean;
     checkSuppressedErrors?: boolean;
     failFast?: boolean;
+    fixtureFileMatch?: Array<string>;
     plugins?: Array<string>;
     rejectAnyType?: boolean;
     rejectNeverType?: boolean;
@@ -95,13 +96,13 @@ declare class ConfigDiagnosticText {
     static expectsListItemType(optionName: string, optionBrand: OptionBrand): string;
     static expectsValue(optionName: string): string;
     static fileDoesNotExist(filePath: string): string;
+    static fileMatchPatternCannotStartWith(optionName: string, segment: string): Array<string>;
     static inspectSupportedVersions(): string;
     static moduleWasNotFound(specifier: string): string;
     static rangeIsNotValid(value: string): string;
     static rangeUsage(): Array<string>;
     static requiresValueType(optionName: string, optionBrand: OptionBrand): string;
     static seen(element: string): string;
-    static testFileMatchCannotStartWith(segment: string): Array<string>;
     static unexpected(element: string): string;
     static unknownOption(optionName: string): string;
     static usage(optionName: string, optionBrand: OptionBrand): Array<string>;
@@ -722,6 +723,7 @@ declare class Runner {
 
 declare class Select {
     #private;
+    static isFixtureFile(filePath: string, resolvedConfig: ResolvedConfig): boolean;
     static isTestFile(filePath: string, resolvedConfig: ResolvedConfig): boolean;
     static selectFiles(resolvedConfig: ResolvedConfig): Promise<Array<string>>;
 }

package/build/tstyche.js

@@ -225,6 +225,12 @@ class ConfigDiagnosticText {
     static fileDoesNotExist(filePath) {
         return `The specified path '${filePath}' does not exist.`;
     }
+    static fileMatchPatternCannotStartWith(optionName, segment) {
+        return [
+            `A '${optionName}' pattern cannot start with '${segment}'.`,
+            "The files are only collected within the 'rootPath' directory.",
+        ];
+    }
     static inspectSupportedVersions() {
         return "Use the '--list' command line option to inspect the list of supported versions.";
     }
@@ -247,12 +253,6 @@ class ConfigDiagnosticText {
     static seen(element) {
         return `The ${element} was seen here.`;
     }
-    static testFileMatchCannotStartWith(segment) {
-        return [
-            `A test file match pattern cannot start with '${segment}'.`,
-            "The test files are only collected within the 'rootPath' directory.",
-        ];
-    }
     static unexpected(element) {
         return `Unexpected ${element}.`;
     }
@@ -934,6 +934,16 @@ class Options {
             group: OptionGroup.CommandLine,
             name: "fetch",
         },
+        {
+            brand: OptionBrand.List,
+            description: "The list of glob patterns matching the fixture files.",
+            group: OptionGroup.ConfigFile,
+            items: {
+                brand: OptionBrand.String,
+                name: "fixtureFileMatch",
+            },
+            name: "fixtureFileMatch",
+        },
         {
             brand: OptionBrand.BareTrue,
             description: "Print the list of command line options with brief descriptions and exit.",
@@ -1147,10 +1157,11 @@ class Options {
                 }
                 break;
             }
+            case "fixtureFileMatch":
             case "testFileMatch":
                 for (const segment of ["/", "../"]) {
                     if (optionValue.startsWith(segment)) {
-                        onDiagnostics(Diagnostic.error(ConfigDiagnosticText.testFileMatchCannotStartWith(segment), origin));
+                        onDiagnostics(Diagnostic.error(ConfigDiagnosticText.fileMatchPatternCannotStartWith(canonicalOptionName, segment), origin));
                     }
                 }
                 break;
@@ -1402,6 +1413,7 @@ const defaultOptions = {
     checkSourceFiles: true,
     checkSuppressedErrors: false,
     failFast: false,
+    fixtureFileMatch: ["**/__fixtures__/*.{ts,tsx}", "**/fixtures/*.{ts,tsx}"],
     plugins: [],
     rejectAnyType: true,
     rejectNeverType: true,
@@ -2916,6 +2928,10 @@ class Select {
         }
         return matchPatterns.includedFile.test(filePath);
     }
+    static isFixtureFile(filePath, resolvedConfig) {
+        const matchPatterns = Select.#getMatchPatterns(resolvedConfig.fixtureFileMatch);
+        return Select.#isFileIncluded(Path.relative(resolvedConfig.rootPath, filePath), matchPatterns, resolvedConfig);
+    }
     static isTestFile(filePath, resolvedConfig) {
         const matchPatterns = Select.#getMatchPatterns(resolvedConfig.testFileMatch);
         return Select.#isFileIncluded(Path.relative(resolvedConfig.rootPath, filePath), matchPatterns, resolvedConfig);
@@ -3750,7 +3766,7 @@ class ProjectService {
                 { diagnostics: Diagnostic.fromDiagnostics(configFileErrors) },
             ]);
         }
-        if (this.#resolvedConfig.checkSourceFiles && !this.#seenTestFiles.has(filePath)) {
+        if (!this.#seenTestFiles.has(filePath)) {
             this.#seenTestFiles.add(filePath);
             const languageService = this.getLanguageService(filePath);
             const program = languageService?.getProgram();
@@ -3762,10 +3778,13 @@ class ProjectService {
                 if (program.isSourceFileFromExternalLibrary(sourceFile) || program.isSourceFileDefaultLibrary(sourceFile)) {
                     return false;
                 }
+                if (Select.isFixtureFile(sourceFile.fileName, { ...this.#resolvedConfig, pathMatch: [] })) {
+                    return true;
+                }
                 if (Select.isTestFile(sourceFile.fileName, { ...this.#resolvedConfig, pathMatch: [] })) {
                     return false;
                 }
-                return true;
+                return this.#resolvedConfig.checkSourceFiles;
             });
             const diagnostics = [];
             for (const sourceFile of sourceFilesToCheck) {
@@ -5084,7 +5103,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "4.2.0";
+    static version = "4.3.0";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",