@tsslint/cli 1.5.17 → 1.6.0

package/index.js

@@ -9,7 +9,7 @@ const glob = require("glob");
 const fs = require("fs");
 const os = require("os");
 const languagePlugins = require("./lib/languagePlugins.js");
-const formatting_js_1 = require("./lib/formatting.js");
+process.env.TSSLINT_CLI = '1';
 const _reset = '\x1b[0m';
 const purple = (s) => '\x1b[35m' + s + _reset;
 const cyan = (s) => '\x1b[36m' + s + _reset;
@@ -93,7 +93,6 @@ class Project {
     const clack = await import('@clack/prompts');
     const processFiles = new Set();
     const tsconfigAndLanguages = new Map();
-    const formattingSettings = getFormattingSettings();
     const isTTY = process.stdout.isTTY;
     let projects = [];
     let spinner = isTTY ? clack.spinner() : undefined;
@@ -290,12 +289,6 @@ class Project {
     (spinner?.stop ?? clack.log.message)(cached
         ? darkGray(`Processed ${processed} files with cache. (Use `) + cyan(`--force`) + darkGray(` to ignore cache.)`)
         : darkGray(`Processed ${processed} files.`));
-    if (process.argv.includes('--fix') && !formattingSettings) {
-        const vscodeSettings = ts.findConfigFile(process.cwd(), ts.sys.fileExists, '.vscode/settings.json');
-        if (vscodeSettings) {
-            clack.log.message(darkGray(`Found available editor settings, you can use `) + cyan(`--vscode-settings ${path.relative(process.cwd(), vscodeSettings)}`) + darkGray(` to enable code format.`));
-        }
-    }
     const projectsFlag = process.argv.find(arg => arg.endsWith('-projects'));
     if (projectsFlag) {
         clack.log.warn(darkGray(`Please use `)
@@ -338,7 +331,7 @@ class Project {
             })[0];
         }
         project.workers.push(linterWorker);
-        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.fileNames, project.options, formattingSettings);
+        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.fileNames, project.options);
         if (!setupSuccess) {
             projects = projects.filter(p => p !== project);
             startWorker(linterWorker);
@@ -363,7 +356,7 @@ class Project {
                 }
             }
             else {
-                project.cache[fileName] = fileCache = [fileStat.mtimeMs, {}, {}, false];
+                project.cache[fileName] = fileCache = [fileStat.mtimeMs, {}, {}];
             }
             let diagnostics = await linterWorker.lint(fileName, process.argv.includes('--fix'), fileCache);
             diagnostics = diagnostics.filter(diagnostic => diagnostic.category !== ts.DiagnosticCategory.Suggestion);
@@ -405,60 +398,6 @@ class Project {
         cache.saveCache(project.tsconfig, project.configFile, project.cache, ts.sys.createHash);
         await startWorker(linterWorker);
     }
