tstyche 3.1.0 → 3.1.1

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.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 [];
     }
@@ -1083,18 +1086,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;
@@ -1502,6 +1494,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 +1511,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 +1528,6 @@ class Config {
         if ("config" in resolvedConfig) {
             delete resolvedConfig.config;
         }
-        resolvedConfig.target = Target.expand(resolvedConfig.target);
         return resolvedConfig;
     }
     static resolveConfigFilePath(filePath) {
@@ -4273,7 +4270,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "3.1.0";
+    static version = "3.1.1";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -64,7 +64,7 @@
     "@biomejs/biome": "1.9.4",
     "@rollup/plugin-typescript": "12.1.1",
     "@types/node": "22.10.1",
-    "@types/react": "18.3.12",
+    "@types/react": "18.3.13",
     "ajv": "8.17.1",
     "cspell": "8.16.1",
     "magic-string": "0.30.14",