@tsslint/typescript-plugin 3.0.0-alpha.0 → 3.0.0

package/index.js

@@ -119,62 +119,50 @@ function decorateLanguageService(ts, projectRoot, info) {
                 return;
             }
             const projectContext = {
-                languageServiceHost: info.languageServiceHost,
-                languageService: info.languageService,
+                ...info,
                 typescript: ts,
             };
             try {
-                config = require(configFile).default ?? [];
-                if (config) {
-                    try {
-                        linter = core.createLinter(projectContext, path.dirname(configFile), config, (diag, err, stackOffset) => {
-                            const relatedInfo = createRelatedInformation(ts, err, stackOffset);
-                            if (relatedInfo) {
-                                diag.relatedInformation.push(relatedInfo);
-                            }
-                        });
+                config = (await import(configFile)).default;
+                linter = core.createLinter(projectContext, path.dirname(configFile), config, (err, stackIndex) => {
+                    const stacks = ErrorStackParser.parse(err);
+                    if (stacks.length <= stackIndex) {
+                        return [];
                     }
-                    catch (err) {
-                        config = undefined;
-                        linter = undefined;
-                        const prevLength = configFileDiagnostics.length;
-                        if (err instanceof Error) {
-                            const relatedInfo = createRelatedInformation(ts, err, 0);
-                            if (relatedInfo) {
-                                configFileDiagnostics.push({
-                                    category: ts.DiagnosticCategory.Message,
-                                    code: 0,
-                                    messageText: err.message,
-                                    relatedInformation: [relatedInfo],
-                                });
-                            }
-                        }
-                        if (prevLength === configFileDiagnostics.length) {
-                            configFileDiagnostics.push({
-                                category: ts.DiagnosticCategory.Message,
-                                code: 0,
-                                messageText: String(err),
-                            });
-                        }
+                    const relatedInfo = createRelatedInformation(ts, stacks[stackIndex]);
+                    if (relatedInfo) {
+                        return [relatedInfo];
                     }
-                }
+                    return [];
+                });
             }
             catch (err) {
-                configFileDiagnostics.push({
-                    category: ts.DiagnosticCategory.Message,
-                    code: 'config-build-error',
-                    messageText: String(err),
-                });
+                config = undefined;
+                linter = undefined;
+                const prevLength = configFileDiagnostics.length;
+                if (err instanceof Error) {
+                    const relatedInfo = createRelatedInformation(ts, ErrorStackParser.parse(err)[0]);
+                    if (relatedInfo) {
+                        configFileDiagnostics.push({
+                            category: ts.DiagnosticCategory.Message,
+                            code: 0,
+                            messageText: err.message,
+                            relatedInformation: [relatedInfo],
+                        });
+                    }
+                }
+                if (prevLength === configFileDiagnostics.length) {
+                    configFileDiagnostics.push({
+                        category: ts.DiagnosticCategory.Message,
+                        code: 0,
+                        messageText: String(err),
+                    });
+                }
             }
         }
     }
 }
-function createRelatedInformation(ts, err, stackOffset) {
-    const stacks = ErrorStackParser.parse(err);
-    if (stacks.length <= stackOffset) {
-        return;
-    }
-    const stack = stacks[stackOffset];
+function createRelatedInformation(ts, stack) {
     if (stack.fileName && stack.lineNumber !== undefined && stack.columnNumber !== undefined) {
         let fileName = stack.fileName.replace(/\\/g, '/');
         if (fileName.startsWith('file://')) {
@@ -190,7 +178,7 @@ function createRelatedInformation(ts, err, stackOffset) {
             fsFiles.set(fileName, [
                 text !== undefined,
                 mtime,
-                ts.createSourceFile(fileName, text ?? '', ts.ScriptTarget.Latest, true)
+                ts.createSourceFile(fileName, text ?? '', ts.ScriptTarget.Latest, true),
             ]);
         }
         const [exist, _mtime, relatedFile] = fsFiles.get(fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/typescript-plugin",
-	"version": "3.0.0-alpha.0",
+	"version": "3.0.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,11 +12,11 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@tsslint/core": "3.0.0-alpha.0",
+		"@tsslint/core": "3.0.0",
 		"error-stack-parser": "^2.1.4"
 	},
 	"devDependencies": {
-		"@tsslint/config": "3.0.0-alpha.0"
+		"@tsslint/config": "3.0.0"
 	},
-	"gitHead": "ec683ca05f4360fac720bd8c567f4d9460d255e1"
-}
+	"gitHead": "69bc86cf2dd81f9e48fc15ed9b9f0351fa2fc19e"
+}