-    function getFormattingSettings() {
-        let formattingSettings;
-        if (process.argv.includes('--vscode-settings')) {
-            formattingSettings = {
-                typescript: {},
-                javascript: {},
-                vue: {},
-            };
-            for (const section of ['typescript', 'javascript']) {
-                formattingSettings[section] = {
-                    ...ts.getDefaultFormatCodeSettings('\n'),
-                    indentStyle: ts.IndentStyle.Smart,
-                    newLineCharacter: '\n',
-                    insertSpaceAfterCommaDelimiter: true,
-                    insertSpaceAfterConstructor: false,
-                    insertSpaceAfterSemicolonInForStatements: true,
-                    insertSpaceBeforeAndAfterBinaryOperators: true,
-                    insertSpaceAfterKeywordsInControlFlowStatements: true,
-                    insertSpaceAfterFunctionKeywordForAnonymousFunctions: true,
-                    insertSpaceBeforeFunctionParenthesis: false,
-                    insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
-                    insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
-                    insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
-                    insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: true,
-                    insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
-                    insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
-                    insertSpaceAfterTypeAssertion: false,
-                    placeOpenBraceOnNewLineForFunctions: false,
-                    placeOpenBraceOnNewLineForControlBlocks: false,
-                    semicolons: ts.SemicolonPreference.Ignore,
-                };
-            }
-            let vscodeSettingsConfig = process.argv[process.argv.indexOf('--vscode-settings') + 1];
-            if (!vscodeSettingsConfig || vscodeSettingsConfig.startsWith('-')) {
-                clack.log.error(lightRed(`Missing argument for --vscode-settings.`));
-                process.exit(1);
-            }
-            const vscodeSettingsFile = resolvePath(vscodeSettingsConfig);
-            const vscodeSettings = (0, formatting_js_1.getVSCodeFormattingSettings)(vscodeSettingsFile);
-            formattingSettings.typescript = {
-                ...formattingSettings.typescript,
-                ...vscodeSettings.typescript,
-            };
-            formattingSettings.javascript = {
-                ...formattingSettings.javascript,
-                ...vscodeSettings.javascript,
-            };
-            formattingSettings.vue = {
-                ...formattingSettings.vue,
-                ...vscodeSettings.vue,
-            };
-        }
-        return formattingSettings;
-    }
     async function getBuiltConfig(configFile) {
         if (!builtConfigs.has(configFile)) {
             builtConfigs.set(configFile, core.buildConfig(configFile, ts.sys.createHash, spinner, (s, code) => log(darkGray(s), code)));

package/lib/worker.d.ts

@@ -1,31 +1,18 @@
 import ts = require('typescript');
 import core = require('@tsslint/core');
-import { type getVSCodeFormattingSettings } from './formatting.js';
 export declare function createLocal(): {
-    setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions, _fmtSettings: {
-        javascript: ts.FormatCodeSettings;
-        typescript: ts.FormatCodeSettings;
-        vue: {
-            'script.initialIndent'?: boolean;
-        };
-    } | undefined): Promise<boolean>;
+    setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions): Promise<boolean>;
     lint(fileName: string, fix: boolean, fileCache: core.FileLintCache): ts.DiagnosticWithLocation[];
     hasCodeFixes(fileName: string): boolean;
     hasRules(fileName: string, minimatchCache: Record<string, boolean>): boolean;
 };
 export declare function create(): {
-    setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions, _fmtSettings: {
-        javascript: ts.FormatCodeSettings;
-        typescript: ts.FormatCodeSettings;
-        vue: {
-            'script.initialIndent'?: boolean;
-        };
-    } | undefined): Promise<boolean>;
+    setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions): Promise<boolean>;
     lint(fileName: string, fix: boolean, fileCache: core.FileLintCache): Promise<ts.DiagnosticWithLocation[]>;
     hasCodeFixes(fileName: string): Promise<boolean>;
     hasRules(fileName: string, minimatchCache: Record<string, boolean>): Promise<boolean>;
 };
-declare function setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions, _fmtSettings: ReturnType<typeof getVSCodeFormattingSettings> | undefined): Promise<boolean>;
+declare function setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions): Promise<boolean>;
 declare function lint(fileName: string, fix: boolean, fileCache: core.FileLintCache): readonly [ts.DiagnosticWithLocation[], core.FileLintCache];
 declare function hasCodeFixes(fileName: string): boolean;
 declare function hasRules(fileName: string, minimatchCache: core.FileLintCache[2]): readonly [boolean, Record<string, boolean>];

package/lib/worker.js

@@ -12,8 +12,6 @@ const languagePlugins = require("./languagePlugins.js");
 const language_core_1 = require("@volar/language-core");
 const typescript_1 = require("@volar/typescript");
 const transform_1 = require("@volar/typescript/lib/node/transform");
-const transform_js_1 = require("@volar/typescript/lib/node/transform.js");
-const formatting_js_1 = require("./formatting.js");
 let projectVersion = 0;
 let typeRootsVersion = 0;
 let options = {};
@@ -22,42 +20,6 @@ let language;
 let linter;
 let linterLanguageService;
 let linterSyntaxOnlyLanguageService;
