@tsslint/cli 1.2.4 → 1.3.1

package/index.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ts = require("typescript");
 const path = require("path");
 const core = require("@tsslint/core");
+const cache = require("./lib/cache");
 const glob = require("glob");
+const fs = require("fs");
 (async () => {
     let hasError = false;
     let projectVersion = 0;
@@ -72,11 +74,13 @@ const glob = require("glob");
     async function projectWorker(tsconfigOption) {
         const tsconfig = await getTsconfigPath(tsconfigOption);
         const configFile = ts.findConfigFile(path.dirname(tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
-        log.step(`Project: ${path.relative(process.cwd(), tsconfig)} (${parseCommonLine(tsconfig).fileNames.length} files)`);
         if (!configFile) {
+            log.step(`Project: ${path.relative(process.cwd(), tsconfig)}`);
             log.error('No tsslint.config.ts file found!');
             return;
         }
+        parsed = parseCommonLine(tsconfig);
+        log.step(`Project: ${path.relative(process.cwd(), tsconfig)} (${parsed.fileNames.length} files)`);
         if (!configs.has(configFile)) {
             try {
                 configs.set(configFile, await core.buildConfigFile(configFile, ts.sys.createHash, {
@@ -94,21 +98,42 @@ const glob = require("glob");
         if (!tsslintConfig) {
             return;
         }
-        parsed = parseCommonLine(tsconfig);
         if (!parsed.fileNames) {
             throw new Error('No input files found in tsconfig!');
         }
         projectVersion++;
         typeRootsVersion++;
-        const linter = core.createLinter({
+        const lintCache = process.argv.includes('--force')
+            ? {}
+            : cache.loadCache(configFile, ts.sys.createHash);
+        const projectContext = {
             configFile,
             languageService,
             languageServiceHost,
             typescript: ts,
             tsconfig: ts.server.toNormalizedPath(tsconfig),
-        }, tsslintConfig, false);
+        };
+        const linter = core.createLinter(projectContext, tsslintConfig, 'cli');
         let hasFix = false;
+        let cached = 0;
         for (const fileName of parsed.fileNames) {
+            const fileMtime = fs.statSync(fileName).mtimeMs;
+            let fileCache = lintCache[fileName];
+            if (fileCache) {
+                if (fileCache[0] !== fileMtime) {
+                    fileCache[0] = fileMtime;
+                    fileCache[1] = {};
+                    fileCache[2].length = 0;
+                    fileCache[3].length = 0;
+                    fileCache[4] = {};
+                }
+                else {
+                    cached++;
+                }
+            }
+            else {
+                lintCache[fileName] = fileCache = [fileMtime, {}, [], [], {}];
+            }
             if (process.argv.includes('--fix')) {
                 let retry = 3;
                 let shouldRetry = true;
@@ -116,8 +141,14 @@ const glob = require("glob");
                 while (shouldRetry && retry) {
                     shouldRetry = false;
                     retry--;
-                    const diagnostics = linter.lint(fileName);
-                    const fixes = linter.getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics);
+                    if (Object.values(fileCache[1]).some(fixes => fixes > 0)) {
+                        // Reset the cache if there are any fixes applied.
+                        fileCache[1] = {};
+                        fileCache[2].length = 0;
+                        fileCache[3].length = 0;
+                    }
+                    const diagnostics = linter.lint(fileName, fileCache);
+                    const fixes = linter.getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics, fileCache);
                     const textChanges = core.combineCodeFixes(fileName, fixes);
                     if (textChanges.length) {
                         const oldSnapshot = snapshots.get(fileName);
@@ -130,10 +161,11 @@ const glob = require("glob");
                 }
                 if (newSnapshot) {
                     ts.sys.writeFile(fileName, newSnapshot.getText(0, newSnapshot.getLength()));
+                    fileCache[0] = fs.statSync(fileName).mtimeMs;
                 }
             }
             else {
-                const diagnostics = linter.lint(fileName);
+                const diagnostics = linter.lint(fileName, fileCache);
                 for (const diagnostic of diagnostics) {
                     if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
                         continue;
@@ -160,6 +192,10 @@ const glob = require("glob");
                 }
             }
         }
+        cache.saveCache(configFile, lintCache, ts.sys.createHash);
+        if (cached) {
+            log.info(`Linted ${parsed.fileNames.length - cached} files. (Cached ${cached} files result, use --force to re-lint all files.)`);
+        }
         if (hasFix) {
             log.info(`Use --fix to apply fixes.`);
         }

package/lib/cache.d.ts

@@ -0,0 +1,4 @@
+import core = require('@tsslint/core');
+export type CacheData = Record<string, core.FileLintCache>;
+export declare function loadCache(configFilePath: string, createHash?: (path: string) => string): CacheData;
+export declare function saveCache(configFilePath: string, cache: CacheData, createHash?: (path: string) => string): void;

package/lib/cache.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadCache = loadCache;
+exports.saveCache = saveCache;
+const core = require("@tsslint/core");
+const path = require("path");
+const fs = require("fs");
+function loadCache(configFilePath, createHash = btoa) {
+    const outDir = core.getDotTsslintPath(configFilePath);
+    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '.cache.json';
+    const cacheFilePath = path.join(outDir, cacheFileName);
+    const cacheFileStat = fs.statSync(cacheFilePath, { throwIfNoEntry: false });
+    const configFileStat = fs.statSync(configFilePath, { throwIfNoEntry: false });
+    if (cacheFileStat?.isFile() && cacheFileStat.mtimeMs > (configFileStat?.mtimeMs ?? 0)) {
+        try {
+            return require(cacheFilePath);
+        }
+        catch {
+            return {};
+        }
+    }
+    return {};
+}
+function saveCache(configFilePath, cache, createHash = btoa) {
+    const outDir = core.getDotTsslintPath(configFilePath);
+    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '.cache.json';
+    const cacheFilePath = path.join(outDir, cacheFileName);
+    fs.writeFileSync(cacheFilePath, JSON.stringify(cache));
+}
+//# sourceMappingURL=cache.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.2.4",
+	"version": "1.3.1",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,12 +16,12 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.7.0",
-		"@tsslint/config": "1.2.4",
-		"@tsslint/core": "1.2.4",
+		"@tsslint/config": "1.3.1",
+		"@tsslint/core": "1.3.1",
 		"glob": "^10.4.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "818bc257e90e431ca8988477862238c70a4757ff"
+	"gitHead": "ddc73232699ecd7b4e4bfe5c9b511254c5926986"
 }