tstyche 3.0.0-beta.4 → 3.0.0-beta.5

package/build/tstyche.d.ts

@@ -178,6 +178,10 @@ interface ConfigFileOptions {
      * The list of glob patterns matching the test files.
      */
     testFileMatch?: Array<string>;
+    /**
+     * The look up strategy to be used to find the TSConfig file.
+     */
+    tsconfig?: string;
 }
 
 /**
@@ -232,6 +236,10 @@ interface CommandLineOptions {
      * The list of TypeScript versions to be tested on.
      */
     target?: Array<string>;
+    /**
+     * The look up strategy to be used to find the TSConfig file.
+     */
+    tsconfig?: string;
     /**
      * Fetch the 'typescript' package metadata from the registry and exit.
      */
@@ -443,10 +451,10 @@ type TargetResultStatus = ResultStatus.Runs | ResultStatus.Passed | ResultStatus
 declare class TargetResult {
     results: Map<string | undefined, ProjectResult>;
     status: TargetResultStatus;
+    target: string;
     tasks: Array<Task>;
     timing: ResultTiming;
-    versionTag: string;
-    constructor(versionTag: string, tasks: Array<Task>);
+    constructor(target: string, tasks: Array<Task>);
 }
 
 declare class Result {
@@ -843,7 +851,7 @@ declare class Path {
 
 declare class ProjectService {
     #private;
-    constructor(compiler: typeof ts);
+    constructor(resolvedConfig: ResolvedConfig, compiler: typeof ts);
     closeFile(filePath: string): void;
     getDefaultProject(filePath: string): ts.server.Project | undefined;
     getLanguageService(filePath: string): ts.LanguageService | undefined;

package/build/tstyche.js

@@ -850,6 +850,10 @@ class OptionValidator {
     }
     async check(optionName, optionValue, optionBrand, origin) {
         switch (optionName) {
+            case "tsconfig":
+                if (["findup", "ignore"].includes(optionValue)) {
+                    break;
+                }
             case "config":
             case "rootPath":
                 if (!existsSync(optionValue)) {
@@ -1001,6 +1005,12 @@ class Options {
             },
             name: "testFileMatch",
         },
+        {
+            brand: "string",
+            description: "The look up strategy to be used to find the TSConfig file.",
+            group: 2 | 4,
+            name: "tsconfig",
+        },
         {
             brand: "bareTrue",
             description: "Fetch the 'typescript' package metadata from the registry and exit.",
@@ -1117,7 +1127,8 @@ class CommandLineParser {
                 break;
             case "string":
                 if (optionValue !== "") {
-                    if (optionDefinition.name === "config") {
+                    if (optionDefinition.name === "config" ||
+                        (optionDefinition.name === "tsconfig" && !["findup", "ignore"].includes(optionValue))) {
                         optionValue = Path.resolve(optionValue);
                     }
                     await this.#optionValidator.check(optionDefinition.name, optionValue, optionDefinition.brand);
@@ -1311,7 +1322,8 @@ class ConfigFileParser {
                         optionValue = pathToFileURL(Path.join(configFilePath, optionValue)).toString();
                     }
                 }
-                if (optionDefinition.name === "rootPath") {
+                if (optionDefinition.name === "rootPath" ||
+                    (optionDefinition.name === "tsconfig" && !["findup", "ignore"].includes(optionValue))) {
                     optionValue = Path.resolve(Path.dirname(this.#sourceFile.fileName), optionValue);
                 }
                 await this.#optionValidator.check(optionDefinition.name, optionValue, optionDefinition.brand, jsonNode.origin);
@@ -1420,6 +1432,7 @@ const defaultOptions = {
     rootPath: Path.resolve("./"),
     target: environmentOptions.typescriptPath != null ? ["current"] : ["latest"],
     testFileMatch: ["**/*.tst.*", "**/__typetests__/*.test.*", "**/typetests/*.test.*"],
+    tsconfig: "findup",
 };
 
 class Config {
@@ -1596,11 +1609,11 @@ var ResultStatus;
 class TargetResult {
     results = new Map();
     status = "runs";
+    target;
     tasks;
     timing = new ResultTiming();
-    versionTag;
-    constructor(versionTag, tasks) {
-        this.versionTag = versionTag;
+    constructor(target, tasks) {
+        this.target = target;
         this.tasks = tasks;
     }
 }
@@ -2460,7 +2473,7 @@ class Task {
     filePath;
     position;
     constructor(filePath, position) {
-        this.filePath = Path.normalizeSlashes(this.#toPath(filePath));
+        this.filePath = Path.resolve(this.#toPath(filePath));
         this.position = position;
     }
     #toPath(filePath) {
@@ -3087,8 +3100,10 @@ var TestMemberFlags;
 
 class ProjectService {
     #compiler;
+    #resolvedConfig;
     #service;
-    constructor(compiler) {
+    constructor(resolvedConfig, compiler) {
+        this.#resolvedConfig = resolvedConfig;
         this.#compiler = compiler;
         const noop = () => undefined;
         const noopLogger = {
@@ -3123,6 +3138,15 @@ class ProjectService {
             useInferredProjectPerProjectRoot: true,
             useSingleInferredProject: false,
         });
+        switch (this.#resolvedConfig.tsconfig) {
+            case "findup":
+                break;
+            case "ignore":
+                this.#service.getConfigFileNameForFile = () => undefined;
+                break;
+            default:
+                this.#service.getConfigFileNameForFile = () => this.#resolvedConfig.tsconfig;
+        }
         this.#service.setCompilerOptionsForInferredProjects(this.#getDefaultCompilerOptions());
     }
     closeFile(filePath) {
@@ -4038,7 +4062,7 @@ class TaskRunner {
         this.#resolvedConfig = resolvedConfig;
         this.#compiler = compiler;
         this.#collectService = new CollectService(compiler);
-        this.#projectService = new ProjectService(compiler);
+        this.#projectService = new ProjectService(this.#resolvedConfig, compiler);
     }
     run(task, cancellationToken) {
         if (cancellationToken?.isCancellationRequested === true) {
@@ -4052,6 +4076,13 @@ class TaskRunner {
         this.#projectService.closeFile(task.filePath);
     }
     #run(task, taskResult, cancellationToken) {
+        if (!existsSync(task.filePath)) {
+            EventEmitter.dispatch([
+                "task:error",
+                { diagnostics: [Diagnostic.error(`Test file '${task.filePath}' does not exist.`)], result: taskResult },
+            ]);
+            return;
+        }
         const languageService = this.#projectService.getLanguageService(task.filePath);
         if (!languageService) {
             return;
@@ -4095,7 +4126,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "3.0.0-beta.4";
+    static version = "3.0.0-beta.5";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -4143,10 +4174,10 @@ class Runner {
     async #run(tasks, cancellationToken) {
         const result = new Result(this.#resolvedConfig, tasks);
         EventEmitter.dispatch(["run:start", { result }]);
-        for (const versionTag of this.#resolvedConfig.target) {
-            const targetResult = new TargetResult(versionTag, tasks);
+        for (const target of this.#resolvedConfig.target) {
+            const targetResult = new TargetResult(target, tasks);
             EventEmitter.dispatch(["target:start", { result: targetResult }]);
-            const compiler = await Store.load(versionTag);
+            const compiler = await Store.load(target);
             if (compiler) {
                 const taskRunner = new TaskRunner(this.#resolvedConfig, compiler);
                 for (const task of tasks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -61,12 +61,12 @@
     "test:unit": "yarn test:run **/__tests__/*.test.js --parallel"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.3",
+    "@biomejs/biome": "1.9.4",
     "@rollup/plugin-typescript": "12.1.1",
-    "@types/node": "20.16.11",
+    "@types/node": "20.16.14",
     "@types/react": "18.3.11",
     "ajv": "8.17.1",
-    "cspell": "8.15.3",
+    "cspell": "8.15.4",
     "magic-string": "0.30.12",
     "monocart-coverage-reports": "2.11.1",
     "pretty-ansi": "2.0.0",
@@ -83,7 +83,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.5.0",
+  "packageManager": "yarn@4.5.1",
   "engines": {
     "node": ">=18.17"
   }