tstyche 2.0.0-rc.1 → 2.0.0-rc.2

package/build/tstyche.d.ts

@@ -224,46 +224,34 @@ declare enum Color {
     Gray = "90"
 }
 
-type ElementChildren = Array<ElementChildren> | ScribblerJsx.Element | string | undefined;
-type ComponentConstructor = new (props: Record<string, unknown>) => ScribblerJsx.ElementClass;
+type ScribblerNode = Array<ScribblerNode> | ScribblerJsx.Element | string | undefined;
+type FunctionComponent = (props: Record<string, unknown>) => ScribblerJsx.Element;
 declare namespace ScribblerJsx {
     interface Element {
         props: Record<string, unknown>;
-        type: ComponentConstructor | string;
-    }
-    interface ElementAttributesProperty {
-        props: Record<string, unknown>;
-    }
-    interface ElementClass {
-        render: () => ScribblerJsx.Element;
+        type: FunctionComponent | string;
     }
     interface ElementChildrenAttribute {
-        children: ElementChildren;
+        children: ScribblerNode;
     }
     interface IntrinsicElements {
         ansi: {
             escapes: Color | Array<Color>;
         };
-        newLine: {
-            [key: string]: never;
-        };
+        newLine: {};
         text: {
-            children: Array<ElementChildren>;
+            children: Array<ScribblerNode>;
             indent: number;
         };
     }
 }
 
 interface LineProps {
-    children?: ScribblerJsx.ElementChildrenAttribute["children"];
+    children?: ScribblerNode;
     color?: Color;
     indent?: number;
 }
-declare class Line implements ScribblerJsx.ElementClass {
-    props: LineProps;
-    constructor(props: LineProps);
-    render(): ScribblerJsx.Element;
-}
+declare function Line({ children, color, indent }: LineProps): ScribblerJsx.Element;
 
 interface ScribblerOptions {
     newLine?: string;
@@ -276,15 +264,11 @@ declare class Scribbler {
 }
 
 interface TextProps {
-    children?: ScribblerJsx.ElementChildrenAttribute["children"];
+    children?: ScribblerNode;
     color?: Color | undefined;
     indent?: number | undefined;
 }
-declare class Text implements ScribblerJsx.ElementClass {
-    props: TextProps;
-    constructor(props: TextProps);
-    render(): ScribblerJsx.Element;
-}
+declare function Text({ children, color, indent }: TextProps): ScribblerJsx.Element;
 
 declare function addsPackageStepText(compilerVersion: string, installationPath: string): ScribblerJsx.Element;
 

package/build/tstyche.js

@@ -209,28 +209,16 @@ var Color;
     Color["Gray"] = "90";
 })(Color || (Color = {}));
 
