tstyche 5.0.0-beta.2 → 5.0.0-beta.3

package/build/tstyche.d.ts

@@ -615,6 +615,8 @@ declare class OutputService {
     static writeWarning(element: ScribblerJsx.Element | Array<ScribblerJsx.Element>): void;
 }
 
+declare function prologueText(runnerVersion: string, rootPath: string): ScribblerJsx.Element;
+
 interface SummaryTextOptions {
     targetCounts: ResultCounts;
     fileCounts: ResultCounts;
@@ -731,5 +733,5 @@ declare class Version {
     static isSatisfiedWith(source: string, target: string): boolean;
 }
 
-export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, Result, ResultStatus, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, Store, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileStatusText, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, Result, ResultStatus, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, Store, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileStatusText, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
 export type { AssertionCounts, AssertionResultStatus, CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, EnvironmentOptions, Event, EventHandler, FileCounts, FileResultStatus, InlineConfig, ItemDefinition, OptionDefinition, Plugin, Reporter, ReporterEvent, ResolvedConfig, ResultCounts, ResultTiming, ScribblerOptions, SelectHookContext, SuppressedCounts, SuppressedResultStatus, TargetCounts, TargetResultStatus, TestCounts, TestResultStatus, TextRange };

package/build/tstyche.js

@@ -968,7 +968,7 @@ class Store {
             modulePath = Path.resolve(modulePath, "../tsserverlibrary.js");
         }
         const sourceText = await fs.readFile(modulePath, { encoding: "utf8" });
-        const toExpose = ["isApplicableIndexType", "isTypeIdenticalTo"];
+        const toExpose = ["isTypeIdenticalTo"];
         const modifiedSourceText = sourceText.replace("return checker;", `return { ...checker, ${toExpose.join(", ")} };`);
         const compiledWrapper = vm.compileFunction(modifiedSourceText, ["exports", "require", "module", "__filename", "__dirname"], { filename: modulePath });
         compiledWrapper(exports, createRequire(modulePath), module, modulePath, Path.dirname(modulePath));
@@ -2491,6 +2491,10 @@ class OutputService {
     }
 }
 
+function prologueText(runnerVersion, rootPath) {
+    return (jsx(Text, { children: [jsx(Line, { children: [jsx(Text, { color: "90", children: "····" }), " TSTyche ", runnerVersion, jsx(Text, { color: "90", children: [" at ", rootPath] })] }), jsx(Line, {})] }));
+}
+
 function RowText({ label, text }) {
     return (jsx(Line, { children: [`${label}:`.padEnd(12), text] }));
 }
@@ -3305,6 +3309,7 @@ class AbilityLayer {
         const expectExpressionEnd = expect.node.expression.getEnd();
         const expectEnd = expect.node.getEnd();
         const matcherNameEnd = expect.matcherNameNode.getEnd();
+        const matcherNodeEnd = expect.matcherNode.getEnd();
         switch (expect.matcherNameNode.name.text) {
             case "toBeApplicable":
                 this.#nodes.push(expect);
@@ -3344,18 +3349,71 @@ class AbilityLayer {
                 }
                 break;
             }
-            case "toBeConstructableWith":
+            case "toBeConstructableWith": {
                 this.#nodes.push(expect);
-                this.#editor.eraseTrailingComma(expect.source);
-                this.#editor.replaceRanges([
-                    [
-                        expectStart,
-                        expectExpressionEnd,
-                        nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode) ? "; new" : "new",
-                    ],
-                    [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) ? "; new" : "new",
+                        ],
+                        [expectEnd, matcherNameEnd],
+                    ]);
+                }
+                else {
+                    const sourceText = sourceNode.getFullText();
+                    this.#editor.replaceRanges([
+                        [
+                            expectStart,
+                            matcherNameEnd,
+                            nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode)
+                                ? `;new (undefined as any as ${sourceText})`
+                                : `new (undefined as any as ${sourceText})`,
+                        ],
+                    ]);
+                }
                 break;
