@tsslint/cli 2.0.2 → 2.0.4

package/index.js

@@ -11,13 +11,13 @@ const os = require("os");
 const languagePlugins = require("./lib/languagePlugins.js");
 process.env.TSSLINT_CLI = '1';
 const _reset = '\x1b[0m';
-const purple = (s) => '\x1b[35m' + s + _reset;
-const cyan = (s) => '\x1b[36m' + s + _reset;
-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;
-const lightBlue = (s) => '\x1b[94m' + s + _reset;
+const gray = (s) => '\x1b[90m' + s + _reset;
+const red = (s) => '\x1b[91m' + s + _reset;
+const green = (s) => '\x1b[92m' + s + _reset;
+const yellow = (s) => '\x1b[93m' + s + _reset;
+const blue = (s) => '\x1b[94m' + s + _reset;
+const purple = (s) => '\x1b[95m' + s + _reset;
+const cyan = (s) => '\x1b[96m' + s + _reset;
 // https://talyian.github.io/ansicolors/
 const tsColor = (s) => '\x1b[34m' + s + _reset;
 const tsMacroColor = (s) => '\x1b[38;5;135m' + s + _reset;
@@ -30,7 +30,7 @@ if (process.argv.includes('--threads')) {
     const threadsIndex = process.argv.indexOf('--threads');
     const threadsArg = process.argv[threadsIndex + 1];
     if (!threadsArg || threadsArg.startsWith('-')) {
-        console.error(lightRed(`Missing argument for --threads.`));
+        console.error(red(`Missing argument for --threads.`));
         process.exit(1);
     }
     threads = Math.min(os.availableParallelism(), Number(threadsArg));
@@ -70,19 +70,19 @@ class Project {
                 labels.push(astroColor('Astro'));
             }
         }
-        const label = labels.join(darkGray(' | '));
+        const label = labels.join(gray(' | '));
         if (!this.configFile) {
-            clack.log.error(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No tsslint.config.ts found)')}`);
+            clack.log.error(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray('(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(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No included files)')}`);
+            clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray('(No included files)')}`);
             return this;
         }