-let fmtSettings;
-const formatLanguageService = ts.createLanguageService({
-    ...ts.sys,
-    getCompilationSettings() {
-        return options;
-    },
-    getScriptFileNames() {
-        return [];
-    },
-    getScriptVersion() {
-        return '0';
-    },
-    getScriptSnapshot() {
-        return formattingSnapshot;
-    },
-    getScriptKind() {
-        return formattingScriptKind;
-    },
-    useCaseSensitiveFileNames() {
-        return ts.sys.useCaseSensitiveFileNames;
-    },
-    getCurrentDirectory() {
-        return ts.sys.getCurrentDirectory();
-    },
-    getDefaultLibFileName() {
-        return ts.getDefaultLibFilePath(options);
-    },
-}, undefined, true);
-let formattingSnapshot;
-let formattingScriptKind;
-let formattingIndex = 0;
-function formatVirtualScript(kind, settings, snapshot) {
-    formattingSnapshot = snapshot;
-    formattingScriptKind = kind;
-    return formatLanguageService.getFormattingEditsForDocument(`${formattingIndex++}.txt`, settings);
-}
 const snapshots = new Map();
 const versions = new Map();
 const originalHost = {
@@ -165,7 +127,7 @@ const handlers = {
     hasCodeFixes,
     hasRules,
 };
-async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _options, _fmtSettings) {
+async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _options) {
     const clack = await import('@clack/prompts');
     let config;
     try {
@@ -222,12 +184,11 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
             allowNonTsExtensions: true,
         }
         : _options;
-    fmtSettings = _fmtSettings;
     linter = core.createLinter({
         languageService: linterLanguageService,
         languageServiceHost: linterHost,
         typescript: ts,
-    }, path.dirname(configFile), config, 'cli', linterSyntaxOnlyLanguageService);
+    }, path.dirname(configFile), config, () => { }, linterSyntaxOnlyLanguageService);
     return true;
 }
 function lint(fileName, fix, fileCache) {
@@ -253,114 +214,12 @@ function lint(fileName, fix, fileCache) {
         }
         const textChanges = core.combineCodeFixes(fileName, fixes);
         if (textChanges.length) {
-            fileCache[3] = false;
             const oldSnapshot = snapshots.get(fileName);
             newSnapshot = core.applyTextChanges(oldSnapshot, textChanges);
             snapshots.set(fileName, newSnapshot);
             versions.set(fileName, (versions.get(fileName) ?? 0) + 1);
             projectVersion++;
         }
-        if (!fileCache[3] && fmtSettings) {
-            fileCache[3] = true;
-            let script = language?.scripts.get(fileName);
-            let linterEdits = [];
-            let serviceEdits = [];
-            if (script?.generated) {
-                for (const code of (0, language_core_1.forEachEmbeddedCode)(script.generated.root)) {
-                    if ((code.languageId === 'javascript'
-                        || code.languageId === 'typescript'
-                        || code.languageId === 'javascriptreact'
-                        || code.languageId === 'typescriptreact')
-                        && code.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
-                        const scriptKind = code.languageId === 'javascript' ? ts.ScriptKind.JS
-                            : code.languageId === 'javascriptreact' ? ts.ScriptKind.JSX
-                                : code.languageId === 'typescript' ? ts.ScriptKind.TS
-                                    : ts.ScriptKind.TSX;
-                        const sourceFile = ts.createSourceFile(fileName, code.snapshot.getText(0, code.snapshot.getLength()), ts.ScriptTarget.Latest, true, scriptKind);
-                        linterEdits.push(...linter
-                            .format(sourceFile, fileCache[2])
-                            .map(edit => {
-                            return (0, transform_js_1.transformTextChange)(script, language, {
-                                code,
-                                extension: '',
-                                scriptKind: scriptKind,
-                                preventLeadingOffset: true,
-                            }, edit, false, language_core_1.isFormattingEnabled)?.[1];
-                        })
-                            .filter(edit => !!edit));
-                    }
-                }
-            }
-            else {
-                const sourceFile = originalSyntaxOnlyService.getNonBoundSourceFile(fileName);
-                linterEdits = linter.format(sourceFile, fileCache[2]);
-            }
-            if (linterEdits.length) {
-                const oldSnapshot = snapshots.get(fileName);
-                newSnapshot = core.applyTextChanges(oldSnapshot, linterEdits);
-                snapshots.set(fileName, newSnapshot);
-                versions.set(fileName, (versions.get(fileName) ?? 0) + 1);
-                projectVersion++;
-                script = language?.scripts.get(fileName);
-            }
-            if (script?.generated) {
-                let sourceFile;
-                for (const code of (0, language_core_1.forEachEmbeddedCode)(script.generated.root)) {
-                    if ((code.languageId === 'javascript'
-                        || code.languageId === 'typescript'
-                        || code.languageId === 'javascriptreact'
-                        || code.languageId === 'typescriptreact')
-                        && code.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
-                        const scriptKind = code.languageId === 'javascript' ? ts.ScriptKind.JS
-                            : code.languageId === 'javascriptreact' ? ts.ScriptKind.JSX
-                                : code.languageId === 'typescript' ? ts.ScriptKind.TS
-                                    : ts.ScriptKind.TSX;
-                        let settings = scriptKind === ts.ScriptKind.JS || scriptKind === ts.ScriptKind.JSX
-                            ? fmtSettings.javascript
-                            : fmtSettings.typescript;
-                        if (settings.tabSize !== undefined) {
-                            const firstMapping = code.mappings[0];
-                            sourceFile ??= ts.createSourceFile(fileName, script.snapshot.getText(0, script.snapshot.getLength()), ts.ScriptTarget.Latest, true, ts.ScriptKind.Deferred);
-                            const line = sourceFile.getLineAndCharacterOfPosition(firstMapping.sourceOffsets[0]).line;
-                            const offset = sourceFile.getPositionOfLineAndCharacter(line, 0);
-                            let initialIndentLevel = (0, formatting_js_1.computeInitialIndent)(script.snapshot.getText(0, script.snapshot.getLength()), offset, settings.tabSize);
-                            if (script.languageId === 'vue'
-                                && fmtSettings.vue['script.initialIndent']
-                                && (code.id === 'script_raw'
-                                    || code.id === 'scriptsetup_raw')) {
-                                initialIndentLevel++;
-                            }
-                            settings = {
-                                ...settings,
-                                baseIndentSize: initialIndentLevel * settings.tabSize,
-                            };
-                        }
-                        serviceEdits.push(...formatVirtualScript(scriptKind, settings, code.snapshot)
-                            .map(edit => {
-                            return (0, transform_js_1.transformTextChange)(script, language, {
-                                code,
-                                extension: '',
-                                scriptKind: scriptKind,
-                                preventLeadingOffset: true,
-                            }, edit, false, language_core_1.isFormattingEnabled)?.[1];
-                        })
-                            .filter(edit => !!edit));
-                    }
-                }
-            }
-            else {
-                const scriptKind = linterHost.getScriptKind(fileName);
-                const settings = scriptKind === ts.ScriptKind.JS || scriptKind === ts.ScriptKind.JSX ? fmtSettings.javascript : fmtSettings.typescript;
-                serviceEdits = linterLanguageService.getFormattingEditsForDocument(fileName, settings);
-            }
-            if (serviceEdits.length) {
-                const oldSnapshot = snapshots.get(fileName);
-                newSnapshot = core.applyTextChanges(oldSnapshot, serviceEdits);
-                snapshots.set(fileName, newSnapshot);
-                versions.set(fileName, (versions.get(fileName) ?? 0) + 1);
-                projectVersion++;
-            }
-        }
     }
     if (newSnapshot) {
         const newText = newSnapshot.getText(0, newSnapshot.getLength());
@@ -370,7 +229,6 @@ function lint(fileName, fix, fileCache) {
             fileCache[0] = fs.statSync(fileName).mtimeMs;
             fileCache[1] = {};
             fileCache[2] = {};
-            fileCache[3] = false;
             shouldCheck = true;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.5.17",
+	"version": "1.6.0",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.5.17",
-		"@tsslint/core": "1.5.17",
+		"@tsslint/config": "1.6.0",
+		"@tsslint/core": "1.6.0",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
@@ -31,5 +31,5 @@
 		"@vue-vine/language-service": "latest",
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "e9f145a91f3e7bd9ba86dd0de41ff7a8ffd99b46"
+	"gitHead": "c1cec085945f166911af87454f6f1dd3e9fc2986"
 }

package/lib/formatting.d.ts

@@ -1,9 +0,0 @@
-import type * as ts from 'typescript';
-export declare function getVSCodeFormattingSettings(settingsFile: string): {
-    javascript: ts.FormatCodeSettings;
-    typescript: ts.FormatCodeSettings;
-    vue: {
-        'script.initialIndent'?: boolean;
-    };
-};
-export declare function computeInitialIndent(content: string, i: number, baseTabSize?: number): number;

package/lib/formatting.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVSCodeFormattingSettings = getVSCodeFormattingSettings;
-exports.computeInitialIndent = computeInitialIndent;
-const fs = require("fs");
-const json5 = require("json5");
-function getVSCodeFormattingSettings(settingsFile) {
-    const jsonc = fs.readFileSync(settingsFile, 'utf8');
-    const editorSettings = json5.parse(jsonc);
-    const jsSettings = {};
-    const tsSettings = {};
-    const vueSettings = {};
-    if ('editor.insertSpaces' in editorSettings) {
-        jsSettings.convertTabsToSpaces = !!editorSettings['editor.insertSpaces'];
-        tsSettings.convertTabsToSpaces = !!editorSettings['editor.insertSpaces'];
-    }
-    if ('editor.tabSize' in editorSettings) {
-        jsSettings.tabSize = editorSettings['editor.tabSize'];
-        tsSettings.tabSize = editorSettings['editor.tabSize'];
-    }
-    for (const key in editorSettings) {
-        if (key.startsWith('javascript.format.')) {
-            const settingKey = key.slice('javascript.format.'.length);
-            // @ts-expect-error
-            jsSettings[settingKey] = editorSettings[key];
-        }
-        else if (key.startsWith('typescript.format.')) {
-            const settingKey = key.slice('typescript.format.'.length);
-            // @ts-expect-error
-            tsSettings[settingKey] = editorSettings[key];
-        }
-    }
-    if ('vue.format.script.initialIndent' in editorSettings) {
-        vueSettings['script.initialIndent'] = !!editorSettings['vue.format.script.initialIndent'];
-    }
-    return {
-        javascript: jsSettings,
-        typescript: tsSettings,
-        vue: vueSettings,
-    };
-}
-function computeInitialIndent(content, i, baseTabSize) {
-    let nChars = 0;
-    const tabSize = baseTabSize || 4;
-    while (i < content.length) {
-        const ch = content.charAt(i);
-        if (ch === ' ') {
-            nChars++;
-        }
-        else if (ch === '\t') {
-            nChars += tabSize;
-        }
-        else {
-            break;
-        }
-        i++;
-    }
-    return Math.floor(nChars / tabSize);
-}
-//# sourceMappingURL=formatting.js.map