@tsslint/cli 3.0.0-alpha.0 → 3.0.0

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

@@ -5,7 +5,6 @@ const path = require("path");
 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';
@@ -25,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;
@@ -135,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',
@@ -220,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;
@@ -328,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],

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

@@ -4,15 +4,18 @@ exports.loadCache = loadCache;
 exports.saveCache = saveCache;
 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 = 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 {};
@@ -21,13 +24,16 @@ function loadCache(tsconfig, configFilePath, createHash = btoa) {
     return {};
 }
 function saveCache(tsconfig, configFilePath, cache, createHash = btoa) {
-    const outDir = 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 getDotTsslintPath(configFilePath) {
-    return path.resolve(configFilePath, '..', 'node_modules', '.tsslint');
+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.js

@@ -188,7 +188,7 @@ async function setup(tsconfig, languages, configFile, _fileNames, _options) {
         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,7 +1,10 @@
 {
 	"name": "@tsslint/cli",
-	"version": "3.0.0-alpha.0",
+	"version": "3.0.0",
 	"license": "MIT",
+	"engines": {
+		"node": ">=22.6.0"
+	},
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
 	},
@@ -16,8 +19,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "3.0.0-alpha.0",
-		"@tsslint/core": "3.0.0-alpha.0",
+		"@tsslint/config": "3.0.0",
+		"@tsslint/core": "3.0.0",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
@@ -26,5 +29,5 @@
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "ec683ca05f4360fac720bd8c567f4d9460d255e1"
-}
+	"gitHead": "69bc86cf2dd81f9e48fc15ed9b9f0351fa2fc19e"
+}