@tsslint/core 1.0.16 → 1.0.17

package/index.d.ts

@@ -3,7 +3,7 @@ export * from './lib/watch';
 import type { Config, ProjectContext } from '@tsslint/types';
 import type * as ts from 'typescript';
 export type Linter = ReturnType<typeof createLinter>;
-export declare function createLinter(ctx: ProjectContext, config: Config, withStack: boolean): {
+export declare function createLinter(ctx: ProjectContext, config: Config | Config[], withStack: boolean): {
     lint(fileName: string): ts.DiagnosticWithLocation[];
     hasCodeFixes(fileName: string): boolean;
     getCodeFixes(fileName: string, start: number, end: number, diagnostics?: ts.Diagnostic[]): ts.CodeFixAction[];

package/index.js

@@ -44,24 +44,26 @@ function createLinter(ctx, config, withStack) {
     const fileFixes = new Map();
     const fileRefactors = new Map();
     const sourceFiles = new Map();
-    const plugins = (config.plugins ?? []).map(plugin => plugin(ctx));
-    const includes = [];
-    const excludes = [];
-    for (const include of config.include ?? []) {
-        const basePath = path.dirname(ctx.configFile);
-        includes.push([include, path.resolve(basePath, include)]);
-    }
-    for (const exclude of config.exclude ?? []) {
-        const basePath = path.dirname(ctx.configFile);
-        excludes.push([exclude, path.resolve(basePath, exclude)]);
-    }
+    const basePath = path.dirname(ctx.configFile);
+    const configs = (Array.isArray(config) ? config : [config])
+        .map(config => ({
+        config,
+        includes: (config.include ?? []).map(include => {
+            return path.resolve(basePath, include);
+        }),
+        excludes: (config.exclude ?? []).map(exclude => {
+            return path.resolve(basePath, exclude);
+        }),
+    }));
+    const plugins = configs.map(({ config }) => config.plugins ?? []).flat().map(plugin => plugin(ctx));
+    const debug = configs.some(({ config }) => config.debug);
     return {
         lint(fileName) {
             let diagnostics = [];
             let debugInfo;
-            if (config.debug) {
+            if (debug) {
                 debugInfo = {
-                    category: ts.DiagnosticCategory.Message,
+                    category: ts.DiagnosticCategory.Suggestion,
                     code: 'debug',
                     messageText: '- Config: ' + ctx.configFile + '\n',
                     file: ctx.languageService.getProgram().getSourceFile(fileName),
@@ -72,36 +74,12 @@ function createLinter(ctx, config, withStack) {
                 };
                 diagnostics.push(debugInfo);
             }
-            for (const [exclude, pattern] of excludes) {
-                if (minimatch.minimatch(fileName, pattern)) {
-                    if (debugInfo) {
-                        debugInfo.messageText += '- Included: ❌ (via ' + JSON.stringify({ exclude: [exclude] }) + ')\n';
-                    }
-                    return diagnostics;
-                }
-            }
-            if (includes.length) {
-                let included = false;
-                for (const [include, pattern] of includes) {
-                    if (minimatch.minimatch(fileName, pattern)) {
-                        included = true;
-                        if (debugInfo) {
-                            debugInfo.messageText += '- Included: ✅ (via ' + JSON.stringify({ include: [include] }) + ')\n';
-                        }
-                        break;
-                    }
-                }
-                if (!included) {
-                    if (debugInfo) {
-                        debugInfo.messageText += '- Included: ❌ (not included in any include patterns)\n';
-                    }
-                    return diagnostics;
-                }
-            }
-            else {
+            const rules = getFileRules(fileName);
+            if (!rules || !Object.keys(rules).length) {
                 if (debugInfo) {
-                    debugInfo.messageText += '- Included: ✅ (no include patterns)\n';
+                    debugInfo.messageText += '- Rules: ❌ (no rules)\n';
                 }
+                return diagnostics;
             }
             const sourceFile = ctx.languageService.getProgram()?.getSourceFile(fileName);
             if (!sourceFile) {
@@ -115,7 +93,6 @@ function createLinter(ctx, config, withStack) {
                 reportSuggestion,
             };
             const token = ctx.languageServiceHost.getCancellationToken?.();
-            const rules = getFileRules(sourceFile.fileName);
             const fixes = getFileFixes(sourceFile.fileName);
             const refactors = getFileRefactors(sourceFile.fileName);
             let currentRuleId;
@@ -265,7 +242,9 @@ function createLinter(ctx, config, withStack) {
             }
             function pushRelatedInformation(error, stack) {
                 if (stack.fileName && stack.lineNumber !== undefined && stack.columnNumber !== undefined) {
-                    let fileName = stack.fileName.replace(/\\/g, '/');
+                    let fileName = stack.fileName
+                        .replace(/\\/g, '/')
+                        .split('?time=')[0];
                     if (fileName.startsWith('file://')) {
                         fileName = fileName.substring('file://'.length);
                     }
@@ -366,7 +345,19 @@ function createLinter(ctx, config, withStack) {
     function getFileRules(fileName) {
         let rules = fileRules.get(fileName);
         if (!rules) {
-            rules = { ...config.rules };
+            rules = {};
+            for (const { config, includes, excludes } of configs) {
+                if (!config.rules) {
+                    continue;
+                }
+                if (excludes.some(pattern => minimatch.minimatch(fileName, pattern))) {
+                    continue;
+                }
+                if (includes.length && !includes.some(pattern => minimatch.minimatch(fileName, pattern))) {
+                    continue;
+                }
+                rules = { ...rules, ...config.rules };
+            }
             for (const plugin of plugins) {
                 if (plugin.resolveRules) {
                     rules = plugin.resolveRules(fileName, rules);

package/lib/build.d.ts

@@ -1,2 +1,2 @@
 import type { Config } from '@tsslint/config';
-export declare function buildConfigFile(configFilePath: string, createHash?: (path: string) => string, logger?: Pick<typeof console, 'log' | 'warn' | 'error'>): Promise<Config>;
+export declare function buildConfigFile(configFilePath: string, createHash?: (path: string) => string, logger?: Pick<typeof console, 'log' | 'warn' | 'error'>): Promise<Config | Config[]>;

package/lib/watch.d.ts

@@ -1,6 +1,6 @@
 import esbuild = require('esbuild');
 import type { Config } from '@tsslint/config';
-export declare function watchConfigFile(configFilePath: string, onBuild: (config: Config | undefined, result: esbuild.BuildResult) => void, watch?: boolean, createHash?: (path: string) => string, logger?: Pick<typeof console, 'log' | 'warn' | 'error'>): Promise<esbuild.BuildContext<{
+export declare function watchConfigFile(configFilePath: string, onBuild: (config: Config | Config[] | undefined, result: esbuild.BuildResult) => void, watch?: boolean, createHash?: (path: string) => string, logger?: Pick<typeof console, 'log' | 'warn' | 'error'>): Promise<esbuild.BuildContext<{
     entryPoints: string[];
     bundle: true;
     sourcemap: true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.0.16",
+	"version": "1.0.17",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,11 +12,11 @@
 		"directory": "packages/core"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.0.16",
+		"@tsslint/types": "1.0.17",
 		"error-stack-parser": "^2.1.4",
 		"esbuild": "^0.23.0",
 		"minimatch": "^10.0.1",
 		"source-map-support": "^0.5.21"
 	},
-	"gitHead": "e430814fd394da5afbcd3157d02c246592162f75"
+	"gitHead": "5ffa59ffc098b272ff18579d9fc57f1658978a5e"
 }