@tsslint/core 1.6.1 → 2.0.0

package/index.js

@@ -48,17 +48,25 @@ function createLinter(ctx, rootDir, config, handleError, syntaxOnlyLanguageServi
                 ? {
                     ...ctx,
                     sourceFile: ctx.languageService.getProgram().getSourceFile(fileName),
-                    reportError,
-                    reportWarning,
-                    reportSuggestion,
+                    get program() {
+                        return ctx.languageService.getProgram();
+                    },
+                    report,
+                    reportError: report,
+                    reportWarning: report,
+                    reportSuggestion: report,
                 }
                 : {
                     ...ctx,
                     languageService: syntaxOnlyLanguageService,
+                    get program() {
+                        throw new Error('Not supported');
+                    },
                     sourceFile: getNonBoundSourceFile(fileName),
-                    reportError,
-                    reportWarning,
-                    reportSuggestion,
+                    report,
+                    reportError: report,
+                    reportWarning: report,
+                    reportSuggestion: report,
                 };
             const token = ctx.languageServiceHost.getCancellationToken?.();
             const configs = getConfigsForFile(fileName, cache?.[2]);
@@ -103,10 +111,10 @@ function createLinter(ctx, rootDir, config, handleError, syntaxOnlyLanguageServi
                         shouldRetry = true;
                     }
                     else if (err instanceof Error) {
-                        report(ts.DiagnosticCategory.Error, err.stack ?? err.message, 0, 0, 0, err);
+                        report(err.stack ?? err.message, 0, 0, 0, err);
                     }
                     else {
-                        report(ts.DiagnosticCategory.Error, String(err), 0, 0, false);
+                        report(String(err), 0, 0, Number.MAX_VALUE);
                     }
                 }
                 if (cache && !rule2Mode.get(currentRuleId)) {
@@ -151,18 +159,9 @@ function createLinter(ctx, rootDir, config, handleError, syntaxOnlyLanguageServi
             }
             lintResult[2] = lintResult[2].filter(refactor => diagnosticSet.has(refactor.diagnostic));
             return diagnostics;
-            function reportError(message, start, end, stackOffset) {
-                return report(ts.DiagnosticCategory.Error, message, start, end, stackOffset);
-            }
-            function reportWarning(message, start, end, stackOffset) {
-                return report(ts.DiagnosticCategory.Warning, message, start, end, stackOffset);
-            }
-            function reportSuggestion(message, start, end, stackOffset) {
-                return report(ts.DiagnosticCategory.Suggestion, message, start, end, stackOffset);
-            }
-            function report(category, message, start, end, stackOffset = 2, err) {
+            function report(message, start, end, stackOffset = 1, err) {
                 const error = {
-                    category,
+                    category: ts.DiagnosticCategory.Message,
                     code: currentRuleId,
                     messageText: message,
                     file: rulesContext.sourceFile,
@@ -182,9 +181,7 @@ function createLinter(ctx, rootDir, config, handleError, syntaxOnlyLanguageServi
                         })),
                     });
                 }
-                if (typeof stackOffset === 'number') {
-                    handleError(error, err ?? new Error(), stackOffset);
-                }
+                handleError(error, err ?? new Error(), stackOffset);
                 let lintResult = lintResults.get(fileName);
                 if (!lintResult) {
                     lintResults.set(fileName, lintResult = [rulesContext.sourceFile, new Map(), []]);

package/lib/build.js

@@ -19,7 +19,7 @@ spinner, stopSnipper) {
                     stopSnipper?.('Failed to build ' + configFileDisplayPath + ' in ' + (Date.now() - buildStart) + 'ms', 1);
                 }
                 resolve(builtConfig);
-            }, false, createHash, spinner, stopSnipper);
+            }, false, createHash);
         }
         catch (e) {
             stopSnipper?.('Failed to build ' + configFileDisplayPath + ' in ' + (Date.now() - buildStart) + 'ms', 1);

package/lib/watch.d.ts

@@ -1,5 +1,5 @@
 import esbuild = require('esbuild');
-export declare function watchConfig(configFilePath: string, onBuild: (config: string | undefined, result: esbuild.BuildResult) => void, watch?: boolean, createHash?: (path: string) => string, spinner?: ReturnType<typeof import('@clack/prompts').spinner>, stopSnipper?: (message: string, code?: number) => void): Promise<esbuild.BuildContext<{
+export declare function watchConfig(configFilePath: string, onBuild: (config: string | undefined, result: esbuild.BuildResult) => void, watch?: boolean, createHash?: (path: string) => string): Promise<esbuild.BuildContext<{
     entryPoints: string[];
     bundle: true;
     sourcemap: true;

package/lib/watch.js

@@ -6,9 +6,7 @@ const esbuild = require("esbuild");
 const _path = require("path");
 const fs = require("fs");
 const url = require("url");
-async function watchConfig(configFilePath, onBuild, watch = true, createHash = btoa, 
-// @ts-expect-error
-spinner, stopSnipper) {
+async function watchConfig(configFilePath, onBuild, watch = true, createHash = btoa) {
     const outDir = getDotTsslintPath(configFilePath);
     const outFileName = createHash(_path.relative(outDir, configFilePath)) + '.mjs';
     const outFile = _path.join(outDir, outFileName);
@@ -30,33 +28,6 @@ spinner, stopSnipper) {
         plugins: [{
                 name: 'tsslint',
                 setup(build) {
-                    build.onResolve({ filter: /^https?:\/\// }, async ({ path: importUrl }) => {
-                        const cachePath = _path.join(outDir, importUrl.split('://')[0], ...importUrl.split('://')[1].split('/'));
-                        if (!fs.existsSync(cachePath)) {
-                            const start = Date.now();
-                            spinner?.message('Downloading ' + importUrl);
-                            const response = await fetch(importUrl);
-                            if (!response.ok) {
-                                throw new Error(`Failed to load ${importUrl}`);
-                            }
-                            stopSnipper?.('Downloaded ' + importUrl + ' in ' + (Date.now() - start) + 'ms');
-                            const text = await response.text();
-                            fs.mkdirSync(_path.dirname(cachePath), { recursive: true });
-                            fs.writeFileSync(cachePath, text, 'utf8');
-                        }
-                        if (isTsFile(cachePath)) {
-                            return {
-                                path: cachePath,
-                                external: false,
-                            };
-                        }
-                        else {
-                            return {
-                                path: url.pathToFileURL(cachePath).toString(),
-                                external: true,
-                            };
-                        }
-                    });
                     build.onResolve({ filter: /.*/ }, ({ path, resolveDir }) => {
                         if (!isTsFile(path)) {
                             try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.6.1",
+	"version": "2.0.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/core"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.6.1",
+		"@tsslint/types": "2.0.0",
 		"esbuild": ">=0.17.0",
 		"minimatch": "^10.0.1"
 	},
@@ -22,5 +22,5 @@
 	"scripts": {
 		"postinstall": "node scripts/cleanCache.js"
 	},
-	"gitHead": "875699df671c2d9a8331c930af8c549ebab19f17"
+	"gitHead": "ae93f5a423f55be0af23e4b088bf589dbc215ef6"
 }