@tsslint/cli 2.0.5 → 2.0.6

package/index.js

@@ -8,6 +8,7 @@ const worker = require("./lib/worker.js");
 const glob = require("glob");
 const fs = require("fs");
 const os = require("os");
+const minimatch = require("minimatch");
 const languagePlugins = require("./lib/languagePlugins.js");
 process.env.TSSLINT_CLI = '1';
 const _reset = '\x1b[0m';
@@ -39,6 +40,13 @@ class Project {
     constructor(tsconfig, languages) {
         this.tsconfig = tsconfig;
         this.languages = languages;
+        /**
+         * file names for passing to ts language service host (getScriptFileNames)
+         */
+        this.rawFileNames = [];
+        /**
+         * file names after filter, for linting process
+         */
         this.fileNames = [];
         this.options = {};
         this.currentFileIndex = 0;
@@ -75,21 +83,23 @@ class Project {
             return this;
         }
         const commonLine = await parseCommonLine(this.tsconfig, this.languages);
-        this.fileNames = commonLine.fileNames;
+        this.rawFileNames = commonLine.fileNames;
         this.options = commonLine.options;
-        if (!this.fileNames.length) {
+        if (!this.rawFileNames.length) {
             clack.log.message(`${label} ${gray(path.relative(process.cwd(), this.tsconfig))} ${gray('(0)')}`);
             return this;
         }
-        const originalFileNamesLength = this.fileNames.length;
-        if (filesFilter.size) {
-            this.fileNames = this.fileNames.filter(f => filesFilter.has(f));
+        if (filesFilter.length) {
+            this.fileNames = this.rawFileNames.filter(fileName => filesFilter.some(filter => minimatch.minimatch(fileName, filter, { dot: true })));
             if (!this.fileNames.length) {
-                clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${gray('(No files left after filter)')}`);
+                clack.log.message(`${label} ${gray(path.relative(process.cwd(), this.tsconfig))} ${gray('(No files left after filter)')}`);
                 return this;
             }
         }
-        const filteredLengthDiff = originalFileNamesLength - this.fileNames.length;
+        else {
+            this.fileNames = this.rawFileNames;
+        }
+        const filteredLengthDiff = this.rawFileNames.length - 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);
@@ -272,27 +282,32 @@ class Project {
             }
         }
     }
-    // get filter glob option
-    let filterSet = new Set();
-    const filterArgIndex = process.argv.findIndex(arg => arg === '--filter');
+    function normalizeFilterGlobPath(filterGlob, expandDirToGlob = true) {
+        let filterPath = path.resolve(process.cwd(), filterGlob);
+        if (expandDirToGlob && fs.existsSync(filterPath) && fs.statSync(filterPath).isDirectory()) {
+            filterPath = path.join(filterPath, '**/*');
+        }
+        return ts.server.toNormalizedPath(filterPath);
+    }
+    const filters = [];
+    const filterArgIndex = process.argv.indexOf('--filter');
     if (filterArgIndex !== -1) {
-        for (let i = filterArgIndex + 1; i < process.argv.length; i++) {
+        const filterGlob = process.argv[filterArgIndex + 1];
+        if (!filterGlob || filterGlob.startsWith('-')) {
+            clack.log.error(red(`Missing argument for --filter.`));
+            process.exit(1);
+        }
+        filters.push(normalizeFilterGlobPath(filterGlob));
+        for (let i = filterArgIndex + 2; 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);
+            if (filterGlob.startsWith('-')) {
+                break;
             }
-            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);
+            filters.push(normalizeFilterGlobPath(filterGlob));
         }
     }
     for (const [tsconfig, languages] of tsconfigAndLanguages) {
-        projects.push(await new Project(tsconfig, languages).init(clack, filterSet));
+        projects.push(await new Project(tsconfig, languages).init(clack, filters));
     }
     spinner?.start();
     projects = projects.filter(project => !!project.configFile);
@@ -358,7 +373,7 @@ class Project {
             return;
         }
         project.worker = linterWorker;
-        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.fileNames, project.options);
+        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.rawFileNames, project.options);
         if (!setupSuccess) {
             projects = projects.filter(p => p !== project);
             startWorker(linterWorker);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,13 +16,14 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "2.0.5",
-		"@tsslint/core": "2.0.5",
+		"@tsslint/config": "2.0.6",
+		"@tsslint/core": "2.0.6",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1",
-		"json5": "^2.2.3"
+		"json5": "^2.2.3",
+		"minimatch": "^10.0.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -31,5 +32,5 @@
 		"@vue-vine/language-service": "latest",
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "29342ffe8a6a5cac8059107f9de4cbb45e367a39"
+	"gitHead": "b5914c99cb269150c2518f0f7b097ad2a996296d"
 }