@tsslint/cli 2.0.4 → 2.0.5

package/index.js

@@ -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) {
@@ -79,10 +78,19 @@ class Project {
         this.fileNames = commonLine.fileNames;
         this.options = commonLine.options;
         if (!this.fileNames.length) {
-            clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray('(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)} ${gray(`(${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);
         }
@@ -264,8 +272,27 @@ class Project {
             }
         }
     }
+    // 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);
@@ -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);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "2.0.4",
+	"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.4",
-		"@tsslint/core": "2.0.4",
+		"@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": "6006d07f0f218840a49ae281f074970eed1eddbd"
+	"gitHead": "29342ffe8a6a5cac8059107f9de4cbb45e367a39"
 }