@tsslint/typescript-plugin 0.0.5 → 0.0.6

package/index.d.ts

@@ -1,4 +1,3 @@
 import type * as ts from 'typescript/lib/tsserverlibrary.js';
 declare const init: ts.server.PluginModuleFactory;
 export = init;
-//# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,29 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 const core_1 = require("@tsslint/core");
-const path = __importStar(require("path"));
+const path = require("path");
 const languageServiceDecorators = new WeakMap();
 const init = (modules) => {
     const { typescript: ts } = modules;
@@ -51,32 +28,15 @@ function decorateLanguageService(ts, tsconfig, info) {
     let configFileBuildContext;
     let configFileDiagnostics = [];
     let config;
-    let plugins = [];
+    let linter;
     info.languageService.getCompilerOptionsDiagnostics = () => {
         return getCompilerOptionsDiagnostics().concat(configFileDiagnostics);
     };
     info.languageService.getSyntacticDiagnostics = fileName => {
-        let errors = getSyntacticDiagnostics(fileName);
-        errors = errors.concat(configFileDiagnostics);
-        const sourceFile = info.languageService.getProgram()?.getSourceFile(fileName);
-        if (!sourceFile || sourceFile.text.length > 20000) {
-            return errors;
-        }
-        const token = info.languageServiceHost.getCancellationToken?.();
-        for (const plugin of plugins) {
-            if (token?.isCancellationRequested()) {
-                break;
-            }
-            if (plugin.lint) {
-                let pluginResult = plugin.lint?.(sourceFile, config?.rules ?? {});
-                for (const plugin of plugins) {
-                    if (plugin.resolveDiagnostics) {
-                        pluginResult = plugin.resolveDiagnostics(pluginResult);
-                    }
-                }
-                errors = errors.concat(pluginResult);
-            }
-        }
+        const errors = [
+            ...getSyntacticDiagnostics(fileName),
+            ...linter?.lint(fileName) ?? [],
+        ];
         if (config?.debug) {
             errors.push({
                 category: ts.DiagnosticCategory.Warning,
@@ -84,11 +44,11 @@ function decorateLanguageService(ts, tsconfig, info) {
                 code: 'debug-info',
                 messageText: JSON.stringify({
                     rules: Object.keys(config?.rules ?? {}),
-                    plugins: plugins.length,
+                    plugins: config.plugins?.length,
                     configFile,
                     tsconfig,
                 }, null, 2),
-                file: sourceFile,
+                file: info.languageService.getProgram()?.getSourceFile(fileName),
                 start: 0,
                 length: 0,
             });
@@ -96,39 +56,17 @@ function decorateLanguageService(ts, tsconfig, info) {
         return errors;
     };
     info.languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
-        let fixes = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
-        const token = info.languageServiceHost.getCancellationToken?.();
-        for (const plugin of plugins) {
-            if (token?.isCancellationRequested()) {
-                break;
-            }
-            fixes = fixes.concat(plugin.getFixes?.(fileName, start, end) ?? []);
-        }
-        return fixes;
+        return [
+            ...getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences),
+            ...linter?.getCodeFixes(fileName, start, end) ?? [],
+        ];
     };
     return { update };
     async function update(pluginConfig) {
         let configOptionSpan = { start: 0, length: 0 };
         let newConfigFile;
-        let configImportPath;
         let configResolveError;
         const jsonConfigFile = ts.readJsonConfigFile(tsconfig, ts.sys.readFile);
-        try {
-            configImportPath = require.resolve('@tsslint/config', { paths: [path.dirname(tsconfig)] });
-        }
-        catch (err) {
-            configResolveError = err;
-            configFileDiagnostics = [{
-                    category: ts.DiagnosticCategory.Error,
-                    code: 0,
-                    messageText: String(err),
-                    file: jsonConfigFile,
-                    start: 0,
-                    length: 0,
-                }];
-            return;
-        }
-        const { watchConfigFile } = require(configImportPath);
         if (pluginConfig?.configFile) {
             configOptionSpan = {
                 start: jsonConfigFile.text.indexOf(pluginConfig.configFile) - 1,
@@ -147,7 +85,7 @@ function decorateLanguageService(ts, tsconfig, info) {
         if (newConfigFile !== configFile) {
             configFile = newConfigFile;
             config = undefined;
-            plugins = [];
+            linter = undefined;
             configFileBuildContext?.dispose();
             configFileDiagnostics = [];
             if (configResolveError) {
@@ -163,6 +101,22 @@ function decorateLanguageService(ts, tsconfig, info) {
             if (!configFile) {
                 return;
             }
+            let configImportPath;
+            try {
+                configImportPath = require.resolve('@tsslint/config', { paths: [configFile] });
+            }
+            catch (err) {
+                configFileDiagnostics = [{
+                        category: ts.DiagnosticCategory.Error,
+                        code: 0,
+                        messageText: String(err),
+                        file: jsonConfigFile,
+                        start: 0,
+                        length: 0,
+                    }];
+                return;
+            }
+            const { watchConfigFile } = require(configImportPath);
             const projectContext = {
                 configFile,
                 tsconfig,
@@ -201,15 +155,7 @@ function decorateLanguageService(ts, tsconfig, info) {
                     return diag;
                 });
                 if (config) {
-                    plugins = await Promise.all([
-                        ...(0, core_1.getBuiltInPlugins)(true),
-                        ...config.plugins ?? []
-                    ].map(plugin => plugin(projectContext)));
-                    for (const plugin of plugins) {
-                        if (plugin.resolveRules) {
-                            config.rules = plugin.resolveRules(config.rules ?? {});
-                        }
-                    }
+                    linter = (0, core_1.createLinter)(projectContext, config, true);
                 }
                 info.project.refreshDiagnostics();
             });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/typescript-plugin",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,10 +12,10 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@tsslint/core": "0.0.5"
+		"@tsslint/core": "0.0.6"
 	},
 	"devDependencies": {
-		"@tsslint/config": "0.0.5"
+		"@tsslint/config": "0.0.6"
 	},
-	"gitHead": "0522e03f552e0ac5bb27124ef923ff093ff02cdc"
+	"gitHead": "a9a381f7c5e84819c99b70f6b429150ce766739c"
 }