@tsslint/core 1.0.11 → 1.0.13

package/index.d.ts

@@ -5,6 +5,8 @@ export declare function createLinter(ctx: ProjectContext, config: Config, withSt
     lint(fileName: string): ts.DiagnosticWithLocation[];
     hasCodeFixes(fileName: string): boolean;
     getCodeFixes(fileName: string, start: number, end: number, diagnostics?: ts.Diagnostic[]): ts.CodeFixAction[];
+    getRefactors(fileName: string, start: number, end: number): ts.RefactorActionInfo[];
+    getRefactorEdits(fileName: string, name: string): ts.FileTextChanges[] | undefined;
 };
 export declare function combineCodeFixes(fileName: string, fixes: ts.CodeFixAction[]): ts.TextChange[];
 export declare function applyTextChanges(baseSnapshot: ts.IScriptSnapshot, textChanges: ts.TextChange[]): ts.IScriptSnapshot;

package/index.js

@@ -24,6 +24,7 @@ function createLinter(ctx, config, withStack) {
     const ts = ctx.typescript;
     const fileRules = new Map();
     const fileFixes = new Map();
+    const fileRefactors = new Map();
     const sourceFiles = new Map();
     const plugins = (config.plugins ?? []).map(plugin => plugin(ctx));
     const excludes = [];
@@ -50,9 +51,11 @@ function createLinter(ctx, config, withStack) {
             const token = ctx.languageServiceHost.getCancellationToken?.();
             const rules = getFileRules(sourceFile.fileName);
             const fixes = getFileFixes(sourceFile.fileName);
-            let result = [];
+            const refactors = getFileRefactors(sourceFile.fileName);
+            let diagnostics = [];
             let currentRuleId;
             fixes.clear();
+            refactors.clear();
             for (const [id, rule] of Object.entries(rules)) {
                 if (token?.isCancellationRequested()) {
                     break;
@@ -68,10 +71,29 @@ function createLinter(ctx, config, withStack) {
             }
             for (const plugin of plugins) {
                 if (plugin.resolveDiagnostics) {
-                    result = plugin.resolveDiagnostics(sourceFile.fileName, result);
+                    diagnostics = plugin.resolveDiagnostics(sourceFile.fileName, diagnostics);
                 }
             }
-            return result;
+            const diagnosticSet = new Set(diagnostics);
+            for (const [ruleId, fix] of [...fixes]) {
+                const final = fix.filter(fix => diagnosticSet.has(fix.diagnostic));
+                if (final.length) {
+                    fixes.set(ruleId, final);
+                }
+                else {
+                    fixes.delete(ruleId);
+                }
+            }
+            for (const [ruleId, refactor] of [...refactors]) {
+                const final = refactor.filter(fix => diagnosticSet.has(fix.diagnostic));
+                if (final.length) {
+                    refactors.set(ruleId, final);
+                }
+                else {
+                    refactors.delete(ruleId);
+                }
+            }
+            return diagnostics;
             function reportError(message, start, end, traceOffset = 0) {
                 return report(ts.DiagnosticCategory.Error, message, start, end, traceOffset);
             }
@@ -103,7 +125,7 @@ function createLinter(ctx, config, withStack) {
                         }
                     }
                 }
-                result.push(error);
+                diagnostics.push(error);
                 return {
                     withDeprecated() {
                         error.reportsDeprecated = true;
@@ -126,6 +148,19 @@ function createLinter(ctx, config, withStack) {
                         }));
                         return this;
                     },
+                    withRefactor(title, getEdits) {
+                        if (!refactors.has(currentRuleId)) {
+                            refactors.set(currentRuleId, []);
+                        }
+                        refactors.get(currentRuleId).push(({
+                            diagnostic: error,
+                            title,
+                            start,
+                            end,
+                            getEdits,
+                        }));
+                        return this;
+                    },
                 };
             }
             function pushRelatedInformation(error, stack) {
@@ -197,6 +232,36 @@ function createLinter(ctx, config, withStack) {
             }
             return result;
         },
+        getRefactors(fileName, start, end) {
+            const refactorsMap = getFileRefactors(fileName);
+            let result = [];
+            for (const [ruleId, refactors] of refactorsMap) {
+                for (let i = 0; i < refactors.length; i++) {
+                    const refactor = refactors[i];
+                    if ((refactor.start >= start && refactor.start <= end) ||
+                        (refactor.end >= start && refactor.end <= end) ||
+                        (start >= refactor.start && start <= refactor.end) ||
+                        (end >= refactor.start && end <= refactor.end)) {
+                        result.push({
+                            name: `tsslint:${ruleId}:${i}`,
+                            description: refactor.title + ' (' + ruleId + ')',
+                            kind: 'quickfix',
+                        });
+                    }
+                }
+            }
+            return result;
+        },
+        getRefactorEdits(fileName, name) {
+            if (name.startsWith('tsslint:')) {
+                const [ruleId, index] = name.slice('tsslint:'.length).split(':');
+                const refactorsMap = getFileRefactors(fileName);
+                const refactor = refactorsMap.get(ruleId)?.[Number(index)];
+                if (refactor) {
+                    return refactor.getEdits();
+                }
+            }
+        },
     };
     function getFileRules(fileName) {
         let rules = fileRules.get(fileName);
@@ -217,6 +282,12 @@ function createLinter(ctx, config, withStack) {
         }
         return fileFixes.get(fileName);
     }
+    function getFileRefactors(fileName) {
+        if (!fileRefactors.has(fileName)) {
+            fileRefactors.set(fileName, new Map());
+        }
+        return fileRefactors.get(fileName);
+    }
 }
 exports.createLinter = createLinter;
 function combineCodeFixes(fileName, fixes) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.0.11",
+	"version": "1.0.13",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -17,7 +17,7 @@
 		"source-map-support": "^0.5.21"
 	},
 	"devDependencies": {
-		"@tsslint/config": "1.0.11"
+		"@tsslint/config": "1.0.13"
 	},
-	"gitHead": "5797507a1ef19b82bafa6f43cdf412905723374f"
+	"gitHead": "47f0f4bdbb68d8343c2967d46bd4b7bf9fb00e7e"
 }