@tsslint/cli 0.0.5 → 0.0.7

package/index.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=index.d.ts.map

package/index.js

@@ -13,17 +13,18 @@ const glob = require("glob");
     const { log, text } = await import('@clack/prompts');
     const snapshots = new Map();
     const versions = new Map();
+    const configs = new Map();
     const languageServiceHost = {
         ...ts.sys,
+        useCaseSensitiveFileNames() {
+            return ts.sys.useCaseSensitiveFileNames;
+        },
         getProjectVersion() {
             return projectVersion.toString();
         },
         getTypeRootsVersion() {
             return typeRootsVersion;
         },
-        useCaseSensitiveFileNames() {
-            return ts.sys.useCaseSensitiveFileNames;
-        },
         getCompilationSettings() {
             return parsed.options;
         },
@@ -51,13 +52,18 @@ const glob = require("glob");
     }
     else if (process.argv.includes('--projects')) {
         const projectsIndex = process.argv.indexOf('--projects');
-        const searchGlob = process.argv.slice(projectsIndex + 1);
-        const tsconfigs = glob.sync(searchGlob[0], { cwd: process.cwd() });
-        for (let tsconfig of tsconfigs) {
-            if (!tsconfig.startsWith('.')) {
-                tsconfig = `./${tsconfig}`;
+        for (let i = projectsIndex + 1; i < process.argv.length; i++) {
+            if (process.argv[i].startsWith('-')) {
+                break;
+            }
+            const searchGlob = process.argv[i];
+            const tsconfigs = glob.sync(searchGlob);
+            for (let tsconfig of tsconfigs) {
+                if (!tsconfig.startsWith('.')) {
+                    tsconfig = `./${tsconfig}`;
+                }
+                errors += await projectWorker(tsconfig);
             }
-            errors += await projectWorker(tsconfig);
         }
     }
     else {
@@ -72,29 +78,25 @@ const glob = require("glob");
             throw new Error('No tsslint.config.ts file found!');
         }
         log.info(`config path: ${configFile}`);
-        const tsslintConfig = await config.buildConfigFile(configFile);
+        if (!configs.has(configFile)) {
+            configs.set(configFile, await config.buildConfigFile(configFile));
+        }
+        const tsslintConfig = configs.get(configFile);
         parsed = parseCommonLine(tsconfig);
         if (!parsed.fileNames) {
             throw new Error('No input files found in tsconfig!');
         }
         projectVersion++;
         typeRootsVersion++;
-        const plugins = await Promise.all([
-            ...core.getBuiltInPlugins(false),
-            ...tsslintConfig.plugins ?? [],
-        ].map(plugin => plugin({
+        const linter = core.createLinter({
             configFile,
             languageService,
             languageServiceHost,
             typescript: ts,
             tsconfig,
-        })));
-        for (const plugin of plugins) {
-            if (plugin.resolveRules) {
-                tsslintConfig.rules = plugin.resolveRules(tsslintConfig.rules ?? {});
-            }
-        }
+        }, tsslintConfig, false);
         let errors = 0;
+        let warnings = 0;
         for (const fileName of parsed.fileNames) {
             if (process.argv.includes('--fix')) {
                 let retry = 3;
@@ -103,31 +105,17 @@ const glob = require("glob");
                 while (shouldRetry && retry) {
                     shouldRetry = false;
                     retry--;
-                    const sourceFile = languageService.getProgram()?.getSourceFile(fileName);
-                    if (!sourceFile) {
-                        throw new Error(`No source file found for ${fileName}`);
-                    }
-                    let diagnostics = plugins
-                        .map(plugin => plugin.lint?.(sourceFile, tsslintConfig.rules ?? {}))
-                        .flat()
-                        .filter((diag) => !!diag);
-                    for (const plugin of plugins) {
-                        if (plugin.resolveDiagnostics) {
-                            diagnostics = plugin.resolveDiagnostics(diagnostics);
-                        }
-                    }
-                    const fixes = plugins
-                        .map(plugin => plugin.getFixes?.(fileName, 0, sourceFile.text.length, diagnostics))
-                        .flat()
-                        .filter((fix) => !!fix);
+                    const diagnostics = linter.lint(fileName);
+                    const fixes = linter.getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics);
                     const changes = fixes
                         .map(fix => fix.changes)
                         .flat()
-                        .filter(change => change.fileName === sourceFile.fileName && change.textChanges.length)
+                        .filter(change => change.fileName === fileName && change.textChanges.length)
                         .sort((a, b) => b.textChanges[0].span.start - a.textChanges[0].span.start);
-                    let lastChangeAt = sourceFile.text.length;
+                    let lastChangeAt = Number.MAX_VALUE;
                     if (changes.length) {
-                        let text = sourceFile.text;
+                        const oldSnapshot = snapshots.get(fileName);
+                        let text = oldSnapshot.getText(0, oldSnapshot.getLength());
                         for (const change of changes) {
                             const textChanges = [...change.textChanges].sort((a, b) => b.span.start - a.span.start);
                             const lastChange = textChanges[0];
@@ -140,8 +128,8 @@ const glob = require("glob");
                             }
                         }
                         newSnapshot = ts.ScriptSnapshot.fromString(text);
-                        snapshots.set(sourceFile.fileName, newSnapshot);
-                        versions.set(sourceFile.fileName, (versions.get(sourceFile.fileName) ?? 0) + 1);
+                        snapshots.set(fileName, newSnapshot);
+                        versions.set(fileName, (versions.get(fileName) ?? 0) + 1);
                         projectVersion++;
                         shouldRetry = true;
                     }
@@ -155,12 +143,7 @@ const glob = require("glob");
                 if (!sourceFile) {
                     throw new Error(`No source file found for ${fileName}`);
                 }
-                let diagnostics = plugins.map(plugin => plugin.lint?.(sourceFile, tsslintConfig.rules ?? {})).flat().filter((diag) => !!diag);
-                for (const plugin of plugins) {
-                    if (plugin.resolveDiagnostics) {
-                        diagnostics = plugin.resolveDiagnostics(diagnostics);
-                    }
-                }
+                const diagnostics = linter.lint(fileName);
                 const output = ts.formatDiagnosticsWithColorAndContext(diagnostics, {
                     getCurrentDirectory: ts.sys.getCurrentDirectory,
                     getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
@@ -170,9 +153,10 @@ const glob = require("glob");
                     log.info(output);
                 }
                 errors += diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Error).length;
+                warnings += diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Warning).length;
             }
         }
-        if (errors) {
+        if (errors || warnings) {
             log.info(`Use --fix to apply fixes.`);
         }
         return errors;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "0.0.5",
+	"version": "0.0.7",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,12 +16,12 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.7.0",
-		"@tsslint/config": "0.0.5",
-		"@tsslint/core": "0.0.5",
+		"@tsslint/config": "0.0.7",
+		"@tsslint/core": "0.0.7",
 		"glob": "^10.3.10"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "0522e03f552e0ac5bb27124ef923ff093ff02cdc"
+	"gitHead": "ed1086b1f11469e0a9d6a14199c7e027eb28b488"
 }