tstyche 7.0.0-beta.0 → 7.0.0-beta.2

package/README.md

@@ -73,7 +73,7 @@ tstyche query-params --only multiple --target '>=5.6'
 
 It is that simple! Actually, TSTyche does even more:
 
-- checks messages of errors suppressed by `// @ts-expect-error`,
+- checks messages of errors suppressed by `@ts-expect-error` directives,
 - generates type tests from a data table,
 - runs tests in watch mode.
 

package/dist/{tstyche.d.ts → api.d.ts}

@@ -1,5 +1,4 @@
 import type ts from 'typescript';
-import type { WriteStream } from 'node:tty';
 
 declare enum CancellationReason {
     ConfigChange = "configChange",
@@ -257,8 +256,7 @@ declare const defaultOptions: Required<ConfigFileOptions>;
 declare enum OptionGroup {
     CommandLine = 2,
     ConfigFile = 4,
-    InlineConditions = 8,
-    ResolvedConfig = 6
+    InlineConditions = 8
 }
 
 interface BaseOptionDefinition {
@@ -283,7 +281,7 @@ declare class Options {
     #private;
     static for(optionGroup: OptionGroup): Map<string, OptionDefinition>;
     static isJsonString(text: string): boolean;
-    static resolve(optionName: string, optionValue: string, rootPath?: string): string;
+    static resolve(optionName: string, optionValue: string, basePath?: string): string;
     static validate(optionName: string, optionValue: string, onDiagnostics: DiagnosticsHandler, origin?: DiagnosticOrigin): Promise<void>;
 }
 
@@ -632,6 +630,9 @@ declare function formattedText(input: string | Array<string> | Record<string, un
 
 declare function helpText(options: Map<string, OptionDefinition>, version: string): ScribblerJsx.Element;
 
+interface WriteStream {
+    write(text: string): void;
+}
 declare class StreamController {
     #private;
     constructor(stream: WriteStream);
@@ -754,4 +755,4 @@ declare class Version {
 }
 
 export { BaseReporter, CancellationReason, CancellationToken, Cli, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, DotReporter, EventEmitter, ExpectResult, FileLocation, FileResult, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, ProjectConfigKind, ProjectResult, Result, ResultStatus, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, Store, StreamController, SummaryReporter, SuppressedResult, TargetResult, TestResult, Text, Version, WatchReporter, addsText, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, dotText, environmentOptions, fileStatusText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, prologueText, summaryText, testNameText, usesText, waitingForFileChangesText, watchUsageText };
-export type { AssertionCounts, AssertionResultStatus, CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, EnvironmentOptions, Event, EventHandler, FileCounts, FileResultStatus, InlineConfig, ItemDefinition, OptionDefinition, ProjectConfig, Reporter, ReporterEvent, ResolvedConfig, ResultCounts, ResultTiming, ScribblerOptions, SuppressedCounts, SuppressedResultStatus, TargetCounts, TargetResultStatus, TestCounts, TestResultStatus, TextRange };
+export type { AssertionCounts, AssertionResultStatus, CliOptions, CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, EnvironmentOptions, Event, EventHandler, FileCounts, FileResultStatus, InlineConfig, ItemDefinition, OptionDefinition, ProjectConfig, Reporter, ReporterEvent, ResolvedConfig, ResultCounts, ResultTiming, ScribblerOptions, SuppressedCounts, SuppressedResultStatus, TargetCounts, TargetResultStatus, TestCounts, TestResultStatus, TextRange, WriteStream };

package/dist/{tstyche.js → api.js}

@@ -1038,7 +1038,7 @@ class Options {
         },
         {
             brand: "boolean",
-            description: "Check errors silenced by '// @ts-expect-error' directives.",
+            description: "Check errors silenced by '@ts-expect-error' directives.",
             group: 4,
             name: "checkSuppressedErrors",
         },
@@ -1214,7 +1214,7 @@ class Options {
     static isJsonString(text) {
         return text.startsWith("{");
     }
-    static resolve(optionName, optionValue, rootPath = ".") {
+    static resolve(optionName, optionValue, basePath = ".") {
         const canonicalOptionName = Options.#getCanonicalOptionName(optionName);
         switch (canonicalOptionName) {
             case "config":
@@ -1227,7 +1227,7 @@ class Options {
                 if (optionValue.startsWith("file:")) {
                     optionValue = fileURLToPath(optionValue);
                 }
-                optionValue = Path.resolve(rootPath, optionValue);
+                optionValue = Path.resolve(basePath, optionValue);
                 break;
             case "reporters":
                 if (Options.#isBuiltinReporter(optionValue)) {
@@ -1235,7 +1235,7 @@ class Options {
                 }
                 try {
                     if (optionValue.startsWith(".")) {
-                        optionValue = pathToFileURL(Path.relative(".", Path.resolve(rootPath, optionValue))).toString();
+                        optionValue = pathToFileURL(Path.relative(".", Path.resolve(basePath, optionValue))).toString();
                     }
                     else {
                         optionValue = import.meta.resolve(optionValue);
@@ -1447,8 +1447,8 @@ class ConfigParser {
                     this.#onRequiresValue(optionDefinition.name, optionDefinition.brand, jsonNode, isListItem);
                     break;
                 }
-                const rootPath = Path.dirname(this.#sourceFile.fileName);
-                optionValue = Options.resolve(optionDefinition.name, optionValue, rootPath);
+                const basePath = Path.dirname(this.#sourceFile.fileName);
+                optionValue = Options.resolve(optionDefinition.name, optionValue, basePath);
                 await Options.validate(optionDefinition.name, optionValue, this.#onDiagnostics, jsonNode.origin);
                 break;
             }
@@ -1776,7 +1776,6 @@ var OptionGroup;
     OptionGroup[OptionGroup["CommandLine"] = 2] = "CommandLine";
     OptionGroup[OptionGroup["ConfigFile"] = 4] = "ConfigFile";
     OptionGroup[OptionGroup["InlineConditions"] = 8] = "InlineConditions";
-    OptionGroup[OptionGroup["ResolvedConfig"] = 6] = "ResolvedConfig";
 })(OptionGroup || (OptionGroup = {}));
 
 class CancellationHandler {
@@ -3567,7 +3566,7 @@ class SourceTextEditor {
 class SuppressedLayer {
     #compiler;
     #editor;
-    #expectErrorRegex = /^(\s*)(\/\/ *@ts-expect-error)(!?)(:? *)(.*)?$/gim;
+    #expectErrorRegex = /^([ \t/*{]*)(@ts-expect-error)(!?)(:? *)(.*?)(?:\*\/.*)?$/gim;
     #resolvedConfig;
     #suppressedErrorsMap;
     constructor(compiler, editor, resolvedConfig) {
@@ -4071,7 +4070,7 @@ class ProjectService {
     #lastSeenProject = "";
     #projectConfig;
     #resolvedConfig;
-    #seenPrograms = new WeakSet();
+    #seenProjects = new Set();
     #seenTestFiles = new Set();
     #service;
     constructor(compiler, resolvedConfig) {
@@ -4129,6 +4128,7 @@ class ProjectService {
             jsx: this.#compiler.JsxEmit.Preserve,
             module: this.#compiler.ModuleKind.NodeNext,
             moduleResolution: this.#compiler.ModuleResolutionKind.NodeNext,
+            noEmit: true,
             noUncheckedIndexedAccess: true,
             resolveJsonModule: true,
             strict: true,
@@ -4211,10 +4211,10 @@ class ProjectService {
             this.#seenTestFiles.add(filePath);
             const languageService = this.getLanguageService(filePath);
             const program = languageService?.getProgram();
-            if (!program || this.#seenPrograms.has(program)) {
+            if (!program || this.#seenProjects.has(configFileName)) {
                 return;
             }
-            this.#seenPrograms.add(program);
+            this.#seenProjects.add(configFileName);
             const sourceFilesToCheck = program.getSourceFiles().filter((sourceFile) => {
                 if (program.isSourceFileFromExternalLibrary(sourceFile) || program.isSourceFileDefaultLibrary(sourceFile)) {
                     return false;
@@ -4230,9 +4230,9 @@ class ProjectService {
                 }
                 return false;
             });
-            const diagnostics = [];
+            const diagnostics = [...program.getOptionsDiagnostics()];
             for (const sourceFile of sourceFilesToCheck) {
-                diagnostics.push(...program.getSyntacticDiagnostics(sourceFile), ...program.getSemanticDiagnostics(sourceFile));
+                diagnostics.push(...program.getSyntacticDiagnostics(sourceFile), ...program.getSemanticDiagnostics(sourceFile), ...program.getDeclarationDiagnostics(sourceFile));
             }
             if (diagnostics.length > 0) {
                 EventEmitter.dispatch(["project:error", { diagnostics: Diagnostic.fromDiagnostics(diagnostics) }]);
@@ -6065,7 +6065,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "7.0.0-beta.0";
+    static version = "7.0.0-beta.2";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import process from 'node:process';
-import { Cli } from './tstyche.js';
+import { Cli } from './api.js';
 
 const cli = new Cli();
 await cli.run(process.argv.slice(2));

package/dist/tag.js

@@ -1,4 +1,4 @@
-import { Cli, EventEmitter, CancellationToken } from './tstyche.js';
+import { Cli, EventEmitter, CancellationToken } from './api.js';
 
 class StatusHandler {
     #hasError = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.2",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",
@@ -25,8 +25,8 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
+    "./api": "./dist/api.js",
     "./tag": "./dist/tag.js",
-    "./tstyche": "./dist/tstyche.js",
     "./package.json": "./package.json"
   },
   "main": "./dist/index.js",