tstyche 2.1.0 → 2.1.1

package/build/tstyche.d.ts

@@ -274,12 +274,12 @@ declare enum Color {
     Gray = "90"
 }
 
-type ScribblerNode = Array<ScribblerNode> | ScribblerJsx.Element | string | undefined;
+type ScribblerNode = Array<ScribblerNode> | ScribblerJsx.Element | string | number | undefined;
 type FunctionComponent = (props: Record<string, unknown>) => ScribblerJsx.Element;
 declare namespace ScribblerJsx {
     interface Element {
         props: Record<string, unknown>;
-        type: FunctionComponent | string;
+        type: FunctionComponent | number | string;
     }
     interface ElementChildrenAttribute {
         children: ScribblerNode;
@@ -658,7 +658,7 @@ declare class ExpectDiagnosticText {
     static componentDoesNotAcceptProps(isTypeNode: boolean): string;
     static matcherIsDeprecated(matcherNameText: string): Array<string>;
     static matcherIsNotSupported(matcherNameText: string): string;
-    static overloadGaveTheFollowingError(indexText: string, countText: string, signatureText: string): string;
+    static overloadGaveTheFollowingError(index: number, count: number, signatureText: string): string;
     static raisedTypeError(count?: number): string;
     static typeArgumentMustBe(argumentNameText: string, expectedText: string): string;
     static typeDidNotRaiseError(isTypeNode: boolean): string;

package/build/tstyche.js

@@ -505,7 +505,7 @@ class Environment {
     }
     static #resolveTimeout() {
         if (process.env["TSTYCHE_TIMEOUT"] != null) {
-            return Number(process.env["TSTYCHE_TIMEOUT"]);
+            return Number.parseFloat(process.env["TSTYCHE_TIMEOUT"]);
         }
         return 30;
     }
@@ -589,7 +589,7 @@ class Scribbler {
     #visitChildren(children) {
         const text = [];
         for (const child of children) {
-            if (typeof child === "string") {
+            if (typeof child === "string" || typeof child === "number") {
                 text.push(child);
                 continue;
             }
@@ -616,61 +616,72 @@ function describeNameText(name, indent = 0) {
 function BreadcrumbsText({ ancestor }) {
     const text = [];
     while ("name" in ancestor) {
-        text.unshift(" ❭ ", ancestor.name);
+        text.push(ancestor.name);
         ancestor = ancestor.parent;
     }
-    return jsx(Text, { color: "90", children: text.join("") });
+    text.push("");
+    return jsx(Text, { color: "90", children: text.reverse().join(" ❭ ") });
 }
-function CodeLineText({ lineText, gutterWidth, lineNumberColor = "90", lineNumberText }) {
-    return (jsx(Line, { children: [jsx(Text, { color: lineNumberColor, children: lineNumberText.padStart(gutterWidth) }), jsx(Text, { color: "90", children: " | " }), lineText] }));
+function CodeLineText({ gutterWidth, lineNumber, lineNumberColor = "90", lineText }) {
+    return (jsx(Line, { children: [jsx(Text, { color: lineNumberColor, children: lineNumber.toString().padStart(gutterWidth) }), jsx(Text, { color: "90", children: " | " }), lineText] }));
 }
-function SquiggleLineText({ gutterWidth, indentWidth = 0, squiggleWidth }) {
-    return (jsx(Line, { children: [" ".repeat(gutterWidth), jsx(Text, { color: "90", children: " | " }), " ".repeat(indentWidth), jsx(Text, { color: "31", children: "~".repeat(squiggleWidth === 0 ? 1 : squiggleWidth) })] }));
+function SquiggleLineText({ gutterWidth, indentWidth = 0, squiggleColor, squiggleWidth }) {
+    return (jsx(Line, { children: [" ".repeat(gutterWidth), jsx(Text, { color: "90", children: " | " }), " ".repeat(indentWidth), jsx(Text, { color: squiggleColor, children: "~".repeat(squiggleWidth === 0 ? 1 : squiggleWidth) })] }));
 }
-function CodeSpanText({ diagnosticOrigin }) {
+function CodeSpanText({ diagnosticCategory, diagnosticOrigin }) {
     const lastLineInFile = diagnosticOrigin.sourceFile.getLineAndCharacterOfPosition(diagnosticOrigin.sourceFile.text.length).line;
     const { character: firstMarkedLineCharacter, line: firstMarkedLine } = diagnosticOrigin.sourceFile.getLineAndCharacterOfPosition(diagnosticOrigin.start);
     const { character: lastMarkedLineCharacter, line: lastMarkedLine } = diagnosticOrigin.sourceFile.getLineAndCharacterOfPosition(diagnosticOrigin.end);
     const firstLine = Math.max(firstMarkedLine - 2, 0);
     const lastLine = Math.min(firstLine + 5, lastLineInFile);
-    const gutterWidth = String(lastLine + 1).length + 2;
+    const gutterWidth = (lastLine + 1).toString().length + 2;
+    let highlightColor;
+    switch (diagnosticCategory) {
+        case "error": {
+            highlightColor = "31";
+            break;
+        }
+        case "warning": {
+            highlightColor = "33";
+            break;
+        }
+    }
     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 >= firstMarkedLine && index <= lastMarkedLine) {
-            codeSpan.push(jsx(CodeLineText, { gutterWidth: gutterWidth, lineNumberColor: "31", lineNumberText: lineNumberText, lineText: lineText }));
+            codeSpan.push(jsx(CodeLineText, { gutterWidth: gutterWidth, lineNumber: index + 1, lineNumberColor: highlightColor, lineText: lineText }));
             if (index === firstMarkedLine) {
                 const squiggleLength = index === lastMarkedLine
                     ? lastMarkedLineCharacter - firstMarkedLineCharacter
                     : lineText.length - firstMarkedLineCharacter;
-                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, indentWidth: firstMarkedLineCharacter, squiggleWidth: squiggleLength }));
+                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, indentWidth: firstMarkedLineCharacter, squiggleColor: highlightColor, squiggleWidth: squiggleLength }));
             }
             else if (index === lastMarkedLine) {
-                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, squiggleWidth: lastMarkedLineCharacter }));
+                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, squiggleColor: highlightColor, squiggleWidth: lastMarkedLineCharacter }));
             }
             else {
-                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, squiggleWidth: lineText.length }));
+                codeSpan.push(jsx(SquiggleLineText, { gutterWidth: gutterWidth, squiggleColor: highlightColor, squiggleWidth: lineText.length }));
             }
         }
         else {
-            codeSpan.push(jsx(CodeLineText, { gutterWidth: gutterWidth, lineNumberText: lineNumberText, lineText: lineText }));
+            codeSpan.push(jsx(CodeLineText, { gutterWidth: gutterWidth, lineNumber: index + 1, lineText: lineText }));
         }
     }
