@tsslint/cli 1.5.14 → 1.5.16

package/index.js

@@ -9,7 +9,6 @@ const glob = require("glob");
 const fs = require("fs");
 const os = require("os");
 const languagePlugins = require("./lib/languagePlugins.js");
-const promises_1 = require("node:timers/promises");
 const formatting_js_1 = require("./lib/formatting.js");
 const _reset = '\x1b[0m';
 const purple = (s) => '\x1b[35m' + s + _reset;
@@ -95,9 +94,10 @@ class Project {
     const processFiles = new Set();
     const tsconfigAndLanguages = new Map();
     const formattingSettings = getFormattingSettings();
+    const isTTY = process.stdout.isTTY;
     let projects = [];
-    let spinner = process.stdout.isTTY ? clack.spinner() : undefined;
-    let lastSpinnerUpdate = Date.now();
+    let spinner = isTTY ? clack.spinner() : undefined;
+    let spinnerStopingWarn = false;
     let hasFix = false;
     let allFilesNum = 0;
     let processed = 0;
@@ -106,6 +106,16 @@ class Project {
     let errors = 0;
     let warnings = 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('▲'));
+            }
+            // @ts-ignore
+            return write(...args);
+        };
+    }
     if (![
         '--project',
         '--projects',
@@ -269,14 +279,14 @@ class Project {
         (spinner?.stop ?? clack.log.message)(lightYellow('No input files.'));
         process.exit(1);
     }
-    if (threads === 1) {
-        await startWorker(worker.createLocal());
-    }
-    else {
+    if (isTTY || threads >= 2) {
         await Promise.all(new Array(threads).fill(0).map(() => {
             return startWorker(worker.create());
         }));
     }
+    else {
+        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.`));
@@ -335,17 +345,12 @@ class Project {
             return;
         }
         while (project.currentFileIndex < project.fileNames.length) {
-            const i = project.currentFileIndex++;
-            const fileName = project.fileNames[i];
+            const fileName = project.fileNames[project.currentFileIndex++];
+            addProcessFile(fileName);
             const fileStat = fs.statSync(fileName, { throwIfNoEntry: false });
             if (!fileStat) {
                 continue;
             }
-            addProcessFile(fileName);
-            if (spinner && Date.now() - lastSpinnerUpdate > 100) {
-                lastSpinnerUpdate = Date.now();
-                await (0, promises_1.setTimeout)(0);
-            }
             let fileCache = project.cache[fileName];
             if (fileCache) {
                 if (fileCache[0] !== fileStat.mtimeMs) {
@@ -393,7 +398,9 @@ class Project {
                 passed++;
             }
             processed++;
-            removeProcessFile(fileName);
+            removeProcessFile(fileName, project.currentFileIndex < project.fileNames.length
+                ? project.fileNames[project.currentFileIndex]
+                : undefined);
         }
         cache.saveCache(project.tsconfig, project.configFile, project.cache, ts.sys.createHash);
         await startWorker(linterWorker);
@@ -462,24 +469,37 @@ class Project {
         processFiles.add(fileName);
         updateSpinner();
     }
-    function removeProcessFile(fileName) {
+    function removeProcessFile(fileName, nextFileName) {
         processFiles.delete(fileName);
-        updateSpinner();
+        updateSpinner(nextFileName);
     }
-    function updateSpinner() {
-        if (processFiles.size === 1) {
-            const fileName = processFiles.values().next().value;
-            spinner?.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), fileName)}`));
+    function updateSpinner(nextFileName) {
+        let msg;
+        if (processFiles.size === 0) {
+            if (nextFileName) {
+                msg = darkGray(`[${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])}`);
         }
         else {
-            spinner?.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`));
+            msg = darkGray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`);
+        }
+        if (!spinner && isTTY) {
+            spinner = clack.spinner();
+            spinner.start(msg);
+        }
+        else {
+            spinner?.message(msg);
         }
     }
     function log(msg, code) {
         if (spinner) {
+            spinnerStopingWarn = code === 2;
             spinner.stop(msg, code);
-            spinner = clack.spinner();
-            spinner.start();
+            spinnerStopingWarn = false;
+            spinner = undefined;
         }
         else {
             if (code === 1) {
@@ -489,7 +509,7 @@ class Project {
                 clack.log.warn(msg);
             }
             else {
-                clack.log.success(msg);
+                clack.log.step(msg);
             }
         }
     }

package/lib/worker.js

@@ -131,17 +131,17 @@ function create() {
         setup(...args) {
             return sendRequest(setup, ...args);
         },
-        async lint(...args) {
-            const [res, newCache] = await sendRequest(lint, ...args);
-            Object.assign(args[1], newCache); // Sync the cache
+        async lint(...[fileName, fix, cache]) {
+            const [res, newCache] = await sendRequest(lint, fileName, fix, cache);
+            Object.assign(cache, newCache); // Sync the cache
             return res;
         },
         hasCodeFixes(...args) {
             return sendRequest(hasCodeFixes, ...args);
         },
-        async hasRules(...args) {
-            const [res, newCache] = await sendRequest(hasRules, ...args);
-            Object.assign(args[1], newCache); // Sync the cache
+        async hasRules(...[fileName, cache]) {
+            const [res, newCache] = await sendRequest(hasRules, fileName, cache);
+            Object.assign(cache, newCache); // Sync the cache
             return res;
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.5.14",
+	"version": "1.5.16",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.5.14",
-		"@tsslint/core": "1.5.14",
+		"@tsslint/config": "1.5.16",
+		"@tsslint/core": "1.5.16",
 		"@volar/language-core": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1",
@@ -30,5 +30,5 @@
 		"@vue-vine/language-service": "latest",
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "18423eb07acca1f6f016275700ba589c773725a5"
+	"gitHead": "85adb15843ec5c20916568fd8409b2adb9016a52"
 }