@tsslint/cli 1.4.1 → 1.4.3

package/index.js

@@ -15,6 +15,11 @@ const darkGray = (s) => '\x1b[90m' + s + _reset;
 const lightRed = (s) => '\x1b[91m' + s + _reset;
 const lightGreen = (s) => '\x1b[92m' + s + _reset;
 const lightYellow = (s) => '\x1b[93m' + s + _reset;
+// https://talyian.github.io/ansicolors/
+const tsColor = (s) => '\x1b[34m' + s + _reset;
+const vueColor = (s) => '\x1b[32m' + 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');
@@ -45,18 +50,34 @@ class Project {
     // @ts-expect-error
     clack) {
         this.configFile = ts.findConfigFile(path.dirname(this.tsconfig), ts.sys.fileExists, 'tsslint.config.ts');
+        const labels = [];
+        if (this.languages.length === 0) {
+            labels.push(tsColor('TS'));
+        }
+        else {
+            if (this.languages.includes('vue')) {
+                labels.push(vueColor('Vue'));
+            }
+            if (this.languages.includes('mdx')) {
+                labels.push(mdxColor('MDX'));
+            }
+            if (this.languages.includes('astro')) {
+                labels.push(astroColor('Astro'));
+            }
+        }
+        const label = labels.join(darkGray(' | '));
         if (!this.configFile) {
-            clack.log.error(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No tsslint.config.ts found)')}`);
+            clack.log.error(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No tsslint.config.ts found)')}`);
             return this;
         }
         const commonLine = await parseCommonLine(this.tsconfig, this.languages);
         this.fileNames = commonLine.fileNames;
         this.options = commonLine.options;
         if (!this.fileNames.length) {
-            clack.log.warn(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No included files)')}`);
+            clack.log.warn(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray('(No included files)')}`);
             return this;
         }
-        clack.log.info(`${purple('[project]')} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
+        clack.log.info(`${label} ${path.relative(process.cwd(), this.tsconfig)} ${darkGray(`(${this.fileNames.length})`)}`);
         if (!process.argv.includes('--force')) {
             this.cache = cache.loadCache(this.tsconfig, this.configFile, ts.sys.createHash);
         }
@@ -343,6 +364,7 @@ class Project {
                         getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? x => x : x => x.toLowerCase(),
                         getNewLine: () => ts.sys.newLine,
                     });
+                    output = output.trimEnd();
                     output = output.replace(`TS${diagnostic.code}`, String(diagnostic.code));
                     if (diagnostic.category === ts.DiagnosticCategory.Error) {
                         errors++;

package/lib/worker.js

@@ -46,6 +46,22 @@ const originalHost = {
         }
         return snapshots.get(fileName);
     },
+    getScriptKind(fileName) {
+        const languageId = (0, typescript_1.resolveFileLanguageId)(fileName);
+        switch (languageId) {
+            case 'javascript':
+                return ts.ScriptKind.JS;
+            case 'javascriptreact':
+                return ts.ScriptKind.JSX;
+            case 'typescript':
+                return ts.ScriptKind.TS;
+            case 'typescriptreact':
+                return ts.ScriptKind.TSX;
+            case 'json':
+                return ts.ScriptKind.JSON;
+        }
+        return ts.ScriptKind.Unknown;
+    },
     getDefaultLibFileName(options) {
         return ts.getDefaultLibFilePath(options);
     },
@@ -164,14 +180,19 @@ async function setup(tsconfig, languages, configFile, builtConfig, _fileNames, _
     projectVersion++;
     typeRootsVersion++;
     fileNames = _fileNames;
-    options = _options;
+    options = plugins.some(plugin => plugin.typescript?.extraFileExtensions.length)
+        ? {
+            ..._options,
+            allowNonTsExtensions: true,
+        }
+        : _options;
     linter = core.createLinter({
         configFile,
         languageService: linterLanguageService,
         languageServiceHost: linterHost,
         typescript: ts,
         tsconfig: ts.server.toNormalizedPath(tsconfig),
-    }, config, 'cli', clack);
+    }, config, 'cli');
     return true;
 }
 function lintAndFix(fileName, fileCache) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.4.1",
+	"version": "1.4.3",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.4.1",
-		"@tsslint/core": "1.4.1",
+		"@tsslint/config": "1.4.3",
+		"@tsslint/core": "1.4.3",
 		"@volar/language-core": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1"
@@ -28,5 +28,5 @@
 	"devDependencies": {
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "54f42ec9414029a356fa19a762260f03392563fa"
+	"gitHead": "7cdb4a39c0af8ee4cebd430bb546c6b6e2ddc28b"
 }