@tsslint/core 1.2.2 → 1.2.4

package/index.js

@@ -46,22 +46,23 @@ function createLinter(ctx, config, withStack) {
     }
     const ts = ctx.typescript;
     const fileRules = new Map();
+    const fileConfigs = new Map();
     const fileFixes = new Map();
     const fileRefactors = new Map();
     const sourceFiles = new Map();
     const basePath = path.dirname(ctx.configFile);
     const configs = (Array.isArray(config) ? config : [config])
         .map(config => ({
-        config,
+        rules: config.rules ?? {},
         includes: (config.include ?? []).map(include => {
             return ts.server.toNormalizedPath(path.resolve(basePath, include));
         }),
         excludes: (config.exclude ?? []).map(exclude => {
             return ts.server.toNormalizedPath(path.resolve(basePath, exclude));
         }),
+        plugins: (config.plugins ?? []).map(plugin => plugin(ctx)),
     }));
-    const plugins = configs.map(({ config }) => config.plugins ?? []).flat().map(plugin => plugin(ctx));
-    const debug = configs.some(({ config }) => config.debug);
+    const debug = (Array.isArray(config) ? config : [config]).some(config => config.debug);
     return {
         lint(fileName) {
             let diagnostics = [];
@@ -156,9 +157,12 @@ function createLinter(ctx, config, withStack) {
                 }
             };
             processRules(rules);
-            for (const plugin of plugins) {
-                if (plugin.resolveDiagnostics) {
-                    diagnostics = plugin.resolveDiagnostics(sourceFile.fileName, diagnostics);
+            const configs = getFileConfigs(fileName);
+            for (const { plugins } of configs) {
+                for (const { resolveDiagnostics } of plugins) {
+                    if (resolveDiagnostics) {
+                        diagnostics = resolveDiagnostics(sourceFile.fileName, diagnostics);
+                    }
                 }
             }
             const diagnosticSet = new Set(diagnostics);
@@ -200,6 +204,7 @@ function createLinter(ctx, config, withStack) {
                         }
                     }
                 }
+                fixes.set(error, []);
                 diagnostics.push(error);
                 currentIssues++;
                 return {
@@ -213,9 +218,6 @@ function createLinter(ctx, config, withStack) {
                     },
                     withFix(title, getEdits) {
                         currentFixes++;
-                        if (!fixes.has(error)) {
-                            fixes.set(error, []);
-                        }
                         fixes.get(error).push(({ title, getEdits }));
                         return this;
                     },
@@ -278,6 +280,7 @@ function createLinter(ctx, config, withStack) {
             return false;
         },
         getCodeFixes(fileName, start, end, diagnostics) {
+            const configs = getFileConfigs(fileName);
             const fixesMap = getFileFixes(fileName);
             const result = [];
             for (const [diagnostic, actions] of fixesMap) {
@@ -300,9 +303,11 @@ function createLinter(ctx, config, withStack) {
                             fixAllDescription: 'Fix all TSSLint errors'
                         });
                     }
-                    for (const plugin of plugins) {
-                        if (plugin.resolveCodeFixes) {
-                            codeFixes = plugin.resolveCodeFixes(fileName, diagnostic, codeFixes);
+                    for (const { plugins } of configs) {
+                        for (const { resolveCodeFixes } of plugins) {
+                            if (resolveCodeFixes) {
+                                codeFixes = resolveCodeFixes(fileName, diagnostic, codeFixes);
+                            }
                         }
                     }
                     result.push(...codeFixes);
@@ -342,29 +347,42 @@ function createLinter(ctx, config, withStack) {
         },
     };
     function getFileRules(fileName) {
-        let rules = fileRules.get(fileName);
-        if (!rules) {
-            rules = {};
-            for (const { config, includes, excludes } of configs) {
-                if (!config.rules) {
-                    continue;
+        let result = fileRules.get(fileName);
+        if (!result) {
+            result = {};
+            const configs = getFileConfigs(fileName);
+            for (const { rules } of configs) {
+                result = {
+                    ...result,
+                    ...rules,
+                };
+            }
+            for (const { plugins } of configs) {
+                for (const { resolveRules } of plugins) {
+                    if (resolveRules) {
+                        result = resolveRules(fileName, result);
+                    }
                 }
+            }
+            fileRules.set(fileName, result);
+        }
+        return result;
+    }
+    function getFileConfigs(fileName) {
+        let result = fileConfigs.get(fileName);
+        if (!result) {
+            result = configs.filter(({ includes, excludes }) => {
                 if (excludes.some(pattern => minimatch.minimatch(fileName, pattern))) {
-                    continue;
+                    return false;
                 }
                 if (includes.length && !includes.some(pattern => minimatch.minimatch(fileName, pattern))) {
-                    continue;
+                    return false;
                 }
-                rules = { ...rules, ...config.rules };
-            }
-            for (const plugin of plugins) {
-                if (plugin.resolveRules) {
-                    rules = plugin.resolveRules(fileName, rules);
-                }
-            }
-            fileRules.set(fileName, rules);
+                return true;
+            });
+            fileConfigs.set(fileName, result);
         }
-        return rules;
+        return result;
     }
     function getFileFixes(fileName) {
         if (!fileFixes.has(fileName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.2.2",
+	"version": "1.2.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,11 +12,11 @@
 		"directory": "packages/core"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.2.2",
+		"@tsslint/types": "1.2.4",
 		"error-stack-parser": "^2.1.4",
 		"esbuild": ">=0.17.0",
 		"minimatch": "^10.0.1",
 		"source-map-support": "^0.5.21"
 	},
-	"gitHead": "1cc6be27db1a1532fee17dea34a5f169c0e82329"
+	"gitHead": "818bc257e90e431ca8988477862238c70a4757ff"
 }