-    const location = (jsx(Line, { children: [" ".repeat(gutterWidth + 2), jsx(Text, { color: "90", children: " at " }), jsx(Text, { color: "36", children: Path.relative("", diagnosticOrigin.sourceFile.fileName) }), jsx(Text, { color: "90", children: [":", String(firstMarkedLine + 1), ":", String(firstMarkedLineCharacter + 1)] }), diagnosticOrigin.assertion && jsx(BreadcrumbsText, { ancestor: diagnosticOrigin.assertion.parent })] }));
+    const location = (jsx(Line, { children: [" ".repeat(gutterWidth + 2), jsx(Text, { color: "90", children: " at " }), jsx(Text, { color: "36", children: Path.relative("", diagnosticOrigin.sourceFile.fileName) }), jsx(Text, { color: "90", children: `:${firstMarkedLine + 1}:${firstMarkedLineCharacter + 1}` }), diagnosticOrigin.assertion && jsx(BreadcrumbsText, { ancestor: diagnosticOrigin.assertion.parent })] }));
     return (jsx(Text, { children: [codeSpan, jsx(Line, {}), location] }));
 }
 
 function DiagnosticText({ diagnostic }) {
-    const code = typeof diagnostic.code === "string" ? jsx(Text, { color: "90", children: [" ", diagnostic.code] }) : undefined;
+    const code = diagnostic.code ? 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, { diagnosticOrigin: diagnostic.origin })] })) : undefined;
+    const codeSpan = diagnostic.origin ? (jsx(Text, { children: [jsx(Line, {}), jsx(CodeSpanText, { diagnosticCategory: diagnostic.category, diagnosticOrigin: diagnostic.origin })] })) : undefined;
     return (jsx(Text, { children: [message, codeSpan, jsx(Line, {}), jsx(Text, { indent: 2, children: related })] }));
 }
 function diagnosticText(diagnostic) {
@@ -747,11 +758,7 @@ function HelpHeaderText({ tstycheVersion }) {
     return (jsx(Line, { children: ["The TSTyche Type Test Runner", jsx(HintText, { children: tstycheVersion })] }));
 }
 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] }));
