tstyche 4.0.0-beta.7 → 4.0.0-beta.8

package/build/tstyche.js

@@ -3173,27 +3173,27 @@ class IdentifierLookup {
             }
             expression = expression.expression;
         }
-        let identifierName;
+        let identifier;
         if (this.#compiler.isPropertyAccessExpression(expression) &&
             expression.expression.getText() === this.#identifiers.namespace) {
-            identifierName = expression.name.getText();
+            identifier = expression.name.getText();
         }
         else {
-            identifierName = Object.keys(this.#identifiers.namedImports).find((key) => this.#identifiers.namedImports[key] === expression.getText());
+            identifier = Object.keys(this.#identifiers.namedImports).find((key) => this.#identifiers.namedImports[key] === expression.getText());
         }
-        if (!identifierName) {
+        if (!identifier) {
             return;
         }
-        switch (identifierName) {
+        switch (identifier) {
             case "describe":
-                return { brand: TestTreeNodeBrand.Describe, flags };
+                return { brand: TestTreeNodeBrand.Describe, flags, identifier };
             case "it":
             case "test":
-                return { brand: TestTreeNodeBrand.Test, flags };
+                return { brand: TestTreeNodeBrand.Test, flags, identifier };
             case "expect":
-                return { brand: TestTreeNodeBrand.Expect, flags };
+                return { brand: TestTreeNodeBrand.Expect, flags, identifier };
             case "when":
-                return { brand: TestTreeNodeBrand.When, flags };
+                return { brand: TestTreeNodeBrand.When, flags, identifier };
         }
         return;
     }
@@ -3232,6 +3232,7 @@ class WhenNode extends TestTreeNode {
 class CollectService {
     #abilityLayer;
     #compiler;
+    #identifierLookup;
     #projectService;
     #resolvedConfig;
     #testTree;
@@ -3240,14 +3241,15 @@ class CollectService {
         this.#projectService = projectService;
         this.#resolvedConfig = resolvedConfig;
         this.#abilityLayer = new AbilityLayer(compiler, this.#projectService, this.#resolvedConfig);
+        this.#identifierLookup = new IdentifierLookup(compiler);
     }
-    #collectTestTreeNodes(node, identifiers, parent) {
+    #collectTestTreeNodes(node, parent) {
         if (this.#compiler.isCallExpression(node)) {
-            const meta = identifiers.resolveTestMemberMeta(node);
+            const meta = this.#identifierLookup.resolveTestMemberMeta(node);
             if (meta != null && (meta.brand === TestTreeNodeBrand.Describe || meta.brand === TestTreeNodeBrand.Test)) {
                 const testTreeNode = new TestTreeNode(this.#compiler, meta.brand, node, parent, meta.flags);
                 this.#compiler.forEachChild(node, (node) => {
-                    this.#collectTestTreeNodes(node, identifiers, testTreeNode);
+                    this.#collectTestTreeNodes(node, testTreeNode);
                 });
                 this.#onNode(testTreeNode, parent);
                 return;
@@ -3269,7 +3271,7 @@ class CollectService {
                 const assertionNode = new AssertionNode(this.#compiler, meta.brand, node, parent, meta.flags, matcherNode, matcherNameNode, modifierNode, notNode);
                 this.#abilityLayer.handleAssertion(assertionNode);
                 this.#compiler.forEachChild(node, (node) => {
-                    this.#collectTestTreeNodes(node, identifiers, assertionNode);
+                    this.#collectTestTreeNodes(node, assertionNode);
                 });
                 this.#onNode(assertionNode, parent);
                 return;
@@ -3285,9 +3287,9 @@ class CollectService {
                 }
                 this.#compiler.forEachChild(actionNode, (node) => {
                     if (this.#compiler.isCallExpression(node)) {
-                        const meta = identifiers.resolveTestMemberMeta(node);
+                        const meta = this.#identifierLookup.resolveTestMemberMeta(node);
                         if (meta != null && (meta.brand === TestTreeNodeBrand.Describe || meta.brand === TestTreeNodeBrand.Test)) {
-                            const text = CollectDiagnosticText.cannotBeNestedWithin(node.expression.getText(), "when");
+                            const text = CollectDiagnosticText.cannotBeNestedWithin(meta.identifier, "when");
                             const origin = DiagnosticOrigin.fromNode(node);
                             this.#onDiagnostics(Diagnostic.error(text, origin));
                         }
@@ -3300,11 +3302,11 @@ class CollectService {
             }
         }
         if (this.#compiler.isImportDeclaration(node)) {
-            identifiers.handleImportDeclaration(node);
+            this.#identifierLookup.handleImportDeclaration(node);
             return;
         }
         this.#compiler.forEachChild(node, (node) => {
-            this.#collectTestTreeNodes(node, identifiers, parent);
+            this.#collectTestTreeNodes(node, parent);
         });
     }
     createTestTree(sourceFile, semanticDiagnostics = []) {
@@ -3312,7 +3314,7 @@ class CollectService {
         EventEmitter.dispatch(["collect:start", { tree: testTree }]);
         this.#testTree = testTree;
         this.#abilityLayer.open(sourceFile);
-        this.#collectTestTreeNodes(sourceFile, new IdentifierLookup(this.#compiler), testTree);
+        this.#collectTestTreeNodes(sourceFile, testTree);
         this.#abilityLayer.close();
         this.#testTree = undefined;
         EventEmitter.dispatch(["collect:end", { tree: testTree }]);
@@ -3362,6 +3364,7 @@ class ProjectService {
     #lastSeenProject = "";
     #resolvedConfig;
     #seenPrograms = new WeakSet();
+    #seenTestFiles = new Set();
     #service;
     constructor(compiler, resolvedConfig) {
         this.#compiler = compiler;
@@ -3399,15 +3402,6 @@ 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) {
@@ -3442,7 +3436,23 @@ class ProjectService {
         const project = this.getDefaultProject(filePath);
         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);
+        return fileNames.includes(filePath);
+    }
     openFile(filePath, sourceText, projectRootPath) {
+        switch (this.#resolvedConfig.tsconfig) {
+            case "findup":
+                break;
+            case "ignore":
+                this.#service.getConfigFileNameForFile = () => undefined;
+                break;
+            default:
+                this.#service.getConfigFileNameForFile = this.#isFileIncluded(filePath)
+                    ? () => this.#resolvedConfig.tsconfig
+                    : () => undefined;
+        }
         const { configFileErrors, configFileName } = this.#service.openClientFile(filePath, sourceText, undefined, projectRootPath);
         if (configFileName !== this.#lastSeenProject) {
             this.#lastSeenProject = configFileName;
@@ -3457,29 +3467,29 @@ class ProjectService {
                 { diagnostics: Diagnostic.fromDiagnostics(configFileErrors) },
             ]);
         }
-        if (this.#resolvedConfig.checkSourceFiles && !sourceText) {
+        if (this.#resolvedConfig.checkSourceFiles && !this.#seenTestFiles.has(filePath)) {
+            this.#seenTestFiles.add(filePath);
             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()) {
+            const sourceFilesToCheck = program.getSourceFiles().filter((sourceFile) => {
                 if (program.isSourceFileFromExternalLibrary(sourceFile) || program.isSourceFileDefaultLibrary(sourceFile)) {
-                    continue;
+                    return false;
                 }
-                if (!Select.isTestFile(sourceFile.fileName, { ...this.#resolvedConfig, pathMatch: [] })) {
-                    filesToCheck.push(sourceFile);
+                if (Select.isTestFile(sourceFile.fileName, { ...this.#resolvedConfig, pathMatch: [] })) {
+                    return false;
                 }
-            }
+                return true;
+            });
             const diagnostics = [];
-            for (const sourceFile of filesToCheck) {
+            for (const sourceFile of sourceFilesToCheck) {
                 diagnostics.push(...program.getSyntacticDiagnostics(sourceFile), ...program.getSemanticDiagnostics(sourceFile));
             }
             if (diagnostics.length > 0) {
                 EventEmitter.dispatch(["project:error", { diagnostics: Diagnostic.fromDiagnostics(diagnostics) }]);
-                return;
             }
         }
     }
@@ -4587,7 +4597,7 @@ class TestTreeWalker {
             EventEmitter.dispatch(["test:pass", { result: testResult }]);
         }
     }
-    #visitWhen(when, _runMode, _parentResult) {
+    #visitWhen(when, runMode, parentResult) {
         if (when.abilityDiagnostics != null && when.abilityDiagnostics.size > 0) {
             const diagnostics = [];
             for (const diagnostic of when.abilityDiagnostics) {
@@ -4610,6 +4620,7 @@ class TestTreeWalker {
             EventEmitter.dispatch(["task:error", { diagnostics, result: this.#taskResult }]);
             return;
         }
+        this.visit(when.children, runMode, parentResult);
     }
 }
 
@@ -4625,6 +4636,9 @@ class TaskRunner {
         this.#projectService = new ProjectService(compiler, this.#resolvedConfig);
         this.#collectService = new CollectService(compiler, this.#projectService, this.#resolvedConfig);
     }
+    #onDiagnostics(diagnostics, result) {
+        EventEmitter.dispatch(["task:error", { diagnostics, result }]);
+    }
     async run(task, cancellationToken) {
         if (cancellationToken.isCancellationRequested) {
             return;
@@ -4638,19 +4652,13 @@ class TaskRunner {
     }
     async #run(task, taskResult, cancellationToken) {
         if (!existsSync(task.filePath)) {
-            EventEmitter.dispatch([
-                "task:error",
-                { diagnostics: [Diagnostic.error(`Test file '${task.filePath}' does not exist.`)], result: taskResult },
-            ]);
+            this.#onDiagnostics([Diagnostic.error(`Test file '${task.filePath}' does not exist.`)], taskResult);
             return;
         }
         let languageService = this.#projectService.getLanguageService(task.filePath);
         const syntacticDiagnostics = languageService?.getSyntacticDiagnostics(task.filePath);
         if (syntacticDiagnostics != null && syntacticDiagnostics.length > 0) {
-            EventEmitter.dispatch([
-                "task:error",
-                { diagnostics: Diagnostic.fromDiagnostics(syntacticDiagnostics), result: taskResult },
-            ]);
+            this.#onDiagnostics(Diagnostic.fromDiagnostics(syntacticDiagnostics), taskResult);
             return;
         }
         let semanticDiagnostics = languageService?.getSemanticDiagnostics(task.filePath);
@@ -4658,21 +4666,20 @@ class TaskRunner {
         let sourceFile = program?.getSourceFile(task.filePath);
         if (sourceFile?.text.startsWith("// @tstyche-template")) {
             if (semanticDiagnostics != null && semanticDiagnostics.length > 0) {
-                EventEmitter.dispatch([
-                    "task:error",
-                    { diagnostics: Diagnostic.fromDiagnostics(semanticDiagnostics), result: taskResult },
-                ]);
+                this.#onDiagnostics(Diagnostic.fromDiagnostics(semanticDiagnostics), taskResult);
+                return;
+            }
+            const moduleSpecifier = pathToFileURL(task.filePath).toString();
+            const testText = (await import(moduleSpecifier))?.default;
+            if (typeof testText !== "string") {
+                this.#onDiagnostics([Diagnostic.error("A template test file must export a string.")], taskResult);
                 return;
             }
-            const text = (await import(task.filePath)).default;
-            this.#projectService.openFile(task.filePath, text, this.#resolvedConfig.rootPath);
+            this.#projectService.openFile(task.filePath, testText, this.#resolvedConfig.rootPath);
             languageService = this.#projectService.getLanguageService(task.filePath);
             const syntacticDiagnostics = languageService?.getSyntacticDiagnostics(task.filePath);
             if (syntacticDiagnostics != null && syntacticDiagnostics.length > 0) {
-                EventEmitter.dispatch([
-                    "task:error",
-                    { diagnostics: Diagnostic.fromDiagnostics(syntacticDiagnostics), result: taskResult },
-                ]);
+                this.#onDiagnostics(Diagnostic.fromDiagnostics(syntacticDiagnostics), taskResult);
                 return;
             }
             semanticDiagnostics = languageService?.getSemanticDiagnostics(task.filePath);
@@ -4690,10 +4697,7 @@ class TaskRunner {
             return;
         }
         if (testTree.diagnostics.size > 0) {
-            EventEmitter.dispatch([
-                "task:error",
-                { diagnostics: Diagnostic.fromDiagnostics([...testTree.diagnostics]), result: taskResult },
-            ]);
+            this.#onDiagnostics(Diagnostic.fromDiagnostics([...testTree.diagnostics]), taskResult);
             return;
         }
         const typeChecker = program?.getTypeChecker();
@@ -4710,7 +4714,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "4.0.0-beta.7";
+    static version = "4.0.0-beta.8";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.8",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -65,7 +65,7 @@
     "@types/node": "22.15.3",
     "@types/react": "19.1.2",
     "ajv": "8.17.1",
-    "cspell": "8.19.4",
+    "cspell": "9.0.0",
     "magic-string": "0.30.17",
     "monocart-coverage-reports": "2.12.4",
     "pretty-ansi": "3.0.0",