tstyche 3.1.0 → 3.2.0

package/README.md

@@ -64,10 +64,10 @@ Here is the list of all matchers:
 
 ## Runner
 
-The `tstyche` command is the heart of TSTyche. For example, it can select test files by path, filter tests by name and pass them through TypeScript `4.8` and `latest`:
+The `tstyche` command is the heart of TSTyche. For example, it can select test files by path, filter tests by name and pass them through a range of TypeScript versions:
 
-```sh
-tstyche JsonObject --only external --target 4.8,latest
+```shell
+tstyche query-params --only multiple --target '>=5.0 <5.3'
 ```
 
 This simple! (And it has watch mode too.)

package/build/tstyche.d.ts

@@ -152,6 +152,10 @@ declare class ConfigDiagnosticText {
  * Options loaded from the configuration file.
  */
 interface ConfigFileOptions {
+    /**
+     * Enable type error reporting for source files.
+     */
+    checkSourceFiles?: boolean;
     /**
      * Stop running tests after the first failed assertion.
      */
@@ -867,4 +871,4 @@ declare class WatchService {
     watch(cancellationToken: CancellationToken): AsyncIterable<Array<Task>>;
 }
 
-export { Assertion, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, type CommandLineOptions, Config, ConfigDiagnosticText, type ConfigFileOptions, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, type DiagnosticsHandler, type EnvironmentOptions, type Event, EventEmitter, type EventHandler, ExitCodeHandler, ExpectResult, ExpectService, type FileWatchHandler, FileWatcher, type InputHandler, InputService, type ItemDefinition, Line, ListReporter, type MatchResult, OptionBrand, type OptionDefinition, OptionGroup, Options, OutputService, Path, type Plugin, PluginService, ProjectResult, ProjectService, type Reporter, type ReporterEvent, type ResolvedConfig, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, ScribblerJsx, type ScribblerOptions, Select, SelectDiagnosticText, SetupReporter, SourceFile, Store, SummaryReporter, TargetResult, type TargetResultStatus, Task, TaskResult, type TaskResultStatus, TestMember, TestMemberBrand, TestMemberFlags, TestResult, TestTree, Text, type TypeChecker, Version, type WatchHandler, WatchReporter, WatchService, Watcher, type WatcherOptions, addsPackageText, defaultOptions, describeNameText, diagnosticText, environmentOptions, fileViewText, formattedText, helpText, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { Assertion, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, type CommandLineOptions, Config, ConfigDiagnosticText, type ConfigFileOptions, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, type DiagnosticsHandler, type EnvironmentOptions, type Event, EventEmitter, type EventHandler, ExitCodeHandler, ExpectResult, ExpectService, type FileWatchHandler, FileWatcher, type InputHandler, InputService, type ItemDefinition, Line, ListReporter, type MatchResult, OptionBrand, type OptionDefinition, OptionGroup, Options, OutputService, Path, type Plugin, PluginService, ProjectResult, ProjectService, type Reporter, type ReporterEvent, type ResolvedConfig, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, ScribblerJsx, type ScribblerOptions, Select, SelectDiagnosticText, type SelectHookContext, SetupReporter, SourceFile, Store, SummaryReporter, TargetResult, type TargetResultStatus, Task, TaskResult, type TaskResultStatus, TestMember, TestMemberBrand, TestMemberFlags, TestResult, TestTree, Text, type TypeChecker, Version, type WatchHandler, WatchReporter, WatchService, Watcher, type WatcherOptions, addsPackageText, defaultOptions, describeNameText, diagnosticText, environmentOptions, fileViewText, formattedText, helpText, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };

package/build/tstyche.js

@@ -824,13 +824,14 @@ class Store {
 
 class Target {
     static #rangeRegex = /^[<>]=?\d\.\d( [<>]=?\d\.\d)?$/;
-    static expand(queries) {
+    static async expand(queries) {
         const include = [];
         for (const query of queries) {
             if (!Target.isRange(query)) {
                 include.push(query);
                 continue;
             }
+            await Store.open();
             if (Store.manifest != null) {
                 let versions = Object.keys(Store.manifest.resolutions).slice(0, -4);
                 for (const comparator of query.split(" ")) {
@@ -842,14 +843,16 @@ class Target {
         return include;
     }
     static #filter(comparator, versions) {
-        const targetVersionIndex = versions.findIndex((version) => version === comparator.replace(/^[<>]=?/, ""));
-        if (targetVersionIndex !== -1) {
-            switch (comparator.charAt(0)) {
-                case ">":
-                    return versions.slice(comparator.charAt(1) === "=" ? targetVersionIndex : targetVersionIndex + 1);
-                case "<":
-                    return versions.slice(0, comparator.charAt(1) === "=" ? targetVersionIndex + 1 : targetVersionIndex);
-            }
+        const targetVersion = comparator.replace(/^[<>]=?/, "");
+        switch (comparator.charAt(0)) {
+            case ">":
+                return versions.filter((sourceVersion) => comparator.charAt(1) === "="
+                    ? Version.isSatisfiedWith(sourceVersion, targetVersion)
+                    : Version.isGreaterThan(sourceVersion, targetVersion));
+            case "<":
+                return versions.filter((sourceVersion) => comparator.charAt(1) === "="
+                    ? Version.isSatisfiedWith(targetVersion, sourceVersion)
+                    : Version.isGreaterThan(targetVersion, sourceVersion));
         }
         return [];
     }
@@ -866,6 +869,12 @@ class Options {
             group: 4,
             name: "$schema",
         },
+        {
+            brand: "boolean",
+            description: "Enable type error reporting for source files.",
+            group: 4,
+            name: "checkSourceFiles",
+        },
         {
             brand: "string",
             description: "The path to a TSTyche configuration file.",
@@ -1083,18 +1092,7 @@ class Options {
                 break;
             case "target": {
                 if (/[<>=]/.test(optionValue)) {
-                    if (Target.isRange(optionValue)) {
-                        for (const value of optionValue.split(" ").map((value) => value.replace(/^[<>]=?/, ""))) {
-                            if ((await Store.validateTag(value)) === false) {
-                                onDiagnostics(Diagnostic.error([
-                                    ConfigDiagnosticText.versionIsNotSupported(value),
-                                    ...ConfigDiagnosticText.usage(optionName, optionBrand),
-                                    ConfigDiagnosticText.inspectSupportedVersions(),
-                                ], origin));
-                            }
-                        }
-                    }
-                    else {
+                    if (!Target.isRange(optionValue)) {
                         onDiagnostics(Diagnostic.error([ConfigDiagnosticText.rangeIsNotValid(optionValue), ...ConfigDiagnosticText.rangeUsage()], origin));
                     }
                     break;
@@ -1482,6 +1480,7 @@ class ConfigFileParser {
 }
 
 const defaultOptions = {
+    checkSourceFiles: false,
     failFast: false,
     plugins: [],
     rejectAnyType: false,
@@ -1502,6 +1501,9 @@ class Config {
         const pathMatch = [];
         const commandLineParser = new CommandLineParser(commandLineOptions, pathMatch, Config.#onDiagnostics);
         await commandLineParser.parse(commandLine);
+        if (commandLineOptions.target != null) {
+            commandLineOptions.target = await Target.expand(commandLineOptions.target);
+        }
         return { commandLineOptions, pathMatch };
     }
     static async parseConfigFile(filePath) {
@@ -1516,6 +1518,9 @@ class Config {
             const sourceFile = new SourceFile(configFilePath, configFileText);
             const configFileParser = new ConfigFileParser(configFileOptions, sourceFile, Config.#onDiagnostics);
             await configFileParser.parse();
+            if (configFileOptions.target != null) {
+                configFileOptions.target = await Target.expand(configFileOptions.target);
+            }
         }
         return { configFileOptions, configFilePath };
     }
@@ -1530,7 +1535,6 @@ class Config {
         if ("config" in resolvedConfig) {
             delete resolvedConfig.config;
         }
-        resolvedConfig.target = Target.expand(resolvedConfig.target);
         return resolvedConfig;
     }
     static resolveConfigFilePath(filePath) {
@@ -2338,12 +2342,11 @@ class FileView {
 }
 
 class ListReporter extends BaseReporter {
-    #currentCompilerVersion;
-    #currentProjectConfigFilePath;
     #fileCount = 0;
     #fileView = new FileView();
     #hasReportedAdds = false;
     #hasReportedError = false;
+    #hasReportedUses = false;
     #isFileViewExpanded = false;
     #seenDeprecations = new Set();
     get #isLastFile() {
@@ -2374,21 +2377,14 @@ class ListReporter extends BaseReporter {
                 break;
             case "target:start":
                 this.#fileCount = payload.result.tasks.length;
-                break;
-            case "target:end":
-                this.#currentCompilerVersion = undefined;
-                this.#currentProjectConfigFilePath = undefined;
+                this.#hasReportedUses = false;
                 break;
             case "project:uses":
-                if (this.#currentCompilerVersion !== payload.compilerVersion ||
-                    this.#currentProjectConfigFilePath !== payload.projectConfigFilePath) {
-                    OutputService.writeMessage(usesCompilerText(payload.compilerVersion, payload.projectConfigFilePath, {
-                        prependEmptyLine: this.#currentCompilerVersion != null && !this.#hasReportedAdds && !this.#hasReportedError,
-                    }));
-                    this.#hasReportedAdds = false;
-                    this.#currentCompilerVersion = payload.compilerVersion;
-                    this.#currentProjectConfigFilePath = payload.projectConfigFilePath;
-                }
+                OutputService.writeMessage(usesCompilerText(payload.compilerVersion, payload.projectConfigFilePath, {
+                    prependEmptyLine: this.#hasReportedUses && !this.#hasReportedAdds && !this.#hasReportedError,
+                }));
+                this.#hasReportedAdds = false;
+                this.#hasReportedUses = true;
                 break;
             case "project:error":
                 for (const diagnostic of payload.diagnostics) {
@@ -3165,7 +3161,9 @@ var TestMemberFlags;
 
 class ProjectService {
     #compiler;
+    #lastSeenProject = "";
     #resolvedConfig;
+    #seenPrograms = new WeakSet();
     #service;
     constructor(resolvedConfig, compiler) {
         this.#resolvedConfig = resolvedConfig;
@@ -3240,7 +3238,12 @@ class ProjectService {
         return defaultCompilerOptions;
     }
     getDefaultProject(filePath) {
-        return this.#service.getDefaultProjectForFile(this.#compiler.server.toNormalizedPath(filePath), true);
+        const project = this.#service.getDefaultProjectForFile(this.#compiler.server.toNormalizedPath(filePath), true);
+        const compilerOptions = project?.getCompilerOptions();
+        if (this.#resolvedConfig.checkSourceFiles && compilerOptions?.skipLibCheck) {
+            project?.setCompilerOptions({ ...compilerOptions, skipLibCheck: false });
+        }
+        return project;
     }
     getLanguageService(filePath) {
         const project = this.getDefaultProject(filePath);
@@ -3248,16 +3251,47 @@ class ProjectService {
     }
     openFile(filePath, sourceText, projectRootPath) {
         const { configFileErrors, configFileName } = this.#service.openClientFile(filePath, sourceText, undefined, projectRootPath);
-        EventEmitter.dispatch([
-            "project:uses",
-            { compilerVersion: this.#compiler.version, projectConfigFilePath: configFileName },
-        ]);
+        if (configFileName !== this.#lastSeenProject) {
+            this.#lastSeenProject = configFileName;
+            EventEmitter.dispatch([
+                "project:uses",
+                { compilerVersion: this.#compiler.version, projectConfigFilePath: configFileName },
+            ]);
+        }
         if (configFileErrors && configFileErrors.length > 0) {
             EventEmitter.dispatch([
                 "project:error",
                 { diagnostics: Diagnostic.fromDiagnostics(configFileErrors, this.#compiler) },
             ]);
         }
+        if (this.#resolvedConfig.checkSourceFiles) {
+            const languageService = this.getLanguageService(filePath);
+            const program = languageService?.getProgram();
+            if (!program || this.#seenPrograms.has(program)) {
+                return;
+            }
+            this.#seenPrograms.add(program);
+            const filesToCheck = [];
+            for (const sourceFile of program.getSourceFiles()) {
+                if (program.isSourceFileFromExternalLibrary(sourceFile) || program.isSourceFileDefaultLibrary(sourceFile)) {
+                    continue;
+                }
+                if (!Select.isTestFile(sourceFile.fileName, { ...this.#resolvedConfig, pathMatch: [] })) {
+                    filesToCheck.push(sourceFile);
+                }
+            }
+            const diagnostics = [];
+            for (const sourceFile of filesToCheck) {
+                diagnostics.push(...program.getSyntacticDiagnostics(sourceFile), ...program.getSemanticDiagnostics(sourceFile));
+            }
+            if (diagnostics.length > 0) {
+                EventEmitter.dispatch([
+                    "project:error",
+                    { diagnostics: Diagnostic.fromDiagnostics(diagnostics, this.#compiler) },
+                ]);
+                return;
+            }
+        }
     }
 }
 
@@ -4273,7 +4307,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "3.1.0";
+    static version = "3.2.0";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -62,15 +62,15 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@rollup/plugin-typescript": "12.1.1",
-    "@types/node": "22.10.1",
-    "@types/react": "18.3.12",
+    "@rollup/plugin-typescript": "12.1.2",
+    "@types/node": "22.10.2",
+    "@types/react": "19.0.2",
     "ajv": "8.17.1",
-    "cspell": "8.16.1",
-    "magic-string": "0.30.14",
-    "monocart-coverage-reports": "2.11.3",
+    "cspell": "8.17.1",
+    "magic-string": "0.30.17",
+    "monocart-coverage-reports": "2.11.5",
     "pretty-ansi": "3.0.0",
-    "rollup": "4.28.0",
+    "rollup": "4.29.1",
     "rollup-plugin-dts": "6.1.1",
     "tslib": "2.8.1",
     "typescript": "5.7.2"