@tsslint/config 2.0.0 → 2.0.1

package/lib/plugins/diagnostics.js

@@ -4,15 +4,15 @@ exports.create = create;
 function create(mode = 'semantic') {
     const modes = Array.isArray(mode) ? mode : [mode];
     return ({ languageService }) => ({
-        resolveDiagnostics(sourceFile, diagnostics) {
+        resolveDiagnostics(file, diagnostics) {
             const program = languageService.getProgram();
             for (const mode of modes) {
                 const diags = mode === 'syntactic'
-                    ? program.getSyntacticDiagnostics(sourceFile)
+                    ? program.getSyntacticDiagnostics(file)
                     : mode === 'semantic'
-                        ? program.getSemanticDiagnostics(sourceFile)
+                        ? program.getSemanticDiagnostics(file)
                         : mode === 'declaration'
-                            ? program.getDeclarationDiagnostics(sourceFile)
+                            ? program.getDeclarationDiagnostics(file)
                             : [];
                 for (const diag of diags) {
                     diag.start ??= 0;

package/lib/plugins/ignore.js

@@ -107,14 +107,14 @@ function create(cmdOption, reportsUnusedComments) {
             return result;
         };
         return {
-            resolveDiagnostics(sourceFile, results) {
+            resolveDiagnostics(file, results) {
                 if (!reportsUnusedComments &&
                     !results.some(error => error.source === 'tsslint')) {
                     return results;
                 }
                 const comments = new Map();
                 const logs = [];
-                (0, ts_api_utils_1.forEachComment)(sourceFile, (fullText, { pos, end }) => {
+                (0, ts_api_utils_1.forEachComment)(file, (fullText, { pos, end }) => {
                     pos += 2; // Trim the // or /* characters
                     const commentText = fullText.substring(pos, end);
                     logs.push(commentText);
@@ -126,10 +126,10 @@ function create(cmdOption, reportsUnusedComments) {
                             comments.set(ruleId, []);
                         }
                         const disabledLines = comments.get(ruleId);
-                        const line = sourceFile.getLineAndCharacterOfPosition(index).line;
+                        const line = file.getLineAndCharacterOfPosition(index).line;
                         let startLine = line;
                         if (mode === 'singleLine') {
-                            const startWithComment = sourceFile.text.slice(sourceFile.getPositionOfLineAndCharacter(line, 0), index - 2).trim() === '';
+                            const startWithComment = file.text.slice(file.getPositionOfLineAndCharacter(line, 0), index - 2).trim() === '';
                             if (startWithComment) {
                                 startLine = line + 1; // If the comment is at the start of the line, the error is in the next line
                             }
@@ -146,7 +146,7 @@ function create(cmdOption, reportsUnusedComments) {
                         const endComment = commentText.match(endReg);
                         if (endComment?.index !== undefined) {
                             const index = endComment.index + pos;
-                            const prevLine = sourceFile.getLineAndCharacterOfPosition(index).line;
+                            const prevLine = file.getLineAndCharacterOfPosition(index).line;
                             const ruleId = endComment.groups?.ruleId;
                             const disabledLines = comments.get(ruleId);
                             if (disabledLines) {
@@ -155,17 +155,17 @@ function create(cmdOption, reportsUnusedComments) {
                         }
                     }
                 });
-                let reportedRules = reportedRulesOfFile.get(sourceFile.fileName);
+                let reportedRules = reportedRulesOfFile.get(file.fileName);
                 if (!reportedRules) {
                     reportedRules = [];
-                    reportedRulesOfFile.set(sourceFile.fileName, reportedRules);
+                    reportedRulesOfFile.set(file.fileName, reportedRules);
                 }
                 reportedRules.length = 0;
                 results = results.filter(error => {
                     if (error.source !== 'tsslint') {
                         return true;
                     }
-                    const line = sourceFile.getLineAndCharacterOfPosition(error.start).line;
+                    const line = file.getLineAndCharacterOfPosition(error.start).line;
                     reportedRules.push([error.code, line]);
                     for (const code of [undefined, error.code]) {
                         const states = comments.get(code);
@@ -196,7 +196,7 @@ function create(cmdOption, reportsUnusedComments) {
                         for (const state of comment.values()) {
                             if (!state.used) {
                                 results.push({
-                                    file: sourceFile,
+                                    file: file,
                                     start: state.commentRange[0],
                                     length: state.commentRange[1] - state.commentRange[0],
                                     code: 'tsslint:unused-ignore-comment',
@@ -210,23 +210,23 @@ function create(cmdOption, reportsUnusedComments) {
                 }
                 return results;
             },
-            resolveCodeFixes(sourceFile, diagnostic, codeFixes) {
+            resolveCodeFixes(file, diagnostic, codeFixes) {
                 if (diagnostic.source !== 'tsslint' || diagnostic.start === undefined) {
                     return codeFixes;
                 }
-                const line = sourceFile.getLineAndCharacterOfPosition(diagnostic.start).line;
+                const line = file.getLineAndCharacterOfPosition(diagnostic.start).line;
                 codeFixes.push({
                     fixName: cmd,
                     description: `Ignore with ${cmdText}`,
                     changes: [
                         {
-                            fileName: sourceFile.fileName,
+                            fileName: file.fileName,
                             textChanges: [{
                                     newText: reg.test(`${cmdText}${diagnostic.code}`)
                                         ? `// ${cmdText}${diagnostic.code}\n`
                                         : `// ${cmdText} ${diagnostic.code}\n`,
                                     span: {
-                                        start: sourceFile.getPositionOfLineAndCharacter(line, 0),
+                                        start: file.getPositionOfLineAndCharacter(line, 0),
                                         length: 0,
                                     },
                                 }],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/config",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,8 +12,8 @@
 		"directory": "packages/config"
 	},
 	"dependencies": {
-		"@tsslint/types": "2.0.0",
+		"@tsslint/types": "2.0.1",
 		"ts-api-utils": "^2.0.0"
 	},
-	"gitHead": "ae93f5a423f55be0af23e4b088bf589dbc215ef6"
+	"gitHead": "175c1f2840d38e50f8042542feb317acc7049f91"
 }