@tsslint/cli 2.0.3 → 2.0.5

package/index.js

@@ -11,11 +11,11 @@ const os = require("os");
 const languagePlugins = require("./lib/languagePlugins.js");
 process.env.TSSLINT_CLI = '1';
 const _reset = '\x1b[0m';
-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/
@@ -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));
@@ -39,7 +39,6 @@ class Project {
     constructor(tsconfig, languages) {
         this.tsconfig = tsconfig;
         this.languages = languages;
-        this.workers = [];
         this.fileNames = [];
         this.options = {};
         this.currentFileIndex = 0;
@@ -47,7 +46,7 @@ class Project {
     }
     async init(
     // @ts-expect-error
-    clack) {
+    clack, filesFilter) {
         this.configFile = ts.findConfigFile(path.dirname(this.tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
         const labels = [];
         if (this.languages.length === 0) {
@@ -70,19 +69,28 @@ 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.message(`${label} ${gray(path.relative(process.cwd(), this.tsconfig))} ${gray('(0)')}`);
             return this;
         }
-        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
+        const originalFileNamesLength = this.fileNames.length;
+        if (filesFilter.size) {
+            this.fileNames = this.fileNames.filter(f => filesFilter.has(f));
+            if (!this.fileNames.length) {
+                clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray('(No files left after filter)')}`);
+                return this;
+            }
+        }
+        const filteredLengthDiff = originalFileNamesLength - this.fileNames.length;
+        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray(`(${this.fileNames.length}${filteredLengthDiff ? `, skipped ${filteredLengthDiff}` : ''})`)}`);
         if (!process.argv.includes('--force')) {
             this.cache = cache.loadCache(this.tsconfig, this.configFile, ts.sys.createHash);
         }
@@ -112,7 +120,7 @@ class Project {
         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);
@@ -177,7 +185,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({
@@ -196,7 +204,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] : []);
@@ -245,7 +253,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) {
@@ -259,13 +267,32 @@ class Project {
                 }
             }
             if (!foundArg) {
-                clack.log.error(lightRed(`Missing argument for ${projectFlag}.`));
+                clack.log.error(red(`Missing argument for ${projectFlag}.`));
                 process.exit(1);
             }
         }
     }
+    // get filter glob option
+    let filterSet = new Set();
+    const filterArgIndex = process.argv.findIndex(arg => arg === '--filter');
+    if (filterArgIndex !== -1) {
+        for (let i = filterArgIndex + 1; i < process.argv.length; i++) {
+            const filterGlob = process.argv[i];
+            if (!filterGlob || filterGlob.startsWith('-')) {
+                clack.log.error(red(`Missing argument for --filter.`));
+                process.exit(1);
+            }
+            const fileNames = glob.sync(filterGlob).map(f => path.resolve(f));
+            for (const fileName of fileNames)
+                filterSet.add(fileName);
+        }
+        if (!filterSet.size) {
+            clack.log.error(red(`No files found after --filter files.`));
+            process.exit(1);
+        }
+    }
     for (const [tsconfig, languages] of tsconfigAndLanguages) {
-        projects.push(await new Project(tsconfig, languages).init(clack));
+        projects.push(await new Project(tsconfig, languages).init(clack, filterSet));
     }
     spinner?.start();
     projects = projects.filter(project => !!project.configFile);
@@ -278,7 +305,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) {
@@ -290,33 +317,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],
-        [suggestions, 'suggestions', darkGray],
-        [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);
@@ -325,17 +352,12 @@ class Project {
         if (!unfinishedProjects.length) {
             return;
         }
-        // Select a project that has not has a worker yet
-        let project = unfinishedProjects.find(project => !project.workers.length);
+        // Select a project that does not have a worker yet
+        const project = unfinishedProjects.find(project => !project.worker);
         if (!project) {
-            // Choose a project with the most files left per worker
-            project = unfinishedProjects.sort((a, b) => {
-                const aFilesPerWorker = (a.fileNames.length - a.currentFileIndex) / a.workers.length;
-                const bFilesPerWorker = (b.fileNames.length - b.currentFileIndex) / b.workers.length;
-                return bFilesPerWorker - aFilesPerWorker;
-            })[0];
+            return;
         }
-        project.workers.push(linterWorker);
+        project.worker = linterWorker;
         const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.fileNames, project.options);
         if (!setupSuccess) {
             projects = projects.filter(p => p !== project);
@@ -423,7 +445,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);
     }
@@ -439,14 +461,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();
@@ -488,7 +510,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.3",
+	"version": "2.0.5",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "2.0.3",
-		"@tsslint/core": "2.0.3",
+		"@tsslint/config": "2.0.5",
+		"@tsslint/core": "2.0.5",
 		"@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": "1950a26843ec8ca974ea4f10efa4b6ad36e2ffbf"
+	"gitHead": "29342ffe8a6a5cac8059107f9de4cbb45e367a39"
 }