@tsslint/cli 2.0.6 → 3.0.0-alpha.0

package/index.js

@@ -2,10 +2,8 @@
 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 glob = require("glob");
 const fs = require("fs");
 const os = require("os");
 const minimatch = require("minimatch");
@@ -108,7 +106,6 @@ class Project {
     }
 }
 (async () => {
-    const builtConfigs = new Map();
     const clack = await import('@clack/prompts');
     const processFiles = new Set();
     const tsconfigAndLanguages = new Map();
@@ -176,7 +173,7 @@ class Project {
         if (clack.isCancel(language)) {
             process.exit(1);
         }
-        const tsconfigOptions = glob.sync('**/{tsconfig.json,tsconfig.*.json,jsconfig.json}');
+        const tsconfigOptions = fs.globSync('**/{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 {
@@ -261,7 +258,7 @@ class Project {
                 }
                 foundArg = true;
                 const searchGlob = process.argv[i];
-                const tsconfigs = glob.sync(searchGlob);
+                const tsconfigs = fs.globSync(searchGlob);
                 if (!tsconfigs.length) {
                     clack.log.error(red(`No projects found for ${projectFlag} ${searchGlob}.`));
                     process.exit(1);
@@ -312,10 +309,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;
     }
@@ -373,7 +367,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);
@@ -458,12 +452,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.js

@@ -2,11 +2,10 @@
 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");
 function loadCache(tsconfig, configFilePath, createHash = btoa) {
-    const outDir = core.getDotTsslintPath(configFilePath);
+    const outDir = getDotTsslintPath(configFilePath);
     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 });
@@ -22,9 +21,13 @@ function loadCache(tsconfig, configFilePath, createHash = btoa) {
     return {};
 }
 function saveCache(tsconfig, configFilePath, cache, createHash = btoa) {
-    const outDir = core.getDotTsslintPath(configFilePath);
+    const outDir = getDotTsslintPath(configFilePath);
     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');
+}
 //# 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/cli",
-	"version": "2.0.6",
+	"version": "3.0.0-alpha.0",
 	"license": "MIT",
 	"bin": {
 		"tsslint": "./bin/tsslint.js"
@@ -16,21 +16,15 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",
-		"@tsslint/config": "2.0.6",
-		"@tsslint/core": "2.0.6",
+		"@tsslint/config": "3.0.0-alpha.0",
+		"@tsslint/core": "3.0.0-alpha.0",
 		"@volar/language-core": "~2.4.0",
 		"@volar/language-hub": "0.0.1",
 		"@volar/typescript": "~2.4.0",
-		"glob": "^10.4.1",
-		"json5": "^2.2.3",
 		"minimatch": "^10.0.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"devDependencies": {
-		"@vue-vine/language-service": "latest",
-		"@vue/language-core": "latest"
-	},
-	"gitHead": "b5914c99cb269150c2518f0f7b097ad2a996296d"
+	"gitHead": "ec683ca05f4360fac720bd8c567f4d9460d255e1"
 }