-        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
+        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray(`(${this.fileNames.length})`)}`);
         if (!process.argv.includes('--force')) {
             this.cache = cache.loadCache(this.tsconfig, this.configFile, ts.sys.createHash);
         }
@@ -106,12 +106,13 @@ class Project {
     let errors = 0;
     let warnings = 0;
     let messages = 0;
+    let suggestions = 0;
     let cached = 0;
     if (isTTY) {
         const write = process.stdout.write.bind(process.stdout);
         process.stdout.write = (...args) => {
             if (spinnerStopingWarn && typeof args[0] === 'string') {
-                args[0] = args[0].replace('▲', lightYellow('▲'));
+                args[0] = args[0].replace('▲', yellow('▲'));
             }
             // @ts-ignore
             return write(...args);
@@ -176,7 +177,7 @@ class Project {
             options = options.filter(option => !option.label.endsWith('(0)'));
         }
         if (!options.length) {
-            clack.log.error(lightRed('No projects found.'));
+            clack.log.error(red('No projects found.'));
             process.exit(1);
         }
         const selectedTsconfigs = await clack.multiselect({
@@ -195,7 +196,7 @@ class Project {
         else {
             command += ` --${language}-project ` + selectedTsconfigs.join(' ');
         }
-        clack.log.info(`${darkGray('Command:')} ${purple(command)}`);
+        clack.log.info(`${gray('Command:')} ${purple(command)}`);
         for (let tsconfig of selectedTsconfigs) {
             tsconfig = resolvePath(tsconfig);
             tsconfigAndLanguages.set(tsconfig, language ? [language] : []);
@@ -244,7 +245,7 @@ class Project {
                 const searchGlob = process.argv[i];
                 const tsconfigs = glob.sync(searchGlob);
                 if (!tsconfigs.length) {
-                    clack.log.error(lightRed(`No projects found for ${projectFlag} ${searchGlob}.`));
+                    clack.log.error(red(`No projects found for ${projectFlag} ${searchGlob}.`));
                     process.exit(1);
                 }
                 for (let tsconfig of tsconfigs) {
@@ -258,7 +259,7 @@ class Project {
                 }
             }
             if (!foundArg) {
-                clack.log.error(lightRed(`Missing argument for ${projectFlag}.`));
+                clack.log.error(red(`Missing argument for ${projectFlag}.`));
                 process.exit(1);
             }
         }
@@ -277,7 +278,7 @@ class Project {
         allFilesNum += project.fileNames.length;
     }
     if (allFilesNum === 0) {
-        (spinner?.stop ?? clack.log.message)(lightYellow('No input files.'));
+        (spinner?.stop ?? clack.log.message)(yellow('No input files.'));
         process.exit(1);
     }
     if (isTTY || threads >= 2) {
@@ -289,32 +290,33 @@ class Project {
         await startWorker(worker.createLocal());
     }
     (spinner?.stop ?? clack.log.message)(cached
-        ? darkGray(`Processed ${processed} files with cache. (Use `) + cyan(`--force`) + darkGray(` to ignore cache.)`)
-        : darkGray(`Processed ${processed} files.`));
+        ? gray(`Processed ${processed} files with cache. (Use `) + cyan(`--force`) + gray(` to ignore cache.)`)
+        : gray(`Processed ${processed} files.`));
     const projectsFlag = process.argv.find(arg => arg.endsWith('-projects'));
     if (projectsFlag) {
-        clack.log.warn(darkGray(`Please use `)
+        clack.log.warn(gray(`Please use `)
             + cyan(`${projectsFlag.slice(0, -1)}`)
-            + darkGray(` instead of `)
+            + gray(` instead of `)
             + cyan(`${projectsFlag}`)
-            + darkGray(` starting from version 1.5.0.`));
+            + gray(` starting from version 1.5.0.`));
     }
     const data = [
-        [passed, 'passed', lightGreen],
-        [errors, 'errors', lightRed],
-        [warnings, 'warnings', lightYellow],
-        [messages, 'messages', lightBlue],
-        [excluded, 'excluded', darkGray],
+        [passed, 'passed', green],
+        [errors, 'errors', red],
+        [warnings, 'warnings', yellow],
+        [messages, 'messages', blue],
+        [suggestions, 'suggestions', gray],
+        [excluded, 'excluded', gray],
     ];
     let summary = data
         .filter(([count]) => count)
         .map(([count, label, color]) => color(`${count} ${label}`))
-        .join(darkGray(' | '));
+        .join(gray(' | '));
     if (hasFix) {
-        summary += darkGray(` (Use `) + cyan(`--fix`) + darkGray(` to apply automatic fixes.)`);
+        summary += gray(` (Use `) + cyan(`--fix`) + gray(` to apply automatic fixes.)`);
     }
     else if (errors || warnings || messages) {
-        summary += darkGray(` (No fixes available.)`);
+        summary += gray(` (No fixes available.)`);
     }
     clack.outro(summary);
     process.exit((errors || messages) ? 1 : 0);
@@ -361,17 +363,28 @@ class Project {
             else {
                 project.cache[fileName] = fileCache = [fileStat.mtimeMs, {}, {}];
             }
-            let diagnostics = await linterWorker.lint(fileName, process.argv.includes('--fix'), fileCache);
-            diagnostics = diagnostics.filter(diagnostic => diagnostic.category !== ts.DiagnosticCategory.Suggestion);
+            const diagnostics = await linterWorker.lint(fileName, process.argv.includes('--fix'), fileCache);
+            const formatHost = {
+                getCurrentDirectory: ts.sys.getCurrentDirectory,
+                getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
+                getNewLine: () => ts.sys.newLine,
+            };
             if (diagnostics.length) {
                 hasFix ||= await linterWorker.hasCodeFixes(fileName);
                 for (const diagnostic of diagnostics) {
                     hasFix ||= !!fileCache[1][diagnostic.code]?.[0];
-                    let output = ts.formatDiagnosticsWithColorAndContext([diagnostic], {
-                        getCurrentDirectory: ts.sys.getCurrentDirectory,
-                        getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
-                        getNewLine: () => ts.sys.newLine,
-                    });
+                    let output;
+                    if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
+                        output = ts.formatDiagnosticsWithColorAndContext([{
+                                ...diagnostic,
+                                category: ts.DiagnosticCategory.Message,
+                            }], formatHost);
+                        output = output.replace(/\[94mmessage/, '[90msuggestion');
+                        output = output.replace(/\[94m/g, '[90m');
+                    }
+                    else {
+                        output = ts.formatDiagnosticsWithColorAndContext([diagnostic], formatHost);
+                    }
                     output = output.trimEnd();
                     if (typeof diagnostic.code === 'string') {
                         output = output.replace(`TS${diagnostic.code}`, diagnostic.code);
@@ -389,6 +402,7 @@ class Project {
                         log(output);
                     }
                     else {
+                        suggestions++;
                         log(output);
                     }
                 }
@@ -409,7 +423,7 @@ class Project {
     }
     async function getBuiltConfig(configFile) {
         if (!builtConfigs.has(configFile)) {
-            builtConfigs.set(configFile, core.buildConfig(configFile, ts.sys.createHash, spinner, (s, code) => log(darkGray(s), code)));
+            builtConfigs.set(configFile, core.buildConfig(configFile, ts.sys.createHash, spinner, (s, code) => log(gray(s), code)));
         }
         return await builtConfigs.get(configFile);
     }
@@ -425,14 +439,14 @@ class Project {
         let msg;
         if (processFiles.size === 0) {
             if (nextFileName) {
-                msg = darkGray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), nextFileName)}`);
+                msg = gray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), nextFileName)}`);
             }
         }
         else if (processFiles.size === 1) {
-            msg = darkGray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), [...processFiles][0])}`);
+            msg = gray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), [...processFiles][0])}`);
         }
         else {
-            msg = darkGray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`);
+            msg = gray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`);
         }
         if (!spinner && isTTY) {
             spinner = clack.spinner();
@@ -474,7 +488,7 @@ class Project {
             return require.resolve(p, { paths: [process.cwd()] });
         }
         catch {
-            clack.log.error(lightRed(`No such file: ${p}`));
+            clack.log.error(red(`No such file: ${p}`));
             process.exit(1);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "2.0.2",
+	"version": "2.0.4",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "2.0.2",
-		"@tsslint/core": "2.0.2",
+		"@tsslint/config": "2.0.4",
+		"@tsslint/core": "2.0.4",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
@@ -31,5 +31,5 @@
 		"@vue-vine/language-service": "latest",
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "3454b67099474212d2e6902c1b2c9292da080985"
+	"gitHead": "6006d07f0f218840a49ae281f074970eed1eddbd"
 }