@tsslint/cli 1.3.1 → 1.3.3

package/index.js

@@ -6,12 +6,18 @@ 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';
 (async () => {
     let hasError = false;
     let projectVersion = 0;
     let typeRootsVersion = 0;
     let parsed;
-    const { log, text } = await import('@clack/prompts');
+    const clack = await import('@clack/prompts');
     const snapshots = new Map();
     const versions = new Map();
     const configs = new Map();
@@ -73,21 +79,20 @@ const fs = require("fs");
     process.exit(hasError ? 1 : 0);
     async function projectWorker(tsconfigOption) {
         const tsconfig = await getTsconfigPath(tsconfigOption);
+        clack.intro(`${purple}[project]${reset} ${path.relative(process.cwd(), tsconfig)}`);
+        parsed = parseCommonLine(tsconfig);
+        if (!parsed.fileNames.length) {
+            clack.outro(`${yellow}No input files found.${reset}`);
+            return;
+        }
         const configFile = ts.findConfigFile(path.dirname(tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
         if (!configFile) {
-            log.step(`Project: ${path.relative(process.cwd(), tsconfig)}`);
-            log.error('No tsslint.config.ts file found!');
+            clack.outro(`${yellow}No tsslint.config.ts found!${reset}`);
             return;
         }
-        parsed = parseCommonLine(tsconfig);
-        log.step(`Project: ${path.relative(process.cwd(), tsconfig)} (${parsed.fileNames.length} files)`);
         if (!configs.has(configFile)) {
             try {
-                configs.set(configFile, await core.buildConfigFile(configFile, ts.sys.createHash, {
-                    log: log.info,
-                    warn: log.warn,
-                    error: log.error,
-                }));
+                configs.set(configFile, await core.buildConfigFile(configFile, ts.sys.createHash, clack));
             }
             catch (err) {
                 configs.set(configFile, undefined);
@@ -113,10 +118,17 @@ const fs = require("fs");
             typescript: ts,
             tsconfig: ts.server.toNormalizedPath(tsconfig),
         };
-        const linter = core.createLinter(projectContext, tsslintConfig, 'cli');
+        const linter = core.createLinter(projectContext, tsslintConfig, 'cli', clack);
+        const lintSpinner = clack.spinner();
         let hasFix = false;
+        let passed = 0;
+        let errors = 0;
+        let warnings = 0;
         let cached = 0;
-        for (const fileName of parsed.fileNames) {
+        lintSpinner.start();
+        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}`);
             const fileMtime = fs.statSync(fileName).mtimeMs;
             let fileCache = lintCache[fileName];
             if (fileCache) {
@@ -177,28 +189,46 @@ const fs = require("fs");
                     });
                     output = output.replace(`TS${diagnostic.code}`, `TSSLint(${diagnostic.code})`);
                     if (diagnostic.category === ts.DiagnosticCategory.Error) {
-                        log.error(output);
+                        errors++;
+                        clack.log.error(output);
                     }
                     else if (diagnostic.category === ts.DiagnosticCategory.Warning) {
-                        log.warn(output);
+                        warnings++;
+                        clack.log.warn(output);
                     }
                     else {
-                        log.info(output);
+                        clack.log.info(output);
                     }
                 }
                 if (diagnostics.length) {
                     hasFix ||= linter.hasCodeFixes(fileName);
                     hasError ||= diagnostics.some(diagnostic => diagnostic.category === ts.DiagnosticCategory.Error);
                 }
+                else {
+                    passed++;
+                }
             }
         }
-        cache.saveCache(configFile, lintCache, ts.sys.createHash);
         if (cached) {
-            log.info(`Linted ${parsed.fileNames.length - cached} files. (Cached ${cached} files result, use --force to re-lint all files.)`);
+            lintSpinner.stop(`${gray}Checked ${parsed.fileNames.length} files with cache.${reset} ${gray}(Use --force to ignore cache.)${reset}`);
+        }
+        else {
+            lintSpinner.stop(`${gray}Checked ${parsed.fileNames.length} files.${reset}`);
         }
         if (hasFix) {
-            log.info(`Use --fix to apply fixes.`);
+            clack.log.message(`${gray}Use --fix to apply fixes.${reset}`);
         }
+        const data = [
+            [passed, 'passed', green],
+            [errors, 'errors', red],
+            [warnings, 'warnings', yellow],
+        ];
+        const summary = data
+            .filter(([count]) => count)
+            .map(([count, label, color]) => `${color}${count} ${label}${reset}`)
+            .join(` ${gray}|${reset} `);
+        clack.outro(summary);
+        cache.saveCache(configFile, lintCache, ts.sys.createHash);
     }
     async function getTsconfigPath(tsconfig) {
         if (!tsconfig) {
@@ -207,7 +237,7 @@ const fs = require("fs");
             if (!shortTsconfig?.startsWith('.')) {
                 shortTsconfig = `./${shortTsconfig}`;
             }
-            tsconfig = await text({
+            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,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.3.1",
+	"version": "1.3.3",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -15,13 +15,13 @@
 		"directory": "packages/cli"
 	},
 	"dependencies": {
-		"@clack/prompts": "^0.7.0",
-		"@tsslint/config": "1.3.1",
-		"@tsslint/core": "1.3.1",
+		"@clack/prompts": "^0.8.2",
+		"@tsslint/config": "1.3.3",
+		"@tsslint/core": "1.3.3",
 		"glob": "^10.4.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "ddc73232699ecd7b4e4bfe5c9b511254c5926986"
+	"gitHead": "0603ce9e9688c96478f96522b56335830390f740"
 }