tstyche 5.0.0-beta.1 → 5.0.0-beta.2

package/build/4.x/index.d.cts

@@ -218,11 +218,11 @@ declare const describe: Describe;
 /**
  * Defines a single test.
  */
-declare const test: Test;
+declare const it: Test;
 /**
  * Defines a single test.
  */
-declare const it: Test;
+declare const test: Test;
 interface Actions {
     /**
      * Calls the given function with the provided arguments.

package/build/4.x/index.d.ts

@@ -218,11 +218,11 @@ declare const describe: Describe;
 /**
  * Defines a single test.
  */
-declare const test: Test;
+declare const it: Test;
 /**
  * Defines a single test.
  */
-declare const it: Test;
+declare const test: Test;
 interface Actions {
     /**
      * Calls the given function with the provided arguments.

package/build/index.d.cts

@@ -222,11 +222,11 @@ declare const describe: Describe;
 /**
  * Defines a single test.
  */
-declare const test: Test;
+declare const it: Test;
 /**
  * Defines a single test.
  */
-declare const it: Test;
+declare const test: Test;
 interface Actions {
     /**
      * Calls the given function with the provided arguments.

package/build/index.d.ts

@@ -222,11 +222,11 @@ declare const describe: Describe;
 /**
  * Defines a single test.
  */
-declare const test: Test;
+declare const it: Test;
 /**
  * Defines a single test.
  */
-declare const it: Test;
+declare const test: Test;
 interface Actions {
     /**
      * Calls the given function with the provided arguments.

package/build/tstyche.d.ts

@@ -9,9 +9,9 @@ declare enum CancellationReason {
 
 declare class CancellationToken {
     #private;
-    get isCancellationRequested(): boolean;
-    get reason(): CancellationReason | undefined;
     cancel(reason: CancellationReason): void;
+    isCancellationRequested(): boolean;
+    getReason(): CancellationReason | undefined;
     reset(): void;
 }
 
@@ -35,6 +35,7 @@ interface SuppressedError {
 declare enum TestTreeNodeBrand {
     Describe = "describe",
     Test = "test",
+    It = "it",
     Expect = "expect",
     When = "when"
 }

package/build/tstyche.js

@@ -2595,9 +2595,6 @@ class FileView {
     #indent = 0;
     #lines = [];
     #messages = [];
-    get hasErrors() {
-        return this.#messages.length > 0;
-    }
     addMessage(message) {
         this.#messages.push(message);
     }
@@ -2620,7 +2617,10 @@ class FileView {
         return this.#messages;
     }
     getViewText(options) {
-        return fileViewText(this.#lines, options?.appendEmptyLine || this.hasErrors);
+        return fileViewText(this.#lines, options?.appendEmptyLine || this.hasErrors());
+    }
+    hasErrors() {
+        return this.#messages.length > 0;
     }
 }
 
@@ -2631,7 +2631,7 @@ class ListReporter extends BaseReporter {
     #hasReportedError = false;
     #hasReportedUses = false;
     #isFileViewExpanded = false;
-    get #isLastFile() {
+    #isLastFile() {
         return this.#fileCount === 0;
     }
     on([event, payload]) {
@@ -2684,8 +2684,8 @@ class ListReporter extends BaseReporter {
                     OutputService.eraseLastLine();
                 }
                 OutputService.writeMessage(fileStatusText(payload.result.status, payload.result.file));
-                OutputService.writeMessage(this.#fileView.getViewText({ appendEmptyLine: this.#isLastFile }));
-                if (this.#fileView.hasErrors) {
+                OutputService.writeMessage(this.#fileView.getViewText({ appendEmptyLine: this.#isLastFile() }));
+                if (this.#fileView.hasErrors()) {
                     OutputService.writeError(this.#fileView.getMessages());
                     this.#hasReportedError = true;
                 }
@@ -2829,18 +2829,18 @@ var CancellationReason;
 class CancellationToken {
     #isCancelled = false;
     #reason;
-    get isCancellationRequested() {
-        return this.#isCancelled;
-    }
-    get reason() {
-        return this.#reason;
-    }
     cancel(reason) {
         if (!this.#isCancelled) {
             this.#isCancelled = true;
             this.#reason = reason;
         }
     }
+    isCancellationRequested() {
+        return this.#isCancelled;
+    }
+    getReason() {
+        return this.#reason;
+    }
     reset() {
         if (this.#isCancelled) {
             this.#isCancelled = false;
@@ -3225,7 +3225,7 @@ class WatchService {
         for (const watcher of this.#watchers) {
             watcher.watch();
         }
-        while (!cancellationToken.isCancellationRequested) {
+        while (!cancellationToken.isCancellationRequested()) {
             const testFiles = await debounce.schedule();
             if (testFiles.length > 0) {
                 yield testFiles;
@@ -3257,6 +3257,9 @@ function deepCompareKeys(a, b, keys) {
     }
     return true;
 }
+function nodeBelongsToArgumentList(compiler, node) {
+    return compiler.isCallExpression(node.parent) && node.parent.arguments.some((argument) => argument === node);
+}
 function nodeIsChildOfExpressionStatement(compiler, node) {
     return compiler.isExpressionStatement(node.parent);
 }
@@ -3310,18 +3313,37 @@ class AbilityLayer {
                     [expectEnd, matcherNameEnd],
                 ]);
                 break;
-            case "toBeCallableWith":
+            case "toBeCallableWith": {
                 this.#nodes.push(expect);
-                this.#editor.eraseTrailingComma(expect.source);
-                this.#editor.replaceRanges([
-                    [
-                        expectStart,
-                        expectExpressionEnd,
-                        nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode) ? ";" : "",
-                    ],
-                    [expectEnd, matcherNameEnd],
-                ]);
+                const sourceNode = expect.source[0];
+                if (!sourceNode) {
+                    return;
+                }
+                if (nodeBelongsToArgumentList(this.#compiler, sourceNode)) {
+                    this.#editor.eraseTrailingComma(expect.source);
+                    this.#editor.replaceRanges([
+                        [
+                            expectStart,
+                            expectExpressionEnd,
+                            nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode) ? ";" : "",
+                        ],
+                        [expectEnd, matcherNameEnd],
+                    ]);
+                }
+                else {
+                    const sourceText = sourceNode.getFullText();
+                    this.#editor.replaceRanges([
+                        [
+                            expectStart,
+                            matcherNameEnd,
+                            nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode)
+                                ? `;(undefined as any as ${sourceText})`
+                                : `(undefined as any as ${sourceText})`,
+                        ],
+                    ]);
+                }
                 break;
+            }
             case "toBeConstructableWith":
                 this.#nodes.push(expect);
                 this.#editor.eraseTrailingComma(expect.source);
@@ -3675,14 +3697,15 @@ class IdentifierLookup {
         }
         switch (identifier) {
             case "describe":
-                return { brand: "describe", flags, identifier };
+                return { brand: "describe", flags };
             case "it":
+                return { brand: "it", flags };
             case "test":
-                return { brand: "test", flags, identifier };
+                return { brand: "test", flags };
             case "expect":
-                return { brand: "expect", flags, identifier };
+                return { brand: "expect", flags };
             case "when":
-                return { brand: "when", flags, identifier };
+                return { brand: "when", flags };
         }
         return;
     }
@@ -3735,7 +3758,9 @@ class CollectService {
                 if (!this.#checkNode(node, meta, parent)) {
                     return;
                 }
-                if (meta.brand === "describe" || meta.brand === "test") {
+                if (meta.brand === "describe" ||
+                    meta.brand === "it" ||
+                    meta.brand === "test") {
                     const testTreeNode = new TestTreeNode(this.#compiler, meta.brand, node, parent, meta.flags);
                     this.#compiler.forEachChild(node, (node) => {
                         this.#collectTestTreeNodes(node, testTreeNode, testTree);
@@ -3746,15 +3771,24 @@ class CollectService {
                 if (meta.brand === "expect") {
                     const modifierNode = this.#getChainedNode(node, "type");
                     if (!modifierNode) {
+                        const text = "'expect()' must be followed by the '.type' modifier.";
+                        const origin = DiagnosticOrigin.fromNode(node);
+                        this.#onDiagnostics(Diagnostic.error(text, origin));
                         return;
                     }
                     const notNode = this.#getChainedNode(modifierNode, "not");
                     const matcherNameNode = this.#getChainedNode(notNode ?? modifierNode);
                     if (!matcherNameNode) {
+                        const text = "The final element in the chain must be a matcher.";
+                        const origin = DiagnosticOrigin.fromNode(notNode ?? modifierNode);
+                        this.#onDiagnostics(Diagnostic.error(text, origin));
                         return;
                     }
                     const matcherNode = this.#getMatcherNode(matcherNameNode);
                     if (!matcherNode) {
+                        const text = "The matcher must be called with an argument.";
+                        const origin = DiagnosticOrigin.fromNode(matcherNameNode);
+                        this.#onDiagnostics(Diagnostic.error(text, origin));
                         return;
                     }
                     const expectNode = new ExpectNode(this.#compiler, meta.brand, node, parent, meta.flags, matcherNode, matcherNameNode, modifierNode, notNode);
@@ -3768,17 +3802,25 @@ class CollectService {
                 if (meta.brand === "when") {
                     const actionNameNode = this.#getChainedNode(node);
                     if (!actionNameNode) {
+                        const text = "The final element in the chain must be an action.";
+                        const origin = DiagnosticOrigin.fromNode(node);
+                        this.#onDiagnostics(Diagnostic.error(text, origin));
                         return;
                     }
                     const actionNode = this.#getActionNode(actionNameNode);
                     if (!actionNode) {
+                        const text = "The action must be called with an argument.";
+                        const origin = DiagnosticOrigin.fromNode(actionNameNode);
+                        this.#onDiagnostics(Diagnostic.error(text, origin));
                         return;
                     }
                     this.#compiler.forEachChild(actionNode, (node) => {
                         if (this.#compiler.isCallExpression(node)) {
                             const meta = this.#identifierLookup.resolveTestTreeNodeMeta(node);
-                            if (meta?.brand === "describe" || meta?.brand === "test") {
-                                const text = CollectDiagnosticText.cannotBeNestedWithin(meta.identifier, "when");
+                            if (meta?.brand === "describe" ||
+                                meta?.brand === "it" ||
+                                meta?.brand === "test") {
+                                const text = CollectDiagnosticText.cannotBeNestedWithin(meta.brand, "when");
                                 const origin = DiagnosticOrigin.fromNode(node);
                                 this.#onDiagnostics(Diagnostic.error(text, origin));
                             }
@@ -3811,7 +3853,7 @@ class CollectService {
     }
     #checkNode(node, meta, parent) {
         if ("brand" in parent && !this.#isNodeAllowed(meta, parent)) {
-            const text = CollectDiagnosticText.cannotBeNestedWithin(meta.identifier, parent.node.expression.getText());
+            const text = CollectDiagnosticText.cannotBeNestedWithin(meta.brand, parent.brand);
             const origin = DiagnosticOrigin.fromNode(node);
             this.#onDiagnostics(Diagnostic.error(text, origin));
             return false;
@@ -3821,8 +3863,11 @@ class CollectService {
     #isNodeAllowed(meta, parent) {
         switch (meta.brand) {
             case "describe":
+            case "it":
             case "test":
-                if (parent.brand === "test" || parent.brand === "expect") {
+                if (parent.brand === "it" ||
+                    parent.brand === "test" ||
+                    parent.brand === "expect") {
                     return false;
                 }
                 break;
@@ -3874,14 +3919,11 @@ class CollectService {
     }
 }
 
-function nodeBelongsToArgumentList(compiler, node) {
-    return compiler.isCallExpression(node.parent) && node.parent.arguments.some((argument) => argument === node);
-}
-
 var TestTreeNodeBrand;
 (function (TestTreeNodeBrand) {
     TestTreeNodeBrand["Describe"] = "describe";
     TestTreeNodeBrand["Test"] = "test";
+    TestTreeNodeBrand["It"] = "it";
     TestTreeNodeBrand["Expect"] = "expect";
     TestTreeNodeBrand["When"] = "when";
 })(TestTreeNodeBrand || (TestTreeNodeBrand = {}));
@@ -4702,19 +4744,8 @@ class ToBeCallableWith extends AbilityMatcherBase {
     explainText = ExpectDiagnosticText.isCallable;
     explainNotText = ExpectDiagnosticText.isNotCallable;
     match(matchWorker, sourceNode, targetNodes, onDiagnostics) {
-        let type;
-        if (this.compiler.isCallExpression(sourceNode)) {
-            type = matchWorker.typeChecker.getResolvedSignature(sourceNode)?.getReturnType();
-        }
-        if (this.compiler.isArrowFunction(sourceNode) ||
-            this.compiler.isFunctionDeclaration(sourceNode) ||
-            this.compiler.isFunctionExpression(sourceNode) ||
-            this.compiler.isExpressionWithTypeArguments(sourceNode) ||
-            this.compiler.isIdentifier(sourceNode) ||
-            this.compiler.isPropertyAccessExpression(sourceNode)) {
-            type = matchWorker.getType(sourceNode);
-        }
-        if (!type || type.getCallSignatures().length === 0) {
+        const sourceType = matchWorker.getType(sourceNode);
+        if (sourceType.getCallSignatures().length === 0) {
             const text = [];
             if (nodeBelongsToArgumentList(this.compiler, sourceNode)) {
                 text.push(ExpectDiagnosticText.argumentMustBe("source", "a callable expression"));
@@ -4722,7 +4753,7 @@ class ToBeCallableWith extends AbilityMatcherBase {
             else {
                 text.push(ExpectDiagnosticText.typeArgumentMustBe("Source", "a callable type"));
             }
-            if (type != null && type.getConstructSignatures().length > 0) {
+            if (sourceType.getConstructSignatures().length > 0) {
                 text.push(ExpectDiagnosticText.didYouMeanToUse("the '.toBeConstructableWith()' matcher"));
             }
             const origin = DiagnosticOrigin.fromNode(sourceNode);
@@ -5153,8 +5184,7 @@ class FixmeService {
             FixmeService.#range = FixmeService.#range?.previous;
         }
         if (isFail === false) {
-            const targetText = owner.node.expression.getText();
-            const text = [FixmeDiagnosticText.wasSupposedToFail(targetText), FixmeDiagnosticText.considerRemoving()];
+            const text = [FixmeDiagnosticText.wasSupposedToFail(owner.brand), FixmeDiagnosticText.considerRemoving()];
             const origin = new DiagnosticOrigin(directive.namespace.start, directive.directive.end, directive.sourceFile);
             onFileDiagnostics([Diagnostic.error(text, origin)]);
         }
@@ -5206,7 +5236,7 @@ class TestTreeWalker {
     }
     async visit(nodes, runModeFlags, parentResult) {
         for (const node of nodes) {
-            if (this.#cancellationToken?.isCancellationRequested) {
+            if (this.#cancellationToken?.isCancellationRequested()) {
                 break;
             }
             const fixmeDirective = Directive.getDirectiveRange(this.#compiler, node, "fixme");
@@ -5217,6 +5247,7 @@ class TestTreeWalker {
                 case "describe":
                     await this.#visitDescribe(node, runModeFlags, parentResult);
                     break;
+                case "it":
                 case "test":
                     await this.#visitTest(node, runModeFlags, parentResult);
                     break;
@@ -5348,7 +5379,7 @@ class FileRunner {
         EventEmitter.dispatch(["file:error", { diagnostics, result }]);
     }
     async run(file, cancellationToken) {
-        if (cancellationToken.isCancellationRequested) {
+        if (cancellationToken.isCancellationRequested()) {
             return;
         }
         this.#projectService.openFile(file.path);
@@ -5423,7 +5454,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "5.0.0-beta.1";
+    static version = "5.0.0-beta.2";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -5487,7 +5518,7 @@ class Runner {
             EventEmitter.dispatch(["target:end", { result: targetResult }]);
         }
         EventEmitter.dispatch(["run:end", { result }]);
-        if (cancellationToken.reason === "failFast") {
+        if (cancellationToken.getReason() === "failFast") {
             cancellationToken.reset();
         }
     }
@@ -5533,11 +5564,11 @@ class Cli {
             return;
         }
         const { commandLineOptions, pathMatch } = await Config.parseCommandLine(commandLine);
-        if (cancellationToken.isCancellationRequested) {
+        if (cancellationToken.isCancellationRequested()) {
             return;
         }
         do {
-            if (cancellationToken.reason === "configChange") {
+            if (cancellationToken.getReason() === "configChange") {
                 cancellationToken.reset();
                 exitCodeHandler.resetCode();
                 OutputService.clearTerminal();
@@ -5551,7 +5582,7 @@ class Cli {
                 commandLineOptions,
                 pathMatch,
             });
-            if (cancellationToken.isCancellationRequested) {
+            if (cancellationToken.isCancellationRequested()) {
                 if (commandLine.includes("--watch")) {
                     await this.#waitForChangedFiles(resolvedConfig, cancellationToken);
                 }
@@ -5592,7 +5623,7 @@ class Cli {
             const runner = new Runner(resolvedConfig);
             await runner.run(testFiles, cancellationToken);
             PluginService.removeHandlers();
-        } while (cancellationToken.reason === "configChange");
+        } while (cancellationToken.getReason() === "configChange");
         this.#eventEmitter.removeHandlers();
     }
     #waitForChangedFiles(resolvedConfig, cancellationToken) {

package/package.json

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