+            }
+            case "toHaveProperty": {
+                this.#nodes.push(expect);
+                const sourceNode = expect.source[0];
+                const targetNode = expect.target?.[0];
+                if (!sourceNode || !targetNode) {
+                    return;
+                }
+                const sourceText = sourceNode.getFullText();
+                const targetText = targetNode.getFullText();
+                if (nodeBelongsToArgumentList(this.#compiler, sourceNode)) {
+                    this.#editor.eraseTrailingComma(expect.source);
+                    this.#editor.replaceRanges([
+                        [
+                            expectStart,
+                            matcherNodeEnd,
+                            nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode)
+                                ? `;(${sourceText})[${targetText}]`
+                                : `(${sourceText})[${targetText}]`,
+                        ],
+                    ]);
+                }
+                else {
+                    this.#editor.replaceRanges([
+                        [
+                            expectStart,
+                            matcherNodeEnd,
+                            nodeIsChildOfExpressionStatement(this.#compiler, expect.matcherNode)
+                                ? `;(undefined as any as ${sourceText})[${targetText}]`
+                                : `(undefined as any as ${sourceText})[${targetText}]`,
+                        ],
+                    ]);
+                }
+                break;
+            }
         }
     }
     visitWhen(when) {
@@ -4303,19 +4361,6 @@ class MatchWorker {
         this.typeChecker = typeChecker;
         this.assertionNode = assertionNode;
     }
-    checkHasApplicableIndexType(sourceNode, targetNode) {
-        const sourceType = this.getType(sourceNode);
-        const targetType = this.getType(targetNode);
-        return this.typeChecker
-            .getIndexInfosOfType(sourceType)
-            .some(({ keyType }) => this.typeChecker.isApplicableIndexType(targetType, keyType));
-    }
-    checkHasProperty(sourceNode, propertyNameText) {
-        const sourceType = this.getType(sourceNode);
-        return sourceType
-            .getProperties()
-            .some((property) => this.#compiler.unescapeLeadingUnderscores(property.escapedName) === propertyNameText);
-    }
     checkIsAssignableTo(sourceNode, targetNode) {
         return this.#checkIsRelatedTo(sourceNode, targetNode, "assignable");
     }
@@ -4771,16 +4816,8 @@ class ToBeConstructableWith extends AbilityMatcherBase {
     explainText = ExpectDiagnosticText.isConstructable;
     explainNotText = ExpectDiagnosticText.isNotConstructable;
     match(matchWorker, sourceNode, targetNodes, onDiagnostics) {
-        let type;
-        if (this.compiler.isCallExpression(sourceNode)) {
-            type = matchWorker.typeChecker.getResolvedSignature(sourceNode)?.getReturnType();
-        }
-        if (this.compiler.isExpressionWithTypeArguments(sourceNode) ||
-            this.compiler.isIdentifier(sourceNode) ||
-            this.compiler.isPropertyAccessExpression(sourceNode)) {
-            type = matchWorker.getType(sourceNode);
-        }
-        if (!type || type.getConstructSignatures().length === 0) {
+        const sourceType = matchWorker.getType(sourceNode);
+        if (sourceType.getConstructSignatures().length === 0) {
             const text = [];
             if (nodeBelongsToArgumentList(this.compiler, sourceNode)) {
                 text.push(ExpectDiagnosticText.argumentMustBe("source", "a constructable expression"));
@@ -4788,7 +4825,7 @@ class ToBeConstructableWith extends AbilityMatcherBase {
             else {
                 text.push(ExpectDiagnosticText.typeArgumentMustBe("Source", "a constructable type"));
             }
-            if (type != null && type.getCallSignatures().length > 0) {
+            if (sourceType.getCallSignatures().length > 0) {
                 text.push(ExpectDiagnosticText.didYouMeanToUse("the '.toBeCallableWith()' matcher"));
             }
             const origin = DiagnosticOrigin.fromNode(sourceNode);
@@ -4835,14 +4872,7 @@ class ToHaveProperty {
             diagnostics.push(Diagnostic.error(text, origin));
         }
         const targetType = matchWorker.getType(targetNode);
-        let propertyNameText = "";
-        if (isStringOrNumberLiteralType(this.#compiler, targetType)) {
-            propertyNameText = targetType.value.toString();
-        }
-        else if (isUniqueSymbolType(this.#compiler, targetType)) {
-            propertyNameText = this.#compiler.unescapeLeadingUnderscores(targetType.escapedName);
-        }
-        else {
+        if (!(isStringOrNumberLiteralType(this.#compiler, targetType) || isUniqueSymbolType(this.#compiler, targetType))) {
             const expectedText = "of type 'string | number | symbol'";
             const text = ExpectDiagnosticText.argumentMustBe("key", expectedText);
             const origin = DiagnosticOrigin.fromNode(targetNode);
@@ -4852,11 +4882,9 @@ class ToHaveProperty {
             onDiagnostics(diagnostics);
             return;
         }
-        const isMatch = matchWorker.checkHasProperty(sourceNode, propertyNameText) ||
-            matchWorker.checkHasApplicableIndexType(sourceNode, targetNode);
         return {
             explain: () => this.#explain(matchWorker, sourceNode, targetNode),
-            isMatch,
+            isMatch: matchWorker.assertionNode.abilityDiagnostics.size === 0,
         };
     }
 }
@@ -5241,7 +5269,7 @@ class TestTreeWalker {
             }
             const fixmeDirective = Directive.getDirectiveRange(this.#compiler, node, "fixme");
             if (fixmeDirective) {
-                FixmeService.start(fixmeDirective, node);
+                await FixmeService.start(fixmeDirective, node);
             }
             switch (node.brand) {
                 case "describe":
@@ -5454,7 +5482,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "5.0.0-beta.2";
+    static version = "5.0.0-beta.3";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -5492,6 +5520,9 @@ class Runner {
         }
     }
     async run(files, cancellationToken = new CancellationToken()) {
+        if (!this.#resolvedConfig.watch) {
+            OutputService.writeMessage(prologueText(Runner.version, this.#resolvedConfig.rootPath));
+        }
         const fileLocations = files.map((file) => (file instanceof FileLocation ? file : new FileLocation(file)));
         this.#addHandlers(cancellationToken);
         await this.#addReporters();
@@ -5654,4 +5685,4 @@ class Cli {
     }
 }
 
-export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, Result, ResultStatus, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, Store, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileStatusText, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, Result, ResultStatus, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, Store, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsPackageText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileStatusText, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };

package/package.json

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