@tsslint/cli 1.3.4 → 1.3.6

package/index.js

@@ -6,12 +6,12 @@ const core = require("@tsslint/core");
 const cache = require("./lib/cache");
 const glob = require("glob");
 const fs = require("fs");
-const gray = '\x1b[90m';
-const purple = '\x1b[35m';
-const green = '\x1b[32m';
-const red = '\x1b[31m';
-const yellow = '\x1b[33m';
-const reset = '\x1b[0m';
+const _reset = '\x1b[0m';
+const purple = (s) => '\x1b[35m' + 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;
 (async () => {
     let hasError = false;
     let projectVersion = 0;
@@ -54,8 +54,16 @@ const reset = '\x1b[0m';
     const languageService = ts.createLanguageService(languageServiceHost);
     if (process.argv.includes('--project')) {
         const projectIndex = process.argv.indexOf('--project');
-        const tsconfig = process.argv[projectIndex + 1];
-        await projectWorker(tsconfig);
+        let tsconfig = process.argv[projectIndex + 1];
+        if (tsconfig.startsWith('-') || !tsconfig) {
+            clack.log.error(lightRed(`Missing argument for --project.`));
+        }
+        else {
+            if (!tsconfig.startsWith('.')) {
+                tsconfig = `./${tsconfig}`;
+            }
+            await projectWorker(tsconfig);
+        }
     }
     else if (process.argv.includes('--projects')) {
         const projectsIndex = process.argv.indexOf('--projects');
@@ -74,20 +82,21 @@ const reset = '\x1b[0m';
         }
     }
     else {
-        await projectWorker();
+        const tsconfig = await askTSConfig();
+        await projectWorker(tsconfig);
     }
     process.exit(hasError ? 1 : 0);
     async function projectWorker(tsconfigOption) {
-        const tsconfig = await getTsconfigPath(tsconfigOption);
-        clack.intro(`${purple}[project]${reset} ${path.relative(process.cwd(), tsconfig)}`);
+        const tsconfig = require.resolve(tsconfigOption, { paths: [process.cwd()] });
+        clack.intro(`${purple('[project]')} ${path.relative(process.cwd(), tsconfig)}`);
         parsed = parseCommonLine(tsconfig);
         if (!parsed.fileNames.length) {
-            clack.outro(`${yellow}No input files found.${reset}`);
+            clack.outro(lightYellow('No included files.'));
             return;
         }
         const configFile = ts.findConfigFile(path.dirname(tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
         if (!configFile) {
-            clack.outro(`${yellow}No tsslint.config.ts found!${reset}`);
+            clack.outro(lightYellow('No tsslint.config.ts found.'));
             return;
         }
         if (!configs.has(configFile)) {
@@ -103,9 +112,6 @@ const reset = '\x1b[0m';
         if (!tsslintConfig) {
             return;
         }
-        if (!parsed.fileNames) {
-            throw new Error('No input files found in tsconfig!');
-        }
         projectVersion++;
         typeRootsVersion++;
         const lintCache = process.argv.includes('--force')
@@ -119,16 +125,23 @@ const reset = '\x1b[0m';
             tsconfig: ts.server.toNormalizedPath(tsconfig),
         };
         const linter = core.createLinter(projectContext, tsslintConfig, 'cli', clack);
-        const lintSpinner = clack.spinner();
+        let lintSpinner = clack.spinner();
         let hasFix = false;
+        let excluded = 0;
         let passed = 0;
         let errors = 0;
         let warnings = 0;
         let cached = 0;
-        lintSpinner.start();
+        let t = Date.now();
+        lintSpinner.start(darkGray(`[1/${parsed.fileNames.length}] ${path.relative(process.cwd(), parsed.fileNames[0])}`));
+        await new Promise(resolve => setTimeout(resolve, 100));
         for (let i = 0; i < parsed.fileNames.length; i++) {
             const fileName = parsed.fileNames[i];
-            lintSpinner.message(`${gray}[${i + 1}/${parsed.fileNames.length}] ${path.relative(process.cwd(), fileName)}${reset}`);
+            if (Date.now() - t > 100) {
+                t = Date.now();
+                lintSpinner.message(darkGray(`[${i + 1}/${parsed.fileNames.length}] ${path.relative(process.cwd(), fileName)}`));
+                await new Promise(resolve => setTimeout(resolve, 0));
+            }
             const fileMtime = fs.statSync(fileName).mtimeMs;
             let fileCache = lintCache[fileName];
             if (fileCache) {
@@ -146,6 +159,7 @@ const reset = '\x1b[0m';
             else {
                 lintCache[fileName] = fileCache = [fileMtime, {}, [], [], {}];
             }
+            let diagnostics;
             if (process.argv.includes('--fix')) {
                 let retry = 3;
                 let shouldRetry = true;
@@ -159,7 +173,7 @@ const reset = '\x1b[0m';
                         fileCache[2].length = 0;
                         fileCache[3].length = 0;
                     }
-                    const diagnostics = linter.lint(fileName, fileCache);
+                    diagnostics = linter.lint(fileName, fileCache);
                     const fixes = linter.getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache);
                     const textChanges = core.combineCodeFixes(fileName, fixes);
                     if (textChanges.length) {
@@ -175,9 +189,16 @@ const reset = '\x1b[0m';
                     ts.sys.writeFile(fileName, newSnapshot.getText(0, newSnapshot.getLength()));
                     fileCache[0] = fs.statSync(fileName).mtimeMs;
                 }
+                if (shouldRetry) {
+                    diagnostics = linter.lint(fileName, fileCache);
+                }
             }
             else {
-                const diagnostics = linter.lint(fileName, fileCache);
+                diagnostics = linter.lint(fileName, fileCache);
+            }
+            if (diagnostics.length) {
+                hasFix ||= linter.hasCodeFixes(fileName);
+                hasError ||= diagnostics.some(diagnostic => diagnostic.category === ts.DiagnosticCategory.Error);
                 for (const diagnostic of diagnostics) {
                     if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
                         continue;
@@ -187,73 +208,93 @@ const reset = '\x1b[0m';
                         getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
                         getNewLine: () => ts.sys.newLine,
                     });
-                    output = output.replace(`TS${diagnostic.code}`, `TSSLint(${diagnostic.code})`);
-                    if (diagnostic.category === ts.DiagnosticCategory.Error) {
-                        errors++;
-                        clack.log.error(output);
-                    }
-                    else if (diagnostic.category === ts.DiagnosticCategory.Warning) {
-                        warnings++;
-                        clack.log.warn(output);
+                    output = output.replace(`TS${diagnostic.code}`, String(diagnostic.code));
+                    if (lintSpinner) {
+                        if (diagnostic.category === ts.DiagnosticCategory.Error) {
+                            errors++;
+                            lintSpinner.stop(output, 1);
+                        }
+                        else if (diagnostic.category === ts.DiagnosticCategory.Warning) {
+                            warnings++;
+                            lintSpinner.stop(output, 2);
+                        }
+                        else {
+                            lintSpinner.stop(output);
+                        }
+                        lintSpinner = undefined;
                     }
                     else {
-                        clack.log.info(output);
+                        if (diagnostic.category === ts.DiagnosticCategory.Error) {
+                            errors++;
+                            clack.log.error(output);
+                        }
+                        else if (diagnostic.category === ts.DiagnosticCategory.Warning) {
+                            warnings++;
+                            clack.log.warning(output);
+                        }
+                        else {
+                            clack.log.info(output);
+                        }
                     }
                 }
-                if (diagnostics.length) {
-                    hasFix ||= linter.hasCodeFixes(fileName);
-                    hasError ||= diagnostics.some(diagnostic => diagnostic.category === ts.DiagnosticCategory.Error);
-                }
-                else {
-                    passed++;
-                }
+            }
+            else if (!Object.keys(linter.getRules(fileName, fileCache)).length) {
+                excluded++;
+            }
+            else {
+                passed++;
+            }
+            if (!lintSpinner) {
+                lintSpinner = clack.spinner();
+                lintSpinner.start(darkGray(`[${i + 1}/${parsed.fileNames.length}] ${path.relative(process.cwd(), parsed.fileNames[i])}`));
+                await new Promise(resolve => setTimeout(resolve, 100));
             }
         }
         if (cached) {
-            lintSpinner.stop(`${gray}Checked ${parsed.fileNames.length} files with cache.${reset} ${gray}(Use --force to ignore cache.)${reset}`);
+            lintSpinner.stop(darkGray(`Processed ${parsed.fileNames.length} files with cache. (Use --force to ignore cache.)`));
         }
         else {
-            lintSpinner.stop(`${gray}Checked ${parsed.fileNames.length} files.${reset}`);
-        }
-        if (hasFix) {
-            clack.log.message(`${gray}Use --fix to apply fixes.${reset}`);
+            lintSpinner.stop(darkGray(`Processed ${parsed.fileNames.length} files.`));
         }
         const data = [
-            [passed, 'passed', green],
-            [errors, 'errors', red],
-            [warnings, 'warnings', yellow],
+            [passed, 'passed', lightGreen],
+            [errors, 'errors', lightRed],
+            [warnings, 'warnings', lightYellow],
+            [excluded, 'excluded', darkGray],
         ];
-        const summary = data
+        let summary = data
             .filter(([count]) => count)
-            .map(([count, label, color]) => `${color}${count} ${label}${reset}`)
-            .join(` ${gray}|${reset} `);
+            .map(([count, label, color]) => color(`${count} ${label}`))
+            .join(darkGray(' | '));
+        if (hasFix) {
+            summary += darkGray(` (Use --fix to apply automatic fixes.)`);
+        }
+        else if (errors || warnings) {
+            summary += darkGray(` (No fixes available.)`);
+        }
         clack.outro(summary);
         cache.saveCache(configFile, lintCache, ts.sys.createHash);
     }
-    async function getTsconfigPath(tsconfig) {
-        if (!tsconfig) {
-            tsconfig = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-            let shortTsconfig = tsconfig ? path.relative(process.cwd(), tsconfig) : undefined;
-            if (!shortTsconfig?.startsWith('.')) {
-                shortTsconfig = `./${shortTsconfig}`;
-            }
-            tsconfig = await clack.text({
-                message: 'Select the tsconfig project. (Use --project or --projects to skip this prompt.)',
-                placeholder: shortTsconfig ? `${shortTsconfig} (${parseCommonLine(tsconfig).fileNames.length} files)` : 'No tsconfig.json/jsconfig.json found, please enter the path to the tsconfig.json/jsconfig.json file.',
-                defaultValue: shortTsconfig,
-                validate(value) {
-                    value ||= shortTsconfig;
-                    try {
-                        require.resolve(value, { paths: [process.cwd()] });
-                    }
-                    catch {
-                        return `File not found!`;
-                    }
-                },
-            });
+    async function askTSConfig() {
+        const presetConfig = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        let shortTsconfig = presetConfig ? path.relative(process.cwd(), presetConfig) : undefined;
+        if (!shortTsconfig?.startsWith('.')) {
+            shortTsconfig = `./${shortTsconfig}`;
         }
-        tsconfig = require.resolve(tsconfig, { paths: [process.cwd()] });
-        return tsconfig;
+        return await clack.text({
+            message: 'Select the project. (Use --project or --projects to skip this prompt.)',
+            placeholder: shortTsconfig ? `${shortTsconfig} (${parseCommonLine(presetConfig).fileNames.length} files)` : 'No tsconfig.json/jsconfig.json found, please enter the path to the tsconfig.json/jsconfig.json file.',
+            defaultValue: shortTsconfig,
+            validate(value) {
+                value ||= shortTsconfig;
+                try {
+                    require.resolve(value, { paths: [process.cwd()] });
+                }
+                catch {
+                    return 'No such file.';
+                }
+            },
+        });
     }
     function parseCommonLine(tsconfig) {
         const jsonConfigFile = ts.readJsonConfigFile(tsconfig, ts.sys.readFile);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.3.4",
+	"version": "1.3.6",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,12 +16,12 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.3.4",
-		"@tsslint/core": "1.3.4",
+		"@tsslint/config": "1.3.6",
+		"@tsslint/core": "1.3.6",
 		"glob": "^10.4.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "695d85b225a333106ecdc476d096c88b1f77ecee"
+	"gitHead": "d153aa87c92803b4c20fef1f5cf2799f1a599099"
 }