-class Text {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const ansiEscapes = [];
-        if (this.props.color != null) {
-            ansiEscapes.push(this.props.color);
-        }
-        return (jsx("text", { indent: this.props.indent ?? 0, children: [ansiEscapes.length > 0 ? jsx("ansi", { escapes: ansiEscapes }) : undefined, this.props.children, ansiEscapes.length > 0 ? jsx("ansi", { escapes: "0" }) : undefined] }));
+function Text({ children, color, indent }) {
+    const ansiEscapes = [];
+    if (color != null) {
+        ansiEscapes.push(color);
     }
+    return (jsx("text", { indent: indent ?? 0, children: [ansiEscapes.length > 0 ? jsx("ansi", { escapes: ansiEscapes }) : undefined, children, ansiEscapes.length > 0 ? jsx("ansi", { escapes: "0" }) : undefined] }));
 }
 
-class Line {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return (jsx(Text, { color: this.props.color, indent: this.props.indent, children: [this.props.children, jsx("newLine", {})] }));
-    }
+function Line({ children, color, indent }) {
+    return (jsx(Text, { color: color, indent: indent, children: [children, jsx("newLine", {})] }));
 }
 
 class Scribbler {
@@ -253,8 +241,7 @@ class Scribbler {
     }
     render(element) {
         if (typeof element.type === "function") {
-            const instance = new element.type({ ...element.props });
-            return this.render(instance.render());
+            return this.render(element.type({ ...element.props }));
         }
         if (element.type === "ansi" && !this.#noColor) {
             return this.#escapeSequence(element.props.escapes);
@@ -295,54 +282,42 @@ function describeNameText(name, indent = 0) {
     return jsx(Line, { indent: indent + 1, children: name });
 }
 
-class CodeSpanText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const lastLineInFile = this.props.sourceFile.getLineAndCharacterOfPosition(this.props.sourceFile.text.length).line;
-        const { character: markedCharacter, line: markedLine } = this.props.sourceFile.getLineAndCharacterOfPosition(this.props.start);
-        const firstLine = Math.max(markedLine - 2, 0);
-        const lastLine = Math.min(firstLine + 5, lastLineInFile);
-        const lineNumberMaxWidth = String(lastLine + 1).length;
-        const codeSpan = [];
-        for (let index = firstLine; index <= lastLine; index++) {
-            const lineStart = this.props.sourceFile.getPositionOfLineAndCharacter(index, 0);
-            const lineEnd = index === lastLineInFile
-                ? this.props.sourceFile.text.length
-                : this.props.sourceFile.getPositionOfLineAndCharacter(index + 1, 0);
-            const lineNumberText = String(index + 1);
-            const lineText = this.props.sourceFile.text.slice(lineStart, lineEnd).trimEnd().replace(/\t/g, " ");
-            if (index === markedLine) {
-                codeSpan.push(jsx(Line, { children: [jsx(Text, { color: "31", children: ">" }), jsx(Text, { children: " " }), lineNumberText.padStart(lineNumberMaxWidth), jsx(Text, { children: " " }), jsx(Text, { color: "90", children: "|" }), " ", lineText] }), jsx(Line, { children: [" ".repeat(lineNumberMaxWidth + 3), jsx(Text, { color: "90", children: "|" }), " ".repeat(markedCharacter + 1), jsx(Text, { color: "31", children: "^" })] }));
-            }
-            else {
-                codeSpan.push(jsx(Line, { children: [" ".repeat(2), jsx(Text, { color: "90", children: [lineNumberText.padStart(lineNumberMaxWidth), " | ", lineText || ""] })] }));
-            }
+function CodeSpanText(diagnosticOrigin) {
+    const lastLineInFile = diagnosticOrigin.sourceFile.getLineAndCharacterOfPosition(diagnosticOrigin.sourceFile.text.length).line;
+    const { character: markedCharacter, line: markedLine } = diagnosticOrigin.sourceFile.getLineAndCharacterOfPosition(diagnosticOrigin.start);
+    const firstLine = Math.max(markedLine - 2, 0);
+    const lastLine = Math.min(firstLine + 5, lastLineInFile);
+    const lineNumberMaxWidth = String(lastLine + 1).length;
+    const codeSpan = [];
+    for (let index = firstLine; index <= lastLine; index++) {
+        const lineStart = diagnosticOrigin.sourceFile.getPositionOfLineAndCharacter(index, 0);
+        const lineEnd = index === lastLineInFile
+            ? diagnosticOrigin.sourceFile.text.length
+            : diagnosticOrigin.sourceFile.getPositionOfLineAndCharacter(index + 1, 0);
+        const lineNumberText = String(index + 1);
+        const lineText = diagnosticOrigin.sourceFile.text.slice(lineStart, lineEnd).trimEnd().replace(/\t/g, " ");
+        if (index === markedLine) {
+            codeSpan.push(jsx(Line, { children: [jsx(Text, { color: "31", children: ">" }), jsx(Text, { children: " " }), lineNumberText.padStart(lineNumberMaxWidth), jsx(Text, { children: " " }), jsx(Text, { color: "90", children: "|" }), " ", lineText] }), jsx(Line, { children: [" ".repeat(lineNumberMaxWidth + 3), jsx(Text, { color: "90", children: "|" }), " ".repeat(markedCharacter + 1), jsx(Text, { color: "31", children: "^" })] }));
+        }
+        else {
+            codeSpan.push(jsx(Line, { children: [" ".repeat(2), jsx(Text, { color: "90", children: [lineNumberText.padStart(lineNumberMaxWidth), " | ", lineText || ""] })] }));
         }
-        const breadcrumbs = this.props.breadcrumbs?.flatMap((ancestor) => [
-            jsx(Text, { color: "90", children: " ❭ " }),
-            jsx(Text, { children: ancestor }),
-        ]);
-        const location = (jsx(Line, { children: [" ".repeat(lineNumberMaxWidth + 5), jsx(Text, { color: "90", children: "at" }), jsx(Text, { children: " " }), jsx(Text, { color: "36", children: Path.relative("", this.props.sourceFile.fileName) }), jsx(Text, { color: "90", children: [":", String(markedLine + 1), ":", String(markedCharacter + 1)] }), breadcrumbs] }));
-        return (jsx(Text, { children: [codeSpan, jsx(Line, {}), location] }));
     }
+    const breadcrumbs = diagnosticOrigin.breadcrumbs?.flatMap((ancestor) => [
+        jsx(Text, { color: "90", children: " ❭ " }),
+        jsx(Text, { children: ancestor }),
+    ]);
+    const location = (jsx(Line, { children: [" ".repeat(lineNumberMaxWidth + 5), jsx(Text, { color: "90", children: "at" }), jsx(Text, { children: " " }), jsx(Text, { color: "36", children: Path.relative("", diagnosticOrigin.sourceFile.fileName) }), jsx(Text, { color: "90", children: [":", String(markedLine + 1), ":", String(markedCharacter + 1)] }), breadcrumbs] }));
+    return (jsx(Text, { children: [codeSpan, jsx(Line, {}), location] }));
 }
 
-class DiagnosticText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const code = typeof this.props.diagnostic.code === "string" ? (jsx(Text, { color: "90", children: [" ", this.props.diagnostic.code] })) : undefined;
-        const text = Array.isArray(this.props.diagnostic.text) ? this.props.diagnostic.text : [this.props.diagnostic.text];
-        const message = text.map((text, index) => (jsx(Text, { children: [index === 1 ? jsx(Line, {}) : undefined, jsx(Line, { children: [text, code] })] })));
-        const related = this.props.diagnostic.related?.map((relatedDiagnostic) => (jsx(DiagnosticText, { diagnostic: relatedDiagnostic })));
-        const codeSpan = this.props.diagnostic.origin ? (jsx(Text, { children: [jsx(Line, {}), jsx(CodeSpanText, { ...this.props.diagnostic.origin })] })) : undefined;
-        return (jsx(Text, { children: [message, codeSpan, jsx(Line, {}), jsx(Text, { indent: 2, children: related })] }));
-    }
+function DiagnosticText({ diagnostic }) {
+    const code = typeof diagnostic.code === "string" ? jsx(Text, { color: "90", children: [" ", diagnostic.code] }) : undefined;
+    const text = Array.isArray(diagnostic.text) ? diagnostic.text : [diagnostic.text];
+    const message = text.map((text, index) => (jsx(Text, { children: [index === 1 ? jsx(Line, {}) : undefined, jsx(Line, { children: [text, code] })] })));
+    const related = diagnostic.related?.map((relatedDiagnostic) => jsx(DiagnosticText, { diagnostic: relatedDiagnostic }));
+    const codeSpan = diagnostic.origin ? (jsx(Text, { children: [jsx(Line, {}), jsx(CodeSpanText, { ...diagnostic.origin })] })) : undefined;
+    return (jsx(Text, { children: [message, codeSpan, jsx(Line, {}), jsx(Text, { indent: 2, children: related })] }));
 }
 function diagnosticText(diagnostic) {
     let prefix;
@@ -359,18 +334,12 @@ function diagnosticText(diagnostic) {
     return (jsx(Text, { children: [prefix, jsx(DiagnosticText, { diagnostic: diagnostic })] }));
 }
 
-class FileNameText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const relativePath = Path.relative("", this.props.filePath);
-        const lastPathSeparator = relativePath.lastIndexOf("/");
-        const directoryNameText = relativePath.slice(0, lastPathSeparator + 1);
-        const fileNameText = relativePath.slice(lastPathSeparator + 1);
-        return (jsx(Text, { children: [jsx(Text, { color: "90", children: directoryNameText }), fileNameText] }));
-    }
+function FileNameText({ filePath }) {
+    const relativePath = Path.relative("", filePath);
+    const lastPathSeparator = relativePath.lastIndexOf("/");
+    const directoryNameText = relativePath.slice(0, lastPathSeparator + 1);
+    const fileNameText = relativePath.slice(lastPathSeparator + 1);
+    return (jsx(Text, { children: [jsx(Text, { color: "90", children: directoryNameText }), fileNameText] }));
 }
 function fileStatusText(status, testFile) {
     let statusColor;
@@ -399,18 +368,14 @@ function fileViewText(lines, addEmptyFinalLine) {
     return (jsx(Text, { children: [[...lines], addEmptyFinalLine ? jsx(Line, {}) : undefined] }));
 }
 
-class JsonText {
-    props;
-    constructor(props) {
-        this.props = props;
+function formattedText(input) {
+    if (typeof input === "string") {
+        return jsx(Line, { children: input });
     }
-    render() {
-        return jsx(Line, { children: JSON.stringify(this.#sortObject(this.props.input), null, 2) });
+    if (Array.isArray(input)) {
+        return jsx(Line, { children: JSON.stringify(input, null, 2) });
     }
-    #sortObject(target) {
-        if (Array.isArray(target)) {
-            return target;
-        }
+    function sortObject(target) {
         return Object.keys(target)
             .sort()
             .reduce((result, key) => {
@@ -418,12 +383,7 @@ class JsonText {
             return result;
         }, {});
     }
-}
-function formattedText(input) {
-    if (typeof input === "string") {
-        return jsx(Line, { children: input });
-    }
-    return jsx(JsonText, { input: input });
+    return jsx(Line, { children: JSON.stringify(sortObject(input), null, 2) });
 }
 
 const usageExamples = [
@@ -431,95 +391,48 @@ const usageExamples = [
     ["tstyche path/to/first.test.ts", "Only run the test files with matching path."],
     ["tstyche --target 4.9,5.3.2,current", "Test on all specified versions of TypeScript."],
 ];
-class HintText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return (jsx(Text, { indent: 1, color: "90", children: this.props.children }));
-    }
+function HintText({ children }) {
+    return (jsx(Text, { indent: 1, color: "90", children: children }));
 }
-class HelpHeaderText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const hint = (jsx(HintText, { children: jsx(Text, { children: this.props.tstycheVersion }) }));
-        return (jsx(Line, { children: [jsx(Text, { children: "The TSTyche Type Test Runner" }), hint] }));
-    }
+function HelpHeaderText({ tstycheVersion }) {
+    return (jsx(Line, { children: ["The TSTyche Type Test Runner", jsx(HintText, { children: tstycheVersion })] }));
 }
-class CommandText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        let hint;
-        if (this.props.hint != null) {
-            hint = jsx(HintText, { children: this.props.hint });
-        }
-        return (jsx(Line, { indent: 1, children: [jsx(Text, { color: "34", children: this.props.text }), hint] }));
+function CommandText({ hint, text }) {
+    let hintText;
+    if (hint != null) {
+        hintText = jsx(HintText, { children: hint });
     }
+    return (jsx(Line, { indent: 1, children: [jsx(Text, { color: "34", children: text }), hintText] }));
 }
-class OptionDescriptionText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return jsx(Line, { indent: 1, children: this.props.text });
-    }
+function OptionDescriptionText({ text }) {
+    return jsx(Line, { indent: 1, children: text });
 }
-class CommandLineUsageText {
-    render() {
-        const usageText = usageExamples.map(([commandText, descriptionText]) => (jsx(Text, { children: [jsx(CommandText, { text: commandText }), jsx(OptionDescriptionText, { text: descriptionText }), jsx(Line, {})] })));
-        return jsx(Text, { children: usageText });
-    }
+function CommandLineUsageText() {
+    const usageText = usageExamples.map(([commandText, descriptionText]) => (jsx(Text, { children: [jsx(CommandText, { text: commandText }), jsx(OptionDescriptionText, { text: descriptionText }), jsx(Line, {})] })));
+    return jsx(Text, { children: usageText });
 }
-class CommandLineOptionNameText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return jsx(Text, { children: ["--", this.props.text] });
-    }
+function CommandLineOptionNameText({ text }) {
+    return jsx(Text, { children: ["--", text] });
 }
-class CommandLineOptionHintText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        if (this.props.definition.brand === "list") {
-            return (jsx(Text, { children: [this.props.definition.brand, " of ", this.props.definition.items.brand, "s"] }));
-        }
-        return jsx(Text, { children: this.props.definition.brand });
+function CommandLineOptionHintText({ definition }) {
+    if (definition.brand === "list") {
+        return (jsx(Text, { children: [definition.brand, " of ", definition.items.brand, "s"] }));
     }
+    return jsx(Text, { children: definition.brand });
 }
-class CommandLineOptionsText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        const definitions = [...this.props.optionDefinitions.values()];
-        const optionsText = definitions.map((definition) => {
-            let hint;
-            if (definition.brand !== "bareTrue") {
-                hint = jsx(CommandLineOptionHintText, { definition: definition });
-            }
-            return (jsx(Text, { children: [jsx(CommandText, { text: jsx(CommandLineOptionNameText, { text: definition.name }), hint: hint }), jsx(OptionDescriptionText, { text: definition.description }), jsx(Line, {})] }));
-        });
-        return (jsx(Text, { children: [jsx(Line, { children: "Command Line Options" }), jsx(Line, {}), optionsText] }));
-    }
+function CommandLineOptionsText({ optionDefinitions }) {
+    const definitions = [...optionDefinitions.values()];
+    const optionsText = definitions.map((definition) => {
+        let hint;
+        if (definition.brand !== "bareTrue") {
+            hint = jsx(CommandLineOptionHintText, { definition: definition });
+        }
+        return (jsx(Text, { children: [jsx(CommandText, { text: jsx(CommandLineOptionNameText, { text: definition.name }), hint: hint }), jsx(OptionDescriptionText, { text: definition.description }), jsx(Line, {})] }));
+    });
+    return (jsx(Text, { children: [jsx(Line, { children: "Command Line Options" }), jsx(Line, {}), optionsText] }));
 }
-class HelpFooterText {
-    render() {
-        return jsx(Line, { children: "To learn more, visit https://tstyche.org" });
-    }
+function HelpFooterText() {
+    return jsx(Line, { children: "To learn more, visit https://tstyche.org" });
 }
 function helpText(optionDefinitions, tstycheVersion) {
     return (jsx(Text, { children: [jsx(HelpHeaderText, { tstycheVersion: tstycheVersion }), jsx(Line, {}), jsx(CommandLineUsageText, {}), jsx(Line, {}), jsx(CommandLineOptionsText, { optionDefinitions: optionDefinitions }), jsx(Line, {}), jsx(HelpFooterText, {}), jsx(Line, {})] }));
@@ -564,118 +477,72 @@ class OutputService {
     }
 }
 
-class RowText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return (jsx(Line, { children: [`${this.props.label}:`.padEnd(12), this.props.text] }));
-    }
+function RowText({ label, text }) {
+    return (jsx(Line, { children: [`${label}:`.padEnd(12), text] }));
 }
-class CountText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return (jsx(Text, { children: [this.props.failed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "31", children: [String(this.props.failed), " failed"] }), jsx(Text, { children: ", " })] })) : undefined, this.props.skipped > 0 ? (jsx(Text, { children: [jsx(Text, { color: "33", children: [String(this.props.skipped), " skipped"] }), jsx(Text, { children: ", " })] })) : undefined, this.props.todo > 0 ? (jsx(Text, { children: [jsx(Text, { color: "35", children: [String(this.props.todo), " todo"] }), jsx(Text, { children: ", " })] })) : undefined, this.props.passed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "32", children: [String(this.props.passed), " passed"] }), jsx(Text, { children: ", " })] })) : undefined, jsx(Text, { children: [String(this.props.total), jsx(Text, { children: " total" })] })] }));
-    }
+function CountText({ failed, passed, skipped, todo, total }) {
+    return (jsx(Text, { children: [failed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "31", children: [String(failed), " failed"] }), jsx(Text, { children: ", " })] })) : undefined, skipped > 0 ? (jsx(Text, { children: [jsx(Text, { color: "33", children: [String(skipped), " skipped"] }), jsx(Text, { children: ", " })] })) : undefined, todo > 0 ? (jsx(Text, { children: [jsx(Text, { color: "35", children: [String(todo), " todo"] }), jsx(Text, { children: ", " })] })) : undefined, passed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "32", children: [String(passed), " passed"] }), jsx(Text, { children: ", " })] })) : undefined, jsx(Text, { children: [String(total), jsx(Text, { children: " total" })] })] }));
+}
+function DurationText({ duration }) {
+    const minutes = Math.floor(duration / 60);
+    const seconds = duration % 60;
+    return (jsx(Text, { children: [minutes > 0 ? `${String(minutes)}m ` : undefined, `${String(Math.round(seconds * 10) / 10)}s`] }));
 }
