@tsslint/cli 1.4.3 → 1.4.5

package/index.js

@@ -335,16 +335,14 @@ class Project {
                 if (fileCache[0] !== fileMtime) {
                     fileCache[0] = fileMtime;
                     fileCache[1] = {};
-                    fileCache[2].length = 0;
-                    fileCache[3].length = 0;
-                    fileCache[4] = {};
+                    fileCache[2] = {};
                 }
                 else {
                     cached++;
                 }
             }
             else {
-                project.cache[fileName] = fileCache = [fileMtime, {}, [], [], {}];
+                project.cache[fileName] = fileCache = [fileMtime, {}, {}];
             }
             let diagnostics;
             if (process.argv.includes('--fix')) {
@@ -353,12 +351,11 @@ class Project {
             else {
                 diagnostics = await linterWorker.lint(fileName, fileCache);
             }
+            diagnostics = diagnostics.filter(diagnostic => diagnostic.category !== ts.DiagnosticCategory.Suggestion);
             if (diagnostics.length) {
-                hasFix ||= Object.values(fileCache[1]).some(fixes => fixes > 0) || await linterWorker.hasCodeFixes(fileName);
+                hasFix ||= await linterWorker.hasCodeFixes(fileName);
                 for (const diagnostic of diagnostics) {
-                    if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
-                        continue;
-                    }
+                    hasFix ||= !!fileCache[1][diagnostic.code]?.[0];
                     let output = ts.formatDiagnosticsWithColorAndContext([diagnostic], {
                         getCurrentDirectory: ts.sys.getCurrentDirectory,
                         getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
@@ -379,7 +376,7 @@ class Project {
                     }
                 }
             }
-            else if (!(await linterWorker.hasRules(fileName, fileCache[4]))) {
+            else if (!(await linterWorker.hasRules(fileName, fileCache[2]))) {
                 excluded++;
             }
             else {
@@ -408,10 +405,10 @@ class Project {
     function updateSpinner() {
         if (processFiles.size === 1) {
             const fileName = processFiles.values().next().value;
-            spinner.message(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), fileName)}`);
+            spinner.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] ${path.relative(process.cwd(), fileName)}`));
         }
         else {
-            spinner.message(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`);
+            spinner.message(darkGray(`[${processed + processFiles.size}/${allFilesNum}] Processing ${processFiles.size} files`));
         }
     }
     function log(msg, code) {

package/lib/worker.d.ts

@@ -18,5 +18,5 @@ declare function setup(tsconfig: string, languages: string[], configFile: string
 declare function lintAndFix(fileName: string, fileCache: core.FileLintCache): readonly [ts.DiagnosticWithLocation[], core.FileLintCache];
 declare function lint(fileName: string, fileCache: core.FileLintCache): readonly [ts.DiagnosticWithLocation[], core.FileLintCache];
 declare function hasCodeFixes(fileName: string): boolean;
-declare function hasRules(fileName: string, minimatchCache: core.FileLintCache[4]): readonly [boolean, Record<string, boolean>];
+declare function hasRules(fileName: string, minimatchCache: core.FileLintCache[2]): readonly [boolean, Record<string, boolean>];
 export {};

package/lib/worker.js

@@ -18,6 +18,7 @@ let fileNames = [];
 let language;
 let linter;
 let linterLanguageService;
+let linterSyntaxOnlyLanguageService;
 const snapshots = new Map();
 const versions = new Map();
 const originalHost = {
@@ -68,6 +69,7 @@ const originalHost = {
 };
 const linterHost = { ...originalHost };
 const originalService = ts.createLanguageService(linterHost);
+const originalSyntaxOnlyService = ts.createLanguageService(linterHost, undefined, true);
 function createLocal() {
     return {
         setup(...args) {
@@ -159,6 +161,7 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
         }
     }
     linterLanguageService = originalService;
+    linterSyntaxOnlyLanguageService = originalSyntaxOnlyService;
     language = undefined;
     const plugins = await languagePlugins.load(tsconfig, languages);
     if (plugins.length) {
@@ -176,6 +179,9 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
         const proxy = (0, typescript_1.createProxyLanguageService)(linterLanguageService);
         proxy.initialize(language);
         linterLanguageService = proxy.proxy;
+        const syntaxOnly = (0, typescript_1.createProxyLanguageService)(linterSyntaxOnlyLanguageService);
+        syntaxOnly.initialize(language);
+        linterSyntaxOnlyLanguageService = syntaxOnly.proxy;
     }
     projectVersion++;
     typeRootsVersion++;
@@ -192,7 +198,7 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
         languageServiceHost: linterHost,
         typescript: ts,
         tsconfig: ts.server.toNormalizedPath(tsconfig),
-    }, config, 'cli');
+    }, config, 'cli', linterSyntaxOnlyLanguageService);
     return true;
 }
 function lintAndFix(fileName, fileCache) {
@@ -201,15 +207,14 @@ function lintAndFix(fileName, fileCache) {
     let newSnapshot;
     let diagnostics;
     while (shouldRetry && retry--) {
-        if (Object.values(fileCache[1]).some(fixes => fixes > 0)) {
+        if (Object.values(fileCache[1]).some(([hasFix]) => hasFix)) {
             // Reset the cache if there are any fixes applied.
             fileCache[1] = {};
-            fileCache[2].length = 0;
-            fileCache[3].length = 0;
+            fileCache[2] = {};
         }
         diagnostics = linter.lint(fileName, fileCache);
         let fixes = linter
-            .getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache[4])
+            .getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache[2])
             .filter(fix => fix.fixId === 'tsslint');
         if (language) {
             fixes = fixes.map(fix => {
@@ -231,8 +236,7 @@ function lintAndFix(fileName, fileCache) {
         ts.sys.writeFile(fileName, newSnapshot.getText(0, newSnapshot.getLength()));
         fileCache[0] = fs.statSync(fileName).mtimeMs;
         fileCache[1] = {};
-        fileCache[2].length = 0;
-        fileCache[3].length = 0;
+        fileCache[2] = {};
     }
     if (shouldRetry) {
         diagnostics = linter.lint(fileName, fileCache);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.4.3",
+	"version": "1.4.5",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.4.3",
-		"@tsslint/core": "1.4.3",
+		"@tsslint/config": "1.4.5",
+		"@tsslint/core": "1.4.5",
 		"@volar/language-core": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1"
@@ -28,5 +28,5 @@
 	"devDependencies": {
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "7cdb4a39c0af8ee4cebd430bb546c6b6e2ddc28b"
+	"gitHead": "e8f0b027ff4e15d2633efd15c08bf2054896cf1b"
 }