@tsslint/cli 1.5.8 → 1.5.9

package/index.js

@@ -20,6 +20,7 @@ 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 tsMacroColor = (s) => '\x1b[38;5;135m' + s + _reset;
 const vueColor = (s) => '\x1b[32m' + s + _reset;
 const vueVineColor = (s) => '\x1b[38;5;48m' + s + _reset;
 const mdxColor = (s) => '\x1b[33m' + s + _reset;
@@ -53,6 +54,9 @@ class Project {
             labels.push(tsColor('TS'));
         }
         else {
+            if (this.languages.includes('ts-macro')) {
+                labels.push(tsMacroColor('TS Macro'));
+            }
             if (this.languages.includes('vue')) {
                 labels.push(vueColor('Vue'));
             }
@@ -113,11 +117,19 @@ class Project {
         '--mdx-projects',
         '--astro-project',
         '--astro-projects',
+        '--ts-macro-project',
+        '--ts-macro-projects',
     ].some(flag => process.argv.includes(flag))) {
-        const languages = await clack.multiselect({
-            required: false,
-            message: 'Select frameworks (optional)',
+        const language = await clack.select({
+            message: 'Select framework',
+            initialValue: undefined,
             options: [{
+                    label: 'Vanilla JS/TS',
+                    value: undefined,
+                }, {
+                    label: 'TS Macro',
+                    value: 'ts-macro',
+                }, {
                     label: 'Vue',
                     value: 'vue',
                 }, {
@@ -131,14 +143,14 @@ class Project {
                     value: 'astro',
                 }],
         });
-        if (clack.isCancel(languages)) {
+        if (clack.isCancel(language)) {
             process.exit(1);
         }
-        const tsconfigOptions = glob.sync('**/{tsconfig.json,jsconfig.json}');
+        const tsconfigOptions = glob.sync('**/{tsconfig.json,tsconfig.*.json,jsconfig.json}');
         let options = await Promise.all(tsconfigOptions.map(async (tsconfigOption) => {
             const tsconfig = require.resolve(tsconfigOption.startsWith('.') ? tsconfigOption : `./${tsconfigOption}`, { paths: [process.cwd()] });
             try {
-                const commonLine = await parseCommonLine(tsconfig, languages);
+                const commonLine = await parseCommonLine(tsconfig, language ? [language] : []);
                 return {
                     label: path.relative(process.cwd(), tsconfig) + ` (${commonLine.fileNames.length})`,
                     value: tsconfigOption,
@@ -149,12 +161,16 @@ class Project {
             }
         }));
         options = options.filter(option => !!option);
+        if (options.some(option => !option.label.endsWith('(0)'))) {
+            options = options.filter(option => !option.label.endsWith('(0)'));
+        }
         if (!options.length) {
             clack.log.error(lightRed('No projects found.'));
             process.exit(1);
         }
         const selectedTsconfigs = await clack.multiselect({
             message: 'Select one or multiple projects',
+            initialValues: [options[0].value],
             // @ts-expect-error
             options,
         });
@@ -162,18 +178,16 @@ class Project {
             process.exit(1);
         }
         let command = 'tsslint';
-        if (!languages.length) {
+        if (!language) {
             command += ' --project ' + selectedTsconfigs.join(' ');
         }
         else {
-            for (const language of languages) {
-                command += ` --${language}-project ` + selectedTsconfigs.join(' ');
-            }
+            command += ` --${language}-project ` + selectedTsconfigs.join(' ');
         }
         clack.log.info(`${darkGray('Command:')} ${purple(command)}`);
         for (let tsconfig of selectedTsconfigs) {
             tsconfig = resolvePath(tsconfig);
-            tsconfigAndLanguages.set(tsconfig, languages);
+            tsconfigAndLanguages.set(tsconfig, language ? [language] : []);
         }
     }
     else {
@@ -199,6 +213,10 @@ class Project {
                 projectFlags: ['--astro-project', '--astro-projects'],
                 language: 'astro',
             },
+            {
+                projectFlags: ['--ts-macro-project', '--ts-macro-projects'],
+                language: 'ts-macro',
+            },
         ];
         for (const { projectFlags, language } of options) {
             const projectFlag = projectFlags.find(flag => process.argv.includes(flag));

package/lib/languagePlugins.js

@@ -103,6 +103,31 @@ async function load(tsconfig, languages) {
         const astroLanguagePlugin = astro.getLanguagePlugin();
         plugins.push(astroLanguagePlugin);
     }
+    if (languages.includes('ts-macro')) {
+        let tsMacro;
+        let tsMacroOptions;
+        let tsmcPkgPath;
+        if (tsmcPkgPath = findPackageJson('@ts-macro/language-plugin')) {
+            tsMacro = await import(require.resolve('@ts-macro/language-plugin', { paths: [path.dirname(tsconfig)] }));
+            tsMacroOptions = require(require.resolve('@ts-macro/language-plugin/options', { paths: [path.dirname(tsconfig)] }));
+        }
+        else if (tsmcPkgPath = findPackageJson('@ts-macro/tsc')) {
+            const tsmcPath = path.dirname(tsmcPkgPath);
+            tsMacro = require(require.resolve('@ts-macro/language-plugin', { paths: [tsmcPath] }));
+            tsMacroOptions = require(require.resolve('@ts-macro/language-plugin/options', { paths: [tsmcPath] }));
+        }
+        else {
+            const pkg = ts.findConfigFile(path.dirname(tsconfig), ts.sys.fileExists, 'package.json');
+            if (pkg) {
+                throw new Error('Please install @ts-macro/language-plugin or @ts-macro/tsc to ' + path.relative(process.cwd(), pkg));
+            }
+            else {
+                throw new Error('Please install @ts-macro/language-plugin or @ts-macro/tsc for ' + path.relative(process.cwd(), tsconfig));
+            }
+        }
+        const compilerOptions = ts.readConfigFile(tsconfig, ts.sys.readFile).config.compilerOptions;
+        plugins.push(...tsMacro.getLanguagePlugins(ts, compilerOptions, tsMacroOptions.getOptions(ts)));
+    }
     cache.set(tsconfig, plugins);
     return plugins;
     function findPackageJson(pkgName) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "1.5.8",
+	"version": "1.5.9",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "1.5.8",
-		"@tsslint/core": "1.5.8",
+		"@tsslint/config": "1.5.9",
+		"@tsslint/core": "1.5.9",
 		"@volar/language-core": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"glob": "^10.4.1",
@@ -30,5 +30,5 @@
 		"@vue-vine/language-service": "latest",
 		"@vue/language-core": "latest"
 	},
-	"gitHead": "a164ff719def41ce69256fd7260e9e0fb1017e48"
+	"gitHead": "0439ad76d74dd0de012d7d23a4bd2d7ef5331b76"
 }