@tsslint/cli 1.4.2 → 1.4.4

package/index.js

@@ -15,6 +15,11 @@ const darkGray = (s) => '\x1b[90m' + s + _reset;
 const lightRed = (s) => '\x1b[91m' + s + _reset;
 const lightGreen = (s) => '\x1b[92m' + s + _reset;
 const lightYellow = (s) => '\x1b[93m' + s + _reset;
+// https://talyian.github.io/ansicolors/
+const tsColor = (s) => '\x1b[34m' + s + _reset;
+const vueColor = (s) => '\x1b[32m' + s + _reset;
+const mdxColor = (s) => '\x1b[33m' + s + _reset;
+const astroColor = (s) => '\x1b[38;5;209m' + s + _reset;
 let threads = 1;
 if (process.argv.includes('--threads')) {
     const threadsIndex = process.argv.indexOf('--threads');
@@ -45,18 +50,34 @@ class Project {
     // @ts-expect-error
     clack) {
         this.configFile = ts.findConfigFile(path.dirname(this.tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
+        const labels = [];
+        if (this.languages.length === 0) {
+            labels.push(tsColor('TS'));
+        }
+        else {
+            if (this.languages.includes('vue')) {
+                labels.push(vueColor('Vue'));
+            }
+            if (this.languages.includes('mdx')) {
+                labels.push(mdxColor('MDX'));
+            }
+            if (this.languages.includes('astro')) {
+                labels.push(astroColor('Astro'));
+            }
+        }
+        const label = labels.join(darkGray(' | '));
         if (!this.configFile) {
-            clack.log.error(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No tsslint.config.ts found)')}`);
+            clack.log.error(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No tsslint.config.ts found)')}`);
             return this;
         }
         const commonLine = await parseCommonLine(this.tsconfig, this.languages);
         this.fileNames = commonLine.fileNames;
         this.options = commonLine.options;
         if (!this.fileNames.length) {
-            clack.log.warn(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No included files)')}`);
+            clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No included files)')}`);
             return this;
         }
-        clack.log.info(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
+        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
         if (!process.argv.includes('--force')) {
             this.cache = cache.loadCache(this.tsconfig, this.configFile, ts.sys.createHash);
         }
@@ -314,16 +335,15 @@ class Project {
                 if (fileCache[0] !== fileMtime) {
                     fileCache[0] = fileMtime;
                     fileCache[1] = {};
-                    fileCache[2].length = 0;
-                    fileCache[3].length = 0;
-                    fileCache[4] = {};
+                    fileCache[2] = {};
+                    fileCache[3] = {};
                 }
                 else {
                     cached++;
                 }
             }
             else {
-                project.cache[fileName] = fileCache = [fileMtime, {}, [], [], {}];
+                project.cache[fileName] = fileCache = [fileMtime, {}, {}, {}];
             }
             let diagnostics;
             if (process.argv.includes('--fix')) {
@@ -332,17 +352,17 @@ class Project {
             else {
                 diagnostics = await linterWorker.lint(fileName, fileCache);
             }
+            diagnostics = diagnostics.filter(diagnostic => diagnostic.category !== ts.DiagnosticCategory.Suggestion);
             if (diagnostics.length) {
-                hasFix ||= Object.values(fileCache[1]).some(fixes => fixes > 0) || await linterWorker.hasCodeFixes(fileName);
+                hasFix ||= await linterWorker.hasCodeFixes(fileName);
                 for (const diagnostic of diagnostics) {
-                    if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
-                        continue;
-                    }
+                    hasFix ||= !!fileCache[1][diagnostic.code];
                     let output = ts.formatDiagnosticsWithColorAndContext([diagnostic], {
                         getCurrentDirectory: ts.sys.getCurrentDirectory,
                         getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
                         getNewLine: () => ts.sys.newLine,
                     });
+                    output = output.trimEnd();
                     output = output.replace(`TS${diagnostic.code}`, String(diagnostic.code));
                     if (diagnostic.category === ts.DiagnosticCategory.Error) {
                         errors++;
@@ -357,7 +377,7 @@ class Project {
                     }
                 }
             }
-            else if (!(await linterWorker.hasRules(fileName, fileCache[4]))) {
+            else if (!(await linterWorker.hasRules(fileName, fileCache[3]))) {
                 excluded++;
             }
             else {
@@ -386,10 +406,10 @@ class Project {
     function updateSpinner() {
         if (processFiles.size === 1) {
             const fileName = processFiles.values().next().value;
-            spinner.message(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), fileName)}`);
+            spinner.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), fileName)}`));
         }
         else {
-            spinner.message(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`);
+            spinner.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`));
         }
     }
     function log(msg, code) {

package/lib/worker.d.ts

@@ -18,5 +18,5 @@ declare function setup(tsconfig: string, languages: string[], configFile: string
 declare function lintAndFix(fileName: string, fileCache: core.FileLintCache): readonly [ts.DiagnosticWithLocation[], core.FileLintCache];
 declare function lint(fileName: string, fileCache: core.FileLintCache): readonly [ts.DiagnosticWithLocation[], core.FileLintCache];
 declare function hasCodeFixes(fileName: string): boolean;
-declare function hasRules(fileName: string, minimatchCache: core.FileLintCache[4]): readonly [boolean, Record<string, boolean>];
+declare function hasRules(fileName: string, minimatchCache: core.FileLintCache[3]): readonly [boolean, Record<string, boolean>];
 export {};

package/lib/worker.js

@@ -192,7 +192,7 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
         languageServiceHost: linterHost,
         typescript: ts,
         tsconfig: ts.server.toNormalizedPath(tsconfig),
-    }, config, 'cli', clack);
+    }, config, 'cli');
     return true;
 }
 function lintAndFix(fileName, fileCache) {
@@ -204,12 +204,11 @@ function lintAndFix(fileName, fileCache) {
         if (Object.values(fileCache[1]).some(fixes => fixes > 0)) {
             // Reset the cache if there are any fixes applied.
             fileCache[1] = {};
-            fileCache[2].length = 0;
-            fileCache[3].length = 0;
+            fileCache[2] = {};
         }
         diagnostics = linter.lint(fileName, fileCache);
         let fixes = linter
-            .getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache[4])
+            .getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache[3])
             .filter(fix => fix.fixId === 'tsslint');
         if (language) {
             fixes = fixes.map(fix => {
@@ -231,8 +230,7 @@ function lintAndFix(fileName, fileCache) {
         ts.sys.writeFile(fileName, newSnapshot.getText(0, newSnapshot.getLength()));
         fileCache[0] = fs.statSync(fileName).mtimeMs;
         fileCache[1] = {};
-        fileCache[2].length = 0;
-        fileCache[3].length = 0;
+        fileCache[2] = {};
     }
     if (shouldRetry) {
         diagnostics = linter.lint(fileName, fileCache);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.4.2",
+	"version": "1.4.4",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.4.2",
-		"@tsslint/core": "1.4.2",
+		"@tsslint/config": "1.4.4",
+		"@tsslint/core": "1.4.4",
 		"@volar/language-core": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1"
@@ -28,5 +28,5 @@
 	"devDependencies": {
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "4cdc9070fda83e226ab04fa90b99c2b8d748b315"
+	"gitHead": "7e4401c6734fd2b8d09d9aa45584e83e3ecf9e48"
 }