@tsslint/cli 2.0.7 → 3.0.0-alpha.1

package/bin/tsslint.js

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --experimental-strip-types --no-warnings
 require('../index');

package/index.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ts = require("typescript");
 const path = require("path");
-const core = require("@tsslint/core");
 const cache = require("./lib/cache.js");
 const worker = require("./lib/worker.js");
 const fs = require("fs");
-const os = require("os");
 const minimatch = require("minimatch");
 const languagePlugins = require("./lib/languagePlugins.js");
 process.env.TSSLINT_CLI = '1';
@@ -26,15 +24,15 @@ const vueVineColor = (s) => '\x1b[38;5;48m' + s + _reset;
 const mdxColor = (s) => '\x1b[33m' + s + _reset;
 const astroColor = (s) => '\x1b[38;5;209m' + s + _reset;
 let threads = 1;
-if (process.argv.includes('--threads')) {
-    const threadsIndex = process.argv.indexOf('--threads');
-    const threadsArg = process.argv[threadsIndex + 1];
-    if (!threadsArg || threadsArg.startsWith('-')) {
-        console.error(red(`Missing argument for --threads.`));
-        process.exit(1);
-    }
-    threads = Math.min(os.availableParallelism(), Number(threadsArg));
-}
+// if (process.argv.includes('--threads')) {
+// 	const threadsIndex = process.argv.indexOf('--threads');
+// 	const threadsArg = process.argv[threadsIndex + 1];
+// 	if (!threadsArg || threadsArg.startsWith('-')) {
+// 		console.error(red(`Missing argument for --threads.`));
+// 		process.exit(1);
+// 	}
+// 	threads = Math.min(os.availableParallelism(), Number(threadsArg));
+// }
 class Project {
     constructor(tsconfig, languages) {
         this.tsconfig = tsconfig;
@@ -107,7 +105,6 @@ class Project {
     }
 }
 (async () => {
-    const builtConfigs = new Map();
     const clack = await import('@clack/prompts');
     const processFiles = new Set();
     const tsconfigAndLanguages = new Map();
@@ -137,17 +134,11 @@ class Project {
     }
     if (![
         '--project',
-        '--projects',
         '--vue-project',
-        '--vue-projects',
         '--vue-vine-project',
-        '--vue-vine-projects',
         '--mdx-project',
-        '--mdx-projects',
         '--astro-project',
-        '--astro-projects',
         '--ts-macro-project',
-        '--ts-macro-projects',
     ].some(flag => process.argv.includes(flag))) {
         const language = await clack.select({
             message: 'Select framework',
@@ -222,34 +213,32 @@ class Project {
     else {
         const options = [
             {
-                projectFlags: ['--project', '--projects'],
+                projectFlag: '--project',
                 language: undefined,
             },
             {
-                projectFlags: ['--vue-project', '--vue-projects'],
+                projectFlag: '--vue-project',
                 language: 'vue',
             },
             {
-                projectFlags: ['--vue-vine-project', '--vue-vine-projects'],
+                projectFlag: '--vue-vine-project',
                 language: 'vue-vine',
             },
             {
-                projectFlags: ['--mdx-project', '--mdx-projects'],
-                projectsFlag: '--mdx-projects',
+                projectFlag: '--mdx-project',
                 language: 'mdx',
             },
             {
-                projectFlags: ['--astro-project', '--astro-projects'],
+                projectFlag: '--astro-project',
                 language: 'astro',
             },
             {
-                projectFlags: ['--ts-macro-project', '--ts-macro-projects'],
+                projectFlag: '--ts-macro-project',
                 language: 'ts-macro',
             },
         ];
-        for (const { projectFlags, language } of options) {
-            const projectFlag = projectFlags.find(flag => process.argv.includes(flag));
-            if (!projectFlag) {
+        for (const { projectFlag, language } of options) {
+            if (!process.argv.includes(projectFlag)) {
                 continue;
             }
             let foundArg = false;
@@ -311,10 +300,7 @@ class Project {
     spinner?.start();
     projects = projects.filter(project => !!project.configFile);
     projects = projects.filter(project => !!project.fileNames.length);
-    for (const project of projects) {
-        project.builtConfig = await getBuiltConfig(project.configFile);
-    }
-    projects = projects.filter(project => !!project.builtConfig);
+    projects = projects.filter(project => !!project.configFile);
     for (const project of projects) {
         allFilesNum += project.fileNames.length;
     }
@@ -333,13 +319,12 @@ class Project {
     (spinner?.stop ?? clack.log.message)(cached
         ? gray(`Processed ${processed} files with cache. (Use `) + cyan(`--force`) + gray(` to ignore cache.)`)
         : gray(`Processed ${processed} files.`));
-    const projectsFlag = process.argv.find(arg => arg.endsWith('-projects'));
-    if (projectsFlag) {
-        clack.log.warn(gray(`Please use `)
-            + cyan(`${projectsFlag.slice(0, -1)}`)
+    const deprecatedFlag = process.argv.find(arg => arg.endsWith('-projects'));
+    if (deprecatedFlag) {
+        clack.log.error(gray(`Use `)
+            + cyan(`${deprecatedFlag.slice(0, -1)}`)
             + gray(` instead of `)
-            + cyan(`${projectsFlag}`)
-            + gray(` starting from version 1.5.0.`));
+            + cyan(`${deprecatedFlag}.`));
     }
     const data = [
         [passed, 'passed', green],
@@ -372,7 +357,7 @@ class Project {
             return;
         }
         project.worker = linterWorker;
-        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.builtConfig, project.rawFileNames, project.options);
+        const setupSuccess = await linterWorker.setup(project.tsconfig, project.languages, project.configFile, project.rawFileNames, project.options);
         if (!setupSuccess) {
             projects = projects.filter(p => p !== project);
             startWorker(linterWorker);
@@ -457,12 +442,6 @@ class Project {
         cache.saveCache(project.tsconfig, project.configFile, project.cache, ts.sys.createHash);
         await startWorker(linterWorker);
     }
-    async function getBuiltConfig(configFile) {
-        if (!builtConfigs.has(configFile)) {
-            builtConfigs.set(configFile, core.buildConfig(configFile, ts.sys.createHash, spinner, (s, code) => log(gray(s), code)));
-        }
-        return await builtConfigs.get(configFile);
-    }
     function addProcessFile(fileName) {
         processFiles.add(fileName);
         updateSpinner();

package/lib/cache.d.ts

@@ -1,4 +1,4 @@
 import core = require('@tsslint/core');
-export type CacheData = Record<string, core.FileLintCache>;
+export type CacheData = Record<string, /* fileName */ core.FileLintCache>;
 export declare function loadCache(tsconfig: string, configFilePath: string, createHash?: (path: string) => string): CacheData;
 export declare function saveCache(tsconfig: string, configFilePath: string, cache: CacheData, createHash?: (path: string) => string): void;

package/lib/cache.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadCache = loadCache;
 exports.saveCache = saveCache;
-const core = require("@tsslint/core");
 const path = require("path");
 const fs = require("fs");
+const os = require("os");
+const pkg = require('../package.json');
 function loadCache(tsconfig, configFilePath, createHash = btoa) {
-    const outDir = core.getDotTsslintPath(configFilePath);
-    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '_' + createHash(JSON.stringify(process.argv)) + '_' + createHash(path.relative(outDir, tsconfig)) + '.cache.json';
+    const outDir = getTsslintCachePath(configFilePath, createHash);
+    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '_'
+        + createHash(JSON.stringify(process.argv)) + '_' + createHash(path.relative(outDir, tsconfig)) + '.cache.json';
     const cacheFilePath = path.join(outDir, cacheFileName);
     const cacheFileStat = fs.statSync(cacheFilePath, { throwIfNoEntry: false });
     const configFileStat = fs.statSync(configFilePath, { throwIfNoEntry: false });
     if (cacheFileStat?.isFile() && cacheFileStat.mtimeMs > (configFileStat?.mtimeMs ?? 0)) {
         try {
-            return require(cacheFilePath);
+            return JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
         }
         catch {
             return {};
@@ -22,9 +24,16 @@ function loadCache(tsconfig, configFilePath, createHash = btoa) {
     return {};
 }
 function saveCache(tsconfig, configFilePath, cache, createHash = btoa) {
-    const outDir = core.getDotTsslintPath(configFilePath);
-    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '_' + createHash(JSON.stringify(process.argv)) + '_' + createHash(path.relative(outDir, tsconfig)) + '.cache.json';
+    const outDir = getTsslintCachePath(configFilePath, createHash);
+    const cacheFileName = createHash(path.relative(outDir, configFilePath)) + '_'
+        + createHash(JSON.stringify(process.argv)) + '_' + createHash(path.relative(outDir, tsconfig)) + '.cache.json';
     const cacheFilePath = path.join(outDir, cacheFileName);
+    fs.mkdirSync(outDir, { recursive: true });
     fs.writeFileSync(cacheFilePath, JSON.stringify(cache));
 }
+function getTsslintCachePath(configFilePath, createHash) {
+    const projectRoot = path.resolve(configFilePath, '..');
+    const projectHash = createHash(projectRoot);
+    return path.join(os.tmpdir(), 'tsslint-cache-' + pkg.version + '-' + projectHash);
+}
 //# sourceMappingURL=cache.js.map

package/lib/worker.d.ts

@@ -1,18 +1,18 @@
 import ts = require('typescript');
 import core = require('@tsslint/core');
 export declare function createLocal(): {
-    setup(tsconfig: string, languages: string[], configFile: string, builtConfig: string, _fileNames: string[], _options: ts.CompilerOptions): Promise<boolean>;
+    setup(tsconfig: string, languages: string[], configFile: 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): Promise<boolean>;
+    setup(tsconfig: string, languages: string[], configFile: 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): Promise<boolean>;
+declare function setup(tsconfig: string, languages: string[], configFile: 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

@@ -127,11 +127,11 @@ const handlers = {
     hasCodeFixes,
     hasRules,
 };
-async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _options) {
+async function setup(tsconfig, languages, configFile, _fileNames, _options) {
     const clack = await import('@clack/prompts');
     let config;
     try {
-        config = (await import(url.pathToFileURL(builtConfig).toString())).default;
+        config = (await import(url.pathToFileURL(configFile).toString())).default;
     }
     catch (err) {
         if (err instanceof Error) {
@@ -188,7 +188,7 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
         languageService: linterLanguageService,
         languageServiceHost: linterHost,
         typescript: ts,
-    }, path.dirname(configFile), config, () => { }, linterSyntaxOnlyLanguageService);
+    }, path.dirname(configFile), config, () => [], linterSyntaxOnlyLanguageService);
     return true;
 }
 function lint(fileName, fix, fileCache) {
@@ -247,10 +247,12 @@ function lint(fileName, fix, fileCache) {
             },
             relatedInformation: diagnostic.relatedInformation?.map(info => ({
                 ...info,
-                file: info.file ? {
-                    fileName: info.file.fileName,
-                    text: getFileText(info.file.fileName),
-                } : undefined,
+                file: info.file
+                    ? {
+                        fileName: info.file.fileName,
+                        text: getFileText(info.file.fileName),
+                    }
+                    : undefined,
             })),
         }));
     }
@@ -263,10 +265,12 @@ function lint(fileName, fix, fileCache) {
             },
             relatedInformation: diagnostic.relatedInformation?.map(info => ({
                 ...info,
-                file: info.file ? {
-                    fileName: info.file.fileName,
-                    text: info.file.text,
-                } : undefined,
+                file: info.file
+                    ? {
+                        fileName: info.file.fileName,
+                        text: info.file.text,
+                    }
+                    : undefined,
             })),
         }));
     }

package/package.json

@@ -1,9 +1,9 @@
 {
 	"name": "@tsslint/cli",
-	"version": "2.0.7",
+	"version": "3.0.0-alpha.1",
 	"license": "MIT",
 	"engines": {
-		"node": ">=22"
+		"node": ">=22.6.0"
 	},
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -19,8 +19,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "2.0.7",
-		"@tsslint/core": "2.0.7",
+		"@tsslint/config": "3.0.0-alpha.1",
+		"@tsslint/core": "3.0.0-alpha.1",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
@@ -29,9 +29,5 @@
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"devDependencies": {
-		"@vue-vine/language-service": "latest",
-		"@vue/language-core": "latest"
-	},
-	"gitHead": "db83a7c7526c3245d2ffa6fe1c9fb04e77387959"
-}
+	"gitHead": "eacd205927cda18d084e78cc21115578792f3955"
+}