-class DurationText {
-    props;
-    constructor(props) {
-        this.props = props;
+function MatchText({ text }) {
+    if (typeof text === "string") {
+        return jsx(Text, { children: ["'", text, "'"] });
     }
-    render() {
-        const duration = this.props.duration / 1000;
-        const minutes = Math.floor(duration / 60);
-        const seconds = duration % 60;
-        return (jsx(Text, { children: [minutes > 0 ? `${String(minutes)}m ` : undefined, `${String(Math.round(seconds * 10) / 10)}s`] }));
+    if (text.length <= 1) {
+        return jsx(Text, { children: ["'", ...text, "'"] });
     }
+    const lastItem = text.pop();
+    return (jsx(Text, { children: [text.map((match, index, list) => (jsx(Text, { children: ["'", match, "'", index === list.length - 1 ? jsx(Text, { children: " " }) : jsx(Text, { color: "90", children: ", " })] }))), jsx(Text, { color: "90", children: "or" }), " '", lastItem, "'"] }));
 }
-class MatchText {
-    props;
-    constructor(props) {
-        this.props = props;
+function RanFilesText({ onlyMatch, pathMatch, skipMatch }) {
+    const testNameMatchText = [];
+    if (onlyMatch != null) {
+        testNameMatchText.push(jsx(Text, { children: [jsx(Text, { color: "90", children: "matching " }), jsx(MatchText, { text: onlyMatch })] }));
     }
-    render() {
-        if (typeof this.props.text === "string") {
-            return jsx(Text, { children: ["'", this.props.text, "'"] });
-        }
-        if (this.props.text.length <= 1) {
-            return jsx(Text, { children: ["'", ...this.props.text, "'"] });
-        }
-        const lastItem = this.props.text.pop();
-        return (jsx(Text, { children: [this.props.text.map((match, index, list) => (jsx(Text, { children: ["'", match, "'", index === list.length - 1 ? jsx(Text, { children: " " }) : jsx(Text, { color: "90", children: ", " })] }))), jsx(Text, { color: "90", children: "or" }), " '", lastItem, "'"] }));
+    if (skipMatch != null) {
+        testNameMatchText.push(jsx(Text, { children: [onlyMatch == null ? undefined : jsx(Text, { color: "90", children: " and " }), jsx(Text, { color: "90", children: "not matching " }), jsx(MatchText, { text: skipMatch })] }));
     }
-}
-class RanFilesText {
-    props;
-    constructor(props) {
-        this.props = props;
+    let pathMatchText;
+    if (pathMatch.length > 0) {
+        pathMatchText = (jsx(Text, { children: [jsx(Text, { color: "90", children: "test files matching " }), jsx(MatchText, { text: pathMatch }), jsx(Text, { color: "90", children: "." })] }));
     }
-    render() {
-        const testNameMatchText = [];
-        if (this.props.onlyMatch != null) {
-            testNameMatchText.push(jsx(Text, { children: [jsx(Text, { color: "90", children: "matching " }), jsx(MatchText, { text: this.props.onlyMatch })] }));
-        }
-        if (this.props.skipMatch != null) {
-            testNameMatchText.push(jsx(Text, { children: [this.props.onlyMatch == null ? undefined : jsx(Text, { color: "90", children: " and " }), jsx(Text, { color: "90", children: "not matching " }), jsx(MatchText, { text: this.props.skipMatch })] }));
-        }
-        let pathMatchText;
-        if (this.props.pathMatch.length > 0) {
-            pathMatchText = (jsx(Text, { children: [jsx(Text, { color: "90", children: "test files matching " }), jsx(MatchText, { text: this.props.pathMatch }), jsx(Text, { color: "90", children: "." })] }));
-        }
-        else {
-            pathMatchText = jsx(Text, { color: "90", children: "all test files." });
-        }
-        return (jsx(Line, { children: [jsx(Text, { color: "90", children: "Ran " }), testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: "tests " }) : undefined, testNameMatchText, testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: " in " }) : undefined, pathMatchText] }));
+    else {
+        pathMatchText = jsx(Text, { color: "90", children: "all test files." });
     }
+    return (jsx(Line, { children: [jsx(Text, { color: "90", children: "Ran " }), testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: "tests " }) : undefined, testNameMatchText, testNameMatchText.length > 0 ? jsx(Text, { color: "90", children: " in " }) : undefined, pathMatchText] }));
 }
 function summaryText({ duration, expectCount, fileCount, onlyMatch, pathMatch, skipMatch, targetCount, testCount, }) {
     const targetCountText = (jsx(RowText, { label: "Targets", text: jsx(CountText, { failed: targetCount.failed, passed: targetCount.passed, skipped: targetCount.skipped, todo: targetCount.todo, total: targetCount.total }) }));
     const fileCountText = (jsx(RowText, { label: "Test files", text: jsx(CountText, { failed: fileCount.failed, passed: fileCount.passed, skipped: fileCount.skipped, todo: fileCount.todo, total: fileCount.total }) }));
     const testCountText = (jsx(RowText, { label: "Tests", text: jsx(CountText, { failed: testCount.failed, passed: testCount.passed, skipped: testCount.skipped, todo: testCount.todo, total: testCount.total }) }));
     const assertionCountText = (jsx(RowText, { label: "Assertions", text: jsx(CountText, { failed: expectCount.failed, passed: expectCount.passed, skipped: expectCount.skipped, todo: expectCount.todo, total: expectCount.total }) }));
-    return (jsx(Text, { children: [targetCountText, fileCountText, testCount.total > 0 ? testCountText : undefined, expectCount.total > 0 ? assertionCountText : undefined, jsx(RowText, { label: "Duration", text: jsx(DurationText, { duration: duration }) }), jsx(Line, {}), jsx(RanFilesText, { onlyMatch: onlyMatch, pathMatch: pathMatch, skipMatch: skipMatch })] }));
+    return (jsx(Text, { children: [targetCountText, fileCountText, testCount.total > 0 ? testCountText : undefined, expectCount.total > 0 ? assertionCountText : undefined, jsx(RowText, { label: "Duration", text: jsx(DurationText, { duration: duration / 1000 }) }), jsx(Line, {}), jsx(RanFilesText, { onlyMatch: onlyMatch, pathMatch: pathMatch, skipMatch: skipMatch })] }));
 }
 
-class StatusText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        switch (this.props.status) {
-            case "fail":
-                return jsx(Text, { color: "31", children: "\u00D7" });
-            case "pass":
-                return jsx(Text, { color: "32", children: "+" });
-            case "skip":
-                return jsx(Text, { color: "33", children: "- skip" });
-            case "todo":
-                return jsx(Text, { color: "35", children: "- todo" });
-        }
+function StatusText({ status }) {
+    switch (status) {
+        case "fail":
+            return jsx(Text, { color: "31", children: "\u00D7" });
+        case "pass":
+            return jsx(Text, { color: "32", children: "+" });
+        case "skip":
+            return jsx(Text, { color: "33", children: "- skip" });
+        case "todo":
+            return jsx(Text, { color: "35", children: "- todo" });
     }
 }
 function testNameText(status, name, indent = 0) {
     return (jsx(Line, { indent: indent + 1, children: [jsx(StatusText, { status: status }), " ", jsx(Text, { color: "90", children: name })] }));
 }
 
-class ProjectNameText {
-    props;
-    constructor(props) {
-        this.props = props;
-    }
-    render() {
-        return (jsx(Text, { color: "90", children: [" with ", Path.relative("", this.props.filePath)] }));
-    }
-}
 function usesCompilerStepText(compilerVersion, tsconfigFilePath, options) {
     let projectPathText;
     if (tsconfigFilePath != null) {
-        projectPathText = jsx(ProjectNameText, { filePath: tsconfigFilePath });
+        projectPathText = (jsx(Text, { color: "90", children: [" with ", Path.relative("", tsconfigFilePath)] }));
     }
     return (jsx(Text, { children: [options?.prependEmptyLine === true ? jsx(Line, {}) : undefined, jsx(Line, { children: [jsx(Text, { color: "34", children: "uses" }), " TypeScript ", compilerVersion, projectPathText] }), jsx(Line, {})] }));
 }
@@ -2089,6 +1956,8 @@ class WatchService {
                 case "\u0003":
                 case "\u0004":
                 case "\u001B":
+                case "\u0051":
+                case "\u0071":
                 case "\u0058":
                 case "\u0078": {
                     this.close();
@@ -3377,7 +3246,7 @@ class TSTyche {
     #selectService;
     #storeService;
     #taskRunner;
-    static version = "2.0.0-rc.1";
+    static version = "2.0.0-rc.2";
     constructor(resolvedConfig, outputService, selectService, storeService) {
         this.#resolvedConfig = resolvedConfig;
         this.#outputService = outputService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -42,11 +42,11 @@
     "check:spelling": "cspell --config cspell.config.json --quiet",
     "check:types": "tsc --noEmit --project tsconfig.json",
     "clean": "rm -rf build",
-    "format": "biome format . --write",
+    "format": "biome format --write",
     "generate": "yarn generate:schema && yarn generate:types",
     "generate:schema": "node ./models/__scripts__/generate-schema.js",
     "generate:types": "node ./models/__scripts__/generate-types.js",
-    "lint": "biome lint . --apply",
+    "lint": "biome lint --write",
     "prepublish": "yarn clean && yarn build && yarn test",
     "test": "yarn test:unit && yarn test:e2e",
     "test:coverage": "yarn build --sourcemap && c8 --config c8.config.json yarn test:e2e",
@@ -59,11 +59,11 @@
     "test:unit": "yarn test:run **/__tests__/*.test.* --parallel --reporter dot"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.7.3",
+    "@biomejs/biome": "1.8.0",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/mocha": "10.0.6",
-    "@types/node": "20.14.1",
-    "ajv": "8.15.0",
+    "@types/node": "20.14.2",
+    "ajv": "8.16.0",
     "c8": "9.1.0",
     "cspell": "8.8.4",
     "magic-string": "0.30.10",
@@ -71,7 +71,7 @@
     "pretty-ansi": "2.0.0",
     "rollup": "4.18.0",
     "rollup-plugin-dts": "6.1.1",
-    "tslib": "2.6.2",
+    "tslib": "2.6.3",
     "typescript": "5.4.5"
   },
   "peerDependencies": {