+    return (jsx(Line, { indent: 1, children: [jsx(Text, { color: "34", children: text }), hint && jsx(HintText, { children: hint })] }));
 }
 function OptionDescriptionText({ text }) {
     return jsx(Line, { indent: 1, children: text });
@@ -766,11 +773,11 @@ function CommandLineUsageText() {
     return jsx(Text, { children: usageText });
 }
 function CommandLineOptionNameText({ text }) {
-    return jsx(Text, { children: ["--", text] });
+    return jsx(Text, { children: `--${text}` });
 }
 function CommandLineOptionHintText({ definition }) {
     if (definition.brand === "list") {
-        return (jsx(Text, { children: [definition.brand, " of ", definition.items.brand, "s"] }));
+        return jsx(Text, { children: `${definition.brand} of ${definition.items.brand}s` });
     }
     return jsx(Text, { children: definition.brand });
 }
@@ -835,16 +842,16 @@ function RowText({ label, text }) {
     return (jsx(Line, { children: [`${label}:`.padEnd(12), text] }));
 }
 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" })] })] }));
+    return (jsx(Text, { children: [failed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "31", children: [failed, " failed"] }), jsx(Text, { children: ", " })] })) : undefined, skipped > 0 ? (jsx(Text, { children: [jsx(Text, { color: "33", children: [skipped, " skipped"] }), jsx(Text, { children: ", " })] })) : undefined, todo > 0 ? (jsx(Text, { children: [jsx(Text, { color: "35", children: [todo, " todo"] }), jsx(Text, { children: ", " })] })) : undefined, passed > 0 ? (jsx(Text, { children: [jsx(Text, { color: "32", children: [passed, " passed"] }), jsx(Text, { children: ", " })] })) : undefined, jsx(Text, { children: [total, " total"] })] }));
 }
 function DurationText({ seconds }) {
-    return jsx(Text, { children: `${String(Math.round(seconds * 10) / 10)}s` });
+    return jsx(Text, { children: `${Math.round(seconds * 10) / 10}s` });
 }
 function MatchText({ text }) {
     if (typeof text === "string") {
         return jsx(Text, { children: ["'", text, "'"] });
     }
-    if (text.length <= 1) {
+    if (text.length === 1) {
         return jsx(Text, { children: ["'", ...text, "'"] });
     }
     const lastItem = text.pop();
@@ -856,7 +863,7 @@ function RanFilesText({ onlyMatch, pathMatch, skipMatch }) {
         testNameMatchText.push(jsx(Text, { children: [jsx(Text, { color: "90", children: "matching " }), jsx(MatchText, { text: onlyMatch })] }));
     }
     if (skipMatch != null) {
-        testNameMatchText.push(jsx(Text, { children: [onlyMatch != null ? jsx(Text, { color: "90", children: " and " }) : undefined, jsx(Text, { color: "90", children: "not matching " }), jsx(MatchText, { text: skipMatch })] }));
+        testNameMatchText.push(jsx(Text, { children: [onlyMatch && jsx(Text, { color: "90", children: " and " }), jsx(Text, { color: "90", children: "not matching " }), jsx(MatchText, { text: skipMatch })] }));
     }
     let pathMatchText;
     if (pathMatch.length > 0) {
@@ -1297,7 +1304,7 @@ class Diagnostic {
     }
     static fromDiagnostics(diagnostics, compiler) {
         return diagnostics.map((diagnostic) => {
-            const code = `ts(${String(diagnostic.code)})`;
+            const code = `ts(${diagnostic.code})`;
             let origin;
             if (Diagnostic.#isTsDiagnosticWithLocation(diagnostic)) {
                 origin = new DiagnosticOrigin(diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file);
@@ -1913,8 +1920,8 @@ class ExpectDiagnosticText {
     static matcherIsNotSupported(matcherNameText) {
         return `The '.${matcherNameText}()' matcher is not supported.`;
     }
-    static overloadGaveTheFollowingError(indexText, countText, signatureText) {
-        return `Overload ${indexText} of ${countText}, '${signatureText}', gave the following error.`;
+    static overloadGaveTheFollowingError(index, count, signatureText) {
+        return `Overload ${index} of ${count}, '${signatureText}', gave the following error.`;
     }
     static raisedTypeError(count = 1) {
         return `The raised type error${count === 1 ? "" : "s"}:`;
@@ -1967,7 +1974,7 @@ class ExpectDiagnosticText {
     static typeRaisedError(isTypeNode, count, targetCount) {
         let countText = "a";
         if (count > 1 || targetCount > 1) {
-            countText = count > targetCount ? String(count) : `only ${String(count)}`;
+            countText = count > targetCount ? `${count}` : `only ${count}`;
         }
         return `${isTypeNode ? "Type" : "Expression type"} raised ${countText} type error${count === 1 ? "" : "s"}.`;
     }
@@ -2058,19 +2065,19 @@ class MatchWorker {
         return type;
     }
     isAnyOrNeverType(type) {
-        return Boolean(type.flags & (this.#compiler.TypeFlags.Any | this.#compiler.TypeFlags.Never));
+        return !!(type.flags & (this.#compiler.TypeFlags.Any | this.#compiler.TypeFlags.Never));
     }
     isStringOrNumberLiteralType(type) {
-        return Boolean(type.flags & this.#compiler.TypeFlags.StringOrNumberLiteral);
+        return !!(type.flags & this.#compiler.TypeFlags.StringOrNumberLiteral);
     }
     isObjectType(type) {
-        return Boolean(type.flags & this.#compiler.TypeFlags.Object);
+        return !!(type.flags & this.#compiler.TypeFlags.Object);
     }
     isUnionType(type) {
-        return Boolean(type.flags & this.#compiler.TypeFlags.Union);
+        return !!(type.flags & this.#compiler.TypeFlags.Union);
     }
     isUniqueSymbolType(type) {
-        return Boolean(type.flags & this.#compiler.TypeFlags.UniqueESSymbol);
+        return !!(type.flags & this.#compiler.TypeFlags.UniqueESSymbol);
     }
     resolveDiagnosticOrigin(symbol, enclosingNode) {
         if (symbol.valueDeclaration != null &&
@@ -2097,7 +2104,7 @@ class PrimitiveTypeMatcher {
     }
     match(matchWorker, sourceNode) {
         const sourceType = matchWorker.getType(sourceNode);
-        const isMatch = Boolean(sourceType.flags & this.#targetTypeFlag);
+        const isMatch = !!(sourceType.flags & this.#targetTypeFlag);
         return {
             explain: () => this.#explain(matchWorker, sourceNode),
             isMatch,
@@ -2122,7 +2129,7 @@ class ToAcceptProps {
             const origin = DiagnosticOrigin.fromNode(targetNode, matchWorker.assertion);
             if (signatures.length > 1) {
                 const signatureText = this.#typeChecker.signatureToString(signature, sourceNode);
-                const overloadText = ExpectDiagnosticText.overloadGaveTheFollowingError(String(index + 1), String(signatures.length), signatureText);
+                const overloadText = ExpectDiagnosticText.overloadGaveTheFollowingError(index + 1, signatures.length, signatureText);
                 diagnostic = Diagnostic.error([introText, overloadText], origin);
             }
             else {
@@ -2343,7 +2350,7 @@ class ToHaveProperty {
         const targetType = matchWorker.getType(targetNode);
         let propertyNameText;
         if (matchWorker.isStringOrNumberLiteralType(targetType)) {
-            propertyNameText = String(targetType.value);
+            propertyNameText = targetType.value.toString();
         }
         else {
             propertyNameText = `[${this.#compiler.unescapeLeadingUnderscores(targetType.symbol.escapedName)}]`;
@@ -2367,7 +2374,7 @@ class ToHaveProperty {
         const targetType = matchWorker.getType(targetNode);
         let propertyNameText;
         if (matchWorker.isStringOrNumberLiteralType(targetType)) {
-            propertyNameText = String(targetType.value);
+            propertyNameText = targetType.value.toString();
         }
         else if (matchWorker.isUniqueSymbolType(targetType)) {
             propertyNameText = this.#compiler.unescapeLeadingUnderscores(targetType.escapedName);
@@ -2473,7 +2480,7 @@ class ToRaiseError {
         if (this.#compiler.isStringLiteralLike(targetNode)) {
             return this.#compiler.flattenDiagnosticMessageText(diagnostic.messageText, " ", 0).includes(targetNode.text);
         }
-        return Number(targetNode.text) === diagnostic.code;
+        return Number.parseInt(targetNode.text) === diagnostic.code;
     }
 }
 
@@ -3032,7 +3039,7 @@ class TSTyche {
     #selectService;
     #storeService;
     #taskRunner;
-    static version = "2.1.0";
+    static version = "2.1.1";
     constructor(resolvedConfig, outputService, selectService, storeService) {
         this.#resolvedConfig = resolvedConfig;
         this.#outputService = outputService;
@@ -3616,13 +3623,13 @@ class StoreDiagnosticText {
         return `Failed to fetch metadata of the 'typescript' package from '${registryUrl.toString()}'.`;
     }
     static failedWithStatusCode(code) {
-        return `Request failed with status code ${String(code)}.`;
+        return `Request failed with status code ${code}.`;
     }
     static maybeNetworkConnectionIssue() {
         return "Might be there is an issue with the registry or the network connection.";
     }
     static setupTimeoutExceeded(timeout) {
-        return `Setup timeout of ${String(timeout / 1000)}s was exceeded.`;
+        return `Setup timeout of ${timeout / 1000}s was exceeded.`;
     }
 }
 
@@ -3779,7 +3786,7 @@ class Lock {
                 break;
             }
             if (Date.now() - waitStartTime > options.timeout) {
-                options.onDiagnostics?.(`Lock wait timeout of ${String(options.timeout / 1000)}s was exceeded.`);
+                options.onDiagnostics?.(`Lock wait timeout of ${options.timeout / 1000}s was exceeded.`);
                 break;
             }
             await Lock.#sleep(1000);
@@ -3864,9 +3871,9 @@ class PackageInstaller {
                     resolve();
                 }
                 if (signal != null) {
-                    reject(new Error(`setup timeout of ${String(this.#timeout / 1000)}s was exceeded`));
+                    reject(new Error(`setup timeout of ${this.#timeout / 1000}s was exceeded`));
                 }
-                reject(new Error(`process exited with code ${String(code)}`));
+                reject(new Error(`process exited with code ${code}`));
             });
         });
     }
@@ -3939,6 +3946,7 @@ class StoreService {
                 continue;
             }
             const toExpose = [
+                "getTypeOfSymbol",
                 "isTypeRelatedTo",
                 "relation: { assignable: assignableRelation, identity: identityRelation, subtype: strictSubtypeRelation }",
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",
@@ -53,29 +53,27 @@
     "test:coverage:collect": "yarn build --sourcemap && NODE_V8_COVERAGE='./coverage/v8-coverage' yarn test:e2e",
     "test:coverage:report": "node ./scripts/report-coverage.js",
     "test:e2e": "yarn test:e2e:parallel && yarn test:e2e:serial",
-    "test:e2e:parallel": "yarn test:run tests/*.test.* --exclude tests/feature-watch.test.js --parallel --reporter dot",
-    "test:e2e:serial": "yarn test:run tests/feature-watch.test.js --reporter dot",
+    "test:e2e:parallel": "yarn poku ./tests --exclude='store|target|update|versions|watch' --parallel",
+    "test:e2e:serial": "yarn poku tests/*-{store,target,update,versions,watch}.test.*",
     "test:examples": "tstyche examples",
-    "test:run": "mocha --config mocha.config.json",
     "test:types": "tstyche typetests",
-    "test:unit": "yarn test:run **/__tests__/*.test.* --parallel --reporter dot"
+    "test:unit": "yarn poku **/__tests__/*.test.* --parallel"
   },
   "devDependencies": {
     "@biomejs/biome": "1.8.3",
     "@rollup/plugin-typescript": "11.1.6",
-    "@types/mocha": "10.0.7",
-    "@types/node": "20.14.10",
+    "@types/node": "20.14.12",
     "@types/react": "18.3.3",
     "ajv": "8.17.1",
-    "cspell": "8.10.4",
+    "cspell": "8.12.1",
     "magic-string": "0.30.10",
-    "mocha": "10.6.0",
-    "monocart-coverage-reports": "2.9.2",
+    "monocart-coverage-reports": "2.9.3",
+    "poku": "2.2.3",
     "pretty-ansi": "2.0.0",
-    "rollup": "4.18.1",
+    "rollup": "4.19.1",
     "rollup-plugin-dts": "6.1.1",
     "tslib": "2.6.3",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   },
   "peerDependencies": {
     "typescript": "4.x || 5.x"