@tsslint/core 1.4.5 → 1.5.0

package/index.d.ts

@@ -1,6 +1,6 @@
 export * from './lib/build';
 export * from './lib/watch';
-import type { Config, ProjectContext, Rule, Rules } from '@tsslint/types';
+import type { Config, ProjectContext, Rule, Rules, FormattingProcess } from '@tsslint/types';
 import type * as ts from 'typescript';
 export type FileLintCache = [
     mtime: number,
@@ -8,10 +8,14 @@ export type FileLintCache = [
         hasFix: boolean,
         diagnostics: ts.DiagnosticWithLocation[]
     ]>,
-    minimatchResult: Record<string, boolean>
+    minimatchResult: Record<string, boolean>,
+    formated: boolean
 ];
 export type Linter = ReturnType<typeof createLinter>;
-export declare function createLinter(ctx: ProjectContext, config: Config | Config[], mode: 'cli' | 'typescript-plugin', syntaxOnlyLanguageService?: ts.LanguageService): {
+export declare function createLinter(ctx: ProjectContext, rootDir: string, config: Config | Config[], mode: 'cli' | 'typescript-plugin', syntaxOnlyLanguageService?: ts.LanguageService & {
+    getNonBoundSourceFile?(fileName: string): ts.SourceFile;
+}): {
+    format(sourceFile: ts.SourceFile, minimatchCache?: FileLintCache[2]): ts.TextChange[];
     lint(fileName: string, cache?: FileLintCache): ts.DiagnosticWithLocation[];
     hasCodeFixes(fileName: string): boolean;
     getCodeFixes(fileName: string, start: number, end: number, diagnostics?: ts.Diagnostic[], minimatchCache?: FileLintCache[2]): ts.CodeFixAction[];
@@ -22,6 +26,7 @@ export declare function createLinter(ctx: ProjectContext, config: Config | Confi
         include: string[];
         exclude: string[];
         rules: Rules;
+        formatting: FormattingProcess[] | undefined;
         plugins: import("@tsslint/types").PluginInstance[];
     }[];
 };

package/index.js

@@ -23,24 +23,64 @@ __exportStar(require("./lib/watch"), exports);
 const ErrorStackParser = require("error-stack-parser");
 const path = require("path");
 const minimatch = require("minimatch");
-function createLinter(ctx, config, mode, syntaxOnlyLanguageService) {
+function createLinter(ctx, rootDir, config, mode, syntaxOnlyLanguageService) {
     const ts = ctx.typescript;
     const fileRules = new Map();
+    const fileFmtProcesses = new Map();
     const fileConfigs = new Map();
     const lintResults = new Map();
-    const basePath = path.dirname(ctx.configFile);
     const configs = (Array.isArray(config) ? config : [config])
         .map(config => ({
         include: config.include ?? [],
         exclude: config.exclude ?? [],
         rules: config.rules ?? {},
+        formatting: config.formatting,
         plugins: (config.plugins ?? []).map(plugin => plugin(ctx)),
     }));
     const normalizedPath = new Map();
     const rule2Mode = new Map();
-    const getNonBoundSourceFile = syntaxOnlyLanguageService.getNonBoundSourceFile;
+    const getNonBoundSourceFile = syntaxOnlyLanguageService?.getNonBoundSourceFile;
     let shouldEnableTypeAware = false;
     return {
+        format(sourceFile, minimatchCache) {
+            const preprocess = getFileFmtProcesses(sourceFile.fileName, minimatchCache);
+            const changes = [];
+            const tmpChanges = [];
+            const fmtCtx = {
+                typescript: ts,
+                sourceFile,
+                insert(pos, text) {
+                    tmpChanges.push({ span: { start: pos, length: 0 }, newText: text });
+                },
+                remove(start, end) {
+                    tmpChanges.push({ span: { start, length: end - start }, newText: '' });
+                },
+                replace(start, end, text) {
+                    tmpChanges.push({ span: { start, length: end - start }, newText: text });
+                },
+            };
+            for (const process of preprocess) {
+                process(fmtCtx);
+                if (tmpChanges.every(a => {
+                    const aStart = a.span.start;
+                    const aEnd = aStart + a.span.length;
+                    for (const b of changes) {
+                        const bStart = b.span.start;
+                        const bEnd = bStart + b.span.length;
+                        if ((bStart >= aEnd && bStart > aStart)
+                            || (bEnd <= aStart && bEnd < aEnd)) {
+                            continue;
+                        }
+                        return false;
+                    }
+                    return true;
+                })) {
+                    changes.push(...tmpChanges);
+                }
+                tmpChanges.length = 0;
+            }
+            return changes;
+        },
         lint(fileName, cache) {
             let currentRuleId;
             let shouldRetry = false;
@@ -315,6 +355,19 @@ function createLinter(ctx, config, mode, syntaxOnlyLanguageService) {
         getRules: getFileRules,
         getConfigs: getFileConfigs,
     };
+    function getFileFmtProcesses(fileName, minimatchCache) {
+        if (!fileFmtProcesses.has(fileName)) {
+            const allPreprocess = [];
+            const configs = getFileConfigs(fileName, minimatchCache);
+            for (const { formatting } of configs) {
+                if (formatting) {
+                    allPreprocess.push(...formatting);
+                }
+            }
+            fileFmtProcesses.set(fileName, allPreprocess);
+        }
+        return fileFmtProcesses.get(fileName);
+    }
     function getFileRules(fileName, minimatchCache) {
         let rules = fileRules.get(fileName);
         if (!rules) {
@@ -364,7 +417,7 @@ function createLinter(ctx, config, mode, syntaxOnlyLanguageService) {
                 }
                 let normalized = normalizedPath.get(pattern);
                 if (!normalized) {
-                    normalized = ts.server.toNormalizedPath(path.resolve(basePath, pattern));
+                    normalized = ts.server.toNormalizedPath(path.resolve(rootDir, pattern));
                     normalizedPath.set(pattern, normalized);
                 }
                 const res = minimatch.minimatch(fileName, normalized);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.4.5",
+	"version": "1.5.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/core"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.4.5",
+		"@tsslint/types": "1.5.0",
 		"error-stack-parser": "^2.1.4",
 		"esbuild": ">=0.17.0",
 		"minimatch": "^10.0.1"
@@ -23,5 +23,5 @@
 	"scripts": {
 		"postinstall": "node scripts/cleanCache.js"
 	},
-	"gitHead": "e8f0b027ff4e15d2633efd15c08bf2054896cf1b"
+	"gitHead": "6585740b4ecbc8251163923b4e8c7978fe9cb12c"
 }