fix: Allow renderer v4

SAP · Dec 11, 2024 · 9d8e7e5 · 9d8e7e5
1 parent 09141c0
commit 9d8e7e5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/src/linter/linter.ts b/src/linter/linter.ts
@@ -354,7 +354,7 @@ export function resolveReader({
 					// When we work with files paths we actually need to limit the result to those
 					// matches, instead of allowing all except XYZ
 					!isFileIncluded(resPath, minimatchPatterns, patternsMatch) :
-					isFileIncluded(resPath, minimatchPatterns, patternsMatch);
+				isFileIncluded(resPath, minimatchPatterns, patternsMatch);
 		},
 	});
 }

diff --git a/src/linter/ui5Types/SourceFileLinter.ts b/src/linter/ui5Types/SourceFileLinter.ts
@@ -346,13 +346,16 @@ export default class SourceFileLinter {
 		if (node && (ts.isObjectLiteralExpression(node) || ts.isVariableDeclaration(node))) {
 			const apiVersionNode = findApiVersionNode(node) as ts.PropertyAssignment | ts.NumericLiteral | undefined;
 
+			const availableApiVersions = ["2", "4"];
 			let nodeToHighlight: ts.PropertyAssignment | ts.PropertyDeclaration |
 				ts.VariableDeclaration | ts.ObjectLiteralExpression |
 				ts.NumericLiteral | undefined = undefined;
 			if (!apiVersionNode) { // No 'apiVersion' property
 				nodeToHighlight = node;
-			} else if ((ts.isNumericLiteral(apiVersionNode) && apiVersionNode.getText() !== "2") ||
-				(ts.isPropertyAssignment(apiVersionNode) && apiVersionNode.initializer.getText() !== "2")) {
+			} else if ((ts.isNumericLiteral(apiVersionNode) &&
+				!availableApiVersions.includes(apiVersionNode.getText())) ||
+				(ts.isPropertyAssignment(apiVersionNode) &&
+					!availableApiVersions.includes(apiVersionNode.initializer.getText()))) {
 				// String value would be "\"2\""
 				nodeToHighlight = apiVersionNode;
 			}

diff --git a/src/utils/ConfigManager.ts b/src/utils/ConfigManager.ts
@@ -43,7 +43,7 @@ export default class ConfigManager {
 			// If it's an relative path, transform to POSIX format
 			const configFilePath = path.isAbsolute(this.#configFile) ?
 				this.#configFile :
-					this.#resolveModulePaths(this.#configFile);
+				this.#resolveModulePaths(this.#configFile);
 
 			({default: config} = await import(configFilePath) as {default: UI5LintConfigType});
 		} else {

diff --git a/test/lib/linter/rules/snapshots/renderer.ts.md b/test/lib/linter/rules/snapshots/renderer.ts.md
@@ -429,7 +429,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 3,
+        errorCount: 2,
         fatalErrorCount: 0,
         filePath: 'ControlRendererDeclaration_negative.js',
         messages: [
@@ -441,14 +441,6 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 2,
           },
-          {
-            column: 4,
-            line: 52,
-            message: 'Use of deprecated renderer detected. Define explicitly the {apiVersion: 2} parameter in the renderer object',
-            messageDetails: '"Renderer Object (https://ui5.sap.com/#/topic/c9ab34570cc14ea5ab72a6d1a4a03e3f)",',
-            ruleId: 'no-deprecated-api',
-            severity: 2,
-          },
           {
             column: 2,
             line: 4,

diff --git a/test/lib/linter/rules/snapshots/renderer.ts.snap b/test/lib/linter/rules/snapshots/renderer.ts.snap