@tsslint/cli 0.0.6 → 0.0.8

package/index.js

@@ -6,7 +6,7 @@ const config = require("@tsslint/config");
 const core = require("@tsslint/core");
 const glob = require("glob");
 (async () => {
-    let errors = 0;
+    let hasError = false;
     let projectVersion = 0;
     let typeRootsVersion = 0;
     let parsed;
@@ -48,7 +48,7 @@ const glob = require("glob");
     if (process.argv.includes('--project')) {
         const projectIndex = process.argv.indexOf('--project');
         const tsconfig = process.argv[projectIndex + 1];
-        errors += await projectWorker(tsconfig);
+        await projectWorker(tsconfig);
     }
     else if (process.argv.includes('--projects')) {
         const projectsIndex = process.argv.indexOf('--projects');
@@ -62,22 +62,23 @@ const glob = require("glob");
                 if (!tsconfig.startsWith('.')) {
                     tsconfig = `./${tsconfig}`;
                 }
-                errors += await projectWorker(tsconfig);
+                await projectWorker(tsconfig);
             }
         }
     }
     else {
-        errors += await projectWorker();
+        await projectWorker();
     }
-    process.exit(errors ? 1 : 0);
+    process.exit(hasError ? 1 : 0);
     async function projectWorker(tsconfigOption) {
         const tsconfig = await getTsconfigPath(tsconfigOption);
-        log.info(`tsconfig path: ${tsconfig} (${parseCommonLine(tsconfig).fileNames.length} input files)`);
+        log.step(`Project: ${path.relative(process.cwd(), tsconfig)} (${parseCommonLine(tsconfig).fileNames.length} input files)`);
         const configFile = ts.findConfigFile(path.dirname(tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
         if (!configFile) {
-            throw new Error('No tsslint.config.ts file found!');
+            log.error('No tsslint.config.ts file found!');
+            return;
         }
-        log.info(`config path: ${configFile}`);
+        log.message(`Config: ${path.relative(process.cwd(), configFile)}`);
         if (!configs.has(configFile)) {
             configs.set(configFile, await config.buildConfigFile(configFile));
         }
@@ -95,8 +96,7 @@ const glob = require("glob");
             typescript: ts,
             tsconfig,
         }, tsslintConfig, false);
-        let errors = 0;
-        let warnings = 0;
+        let hasFix = false;
         for (const fileName of parsed.fileNames) {
             if (process.argv.includes('--fix')) {
                 let retry = 3;
@@ -107,27 +107,10 @@ const glob = require("glob");
                     retry--;
                     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 === fileName && change.textChanges.length)
-                        .sort((a, b) => b.textChanges[0].span.start - a.textChanges[0].span.start);
-                    let lastChangeAt = Number.MAX_VALUE;
-                    if (changes.length) {
+                    const textChanges = core.combineCodeFixes(fileName, fixes);
+                    if (textChanges.length) {
                         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];
-                            const firstChange = textChanges[textChanges.length - 1];
-                            if (lastChangeAt >= lastChange.span.start + lastChange.span.length) {
-                                lastChangeAt = firstChange.span.start;
-                                for (const change of textChanges) {
-                                    text = text.slice(0, change.span.start) + change.newText + text.slice(change.span.start + change.span.length);
-                                }
-                            }
-                        }
-                        newSnapshot = ts.ScriptSnapshot.fromString(text);
+                        newSnapshot = core.applyTextChanges(oldSnapshot, textChanges);
                         snapshots.set(fileName, newSnapshot);
                         versions.set(fileName, (versions.get(fileName) ?? 0) + 1);
                         projectVersion++;
@@ -144,22 +127,31 @@ const glob = require("glob");
                     throw new Error(`No source file found for ${fileName}`);
                 }
                 const diagnostics = linter.lint(fileName);
-                const output = ts.formatDiagnosticsWithColorAndContext(diagnostics, {
-                    getCurrentDirectory: ts.sys.getCurrentDirectory,
-                    getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
-                    getNewLine: () => ts.sys.newLine,
-                });
-                if (output) {
-                    log.info(output);
+                for (const diagnostic of diagnostics) {
+                    const output = ts.formatDiagnosticsWithColorAndContext([diagnostic], {
+                        getCurrentDirectory: ts.sys.getCurrentDirectory,
+                        getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
+                        getNewLine: () => ts.sys.newLine,
+                    });
+                    if (diagnostic.category === ts.DiagnosticCategory.Error) {
+                        log.error(output);
+                    }
+                    else if (diagnostic.category === ts.DiagnosticCategory.Warning) {
+                        log.warn(output);
+                    }
+                    else {
+                        log.info(output);
+                    }
+                }
+                if (diagnostics.length) {
+                    hasFix ||= linter.getCodeFixes(fileName, 0, Number.MAX_VALUE, diagnostics).length >= 1;
+                    hasError ||= diagnostics.some(diagnostic => diagnostic.category === ts.DiagnosticCategory.Error);
                 }
-                errors += diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Error).length;
-                warnings += diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Warning).length;
             }
         }
-        if (errors || warnings) {
+        if (hasFix) {
             log.info(`Use --fix to apply fixes.`);
         }
-        return errors;
     }
     async function getTsconfigPath(tsconfig) {
         if (!tsconfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,12 +16,12 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.7.0",
-		"@tsslint/config": "0.0.6",
-		"@tsslint/core": "0.0.6",
+		"@tsslint/config": "0.0.8",
+		"@tsslint/core": "0.0.8",
 		"glob": "^10.3.10"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "a9a381f7c5e84819c99b70f6b429150ce766739c"
+	"gitHead": "6fc30164bf7d50722f3fdb565f178b13821be692"
 }