refactor: Address GH comments

SAP · Feb 11, 2025 · ce8a0db · ce8a0db
1 parent ce27fdd
commit ce8a0db
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 18 deletions.
diff --git a/src/linter/ui5Types/SourceFileLinter.ts b/src/linter/ui5Types/SourceFileLinter.ts
@@ -202,7 +202,7 @@ export default class SourceFileLinter {
 		} else if (ts.isObjectLiteralExpression(node)) {
 			node.properties.forEach((prop) => {
 				if (ts.isPropertyAssignment(prop) &&
-					ts.isIdentifier(prop.name) &&
+					(ts.isIdentifier(prop.name) || ts.isStringLiteralLike(prop.name)) &&
 					ts.isStringLiteralLike(prop.initializer) &&
 					["definition", "fragmentContent", "viewContent"].includes(prop.name.text) &&
 					this.isXMLInJsCreationCall(prop, prop.name.text)) {

diff --git a/test/fixtures/linter/rules/XMLInJs/FragmentLoad.js b/test/fixtures/linter/rules/XMLInJs/FragmentLoad.js
@@ -1,7 +1,7 @@
 sap.ui.require(["sap/ui/core/Fragment"], async (Fragment) => {
 	const content = await Fragment.load({
 		type: "XML",
-		definition: `<core:FragmentDefinition
+		"definition": `<core:FragmentDefinition
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 			<Button tap=".sayHello">

diff --git a/test/fixtures/linter/rules/XMLInJs/SapUIFragment.js b/test/fixtures/linter/rules/XMLInJs/SapUIFragment.js
@@ -7,9 +7,9 @@ sap.ui.require([], () => {
 			<Button tap=".sayHello">
 		</core:FragmentDefinition>`,
 	});
-	
+
 	const fragment2 = sap.ui.xmlfragment({
-		fragmentContent: `<core:FragmentDefinition
+		"fragmentContent": `<core:FragmentDefinition
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 			<Button tap=".sayHello">

diff --git a/test/fixtures/linter/rules/XMLInJs/SapUIView.js b/test/fixtures/linter/rules/XMLInJs/SapUIView.js
@@ -14,7 +14,7 @@ sap.ui.define([], () => {
 
 	const oView2 = sap.ui.view({
 		type: "XML",
-		viewContent: `<mvc:View 
+		"viewContent": `<mvc:View 
 			controllerName="ui5app.controller.Home" 
 			displayBlock="true"
 			xmlns="sap.m"
@@ -35,4 +35,8 @@ sap.ui.define([], () => {
 				<Button tap=".sayHello">
 			</mvc:View>`,
 	});
+
+	sap.ui.xmlview({
+		viewContent: `<mvc:View controllerName="ui5app.controller.Home" displayBlock="true" xmlns="sap.m" xmlns:mvc="sap.ui.core.mvc" xmlns:core="sap.ui.core"><Button tap=".sayHello"></mvc:View>`,
+	});
 });
diff --git a/test/fixtures/linter/rules/XMLInJs/ViewCreate.js b/test/fixtures/linter/rules/XMLInJs/ViewCreate.js
@@ -14,8 +14,8 @@ sap.ui.define(
 		});
 		oView.placeAt("content");
 
-		const oView2 = XMLView.create({
-			definition: `<mvc:View 
+		const oView2 = await XMLView.create({
+			"definition": `<mvc:View 
 		controllerName="ui5app.controller.Home" 
 		displayBlock="true"
 		xmlns="sap.m"

diff --git a/test/lib/linter/rules/XMLInJs.ts → test/lib/linter/rules/XmlInJs.ts b/test/lib/linter/rules/XMLInJs.ts → test/lib/linter/rules/XmlInJs.ts
diff --git a/test/lib/linter/rules/snapshots/XMLInJs.ts.md b/test/lib/linter/rules/snapshots/XMLInJs.ts.md
@@ -1,6 +1,6 @@
-# Snapshot report for `test/lib/linter/rules/XMLInJs.ts`
+# Snapshot report for `test/lib/linter/rules/XmlInJs.ts`
 
-The actual snapshot is saved in `XMLInJs.ts.snap`.
+The actual snapshot is saved in `XmlInJs.ts.snap`.
 
 Generated by [AVA](https://avajs.dev).
 
@@ -99,7 +99,7 @@ Generated by [AVA](https://avajs.dev).
     [
       {
         coverageInfo: [],
-        errorCount: 9,
+        errorCount: 12,
         fatalErrorCount: 0,
         filePath: 'SapUIView.js',
         messages: [
@@ -167,6 +167,22 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 2,
           },
+          {
+            column: 2,
+            line: 39,
+            message: 'Access of global variable \'sap\' (sap.ui.xmlview)',
+            messageDetails: 'Do not use global variables to access UI5 modules or APIs. See Best Practices for Developers (https://ui5.sap.com/#/topic/28fcd55b04654977b63dacbee0552712)',
+            ruleId: 'no-globals',
+            severity: 2,
+          },
+          {
+            column: 9,
+            line: 39,
+            message: 'Call to deprecated function \'xmlview\' (sap.ui.xmlview)',
+            messageDetails: 'Deprecated test message',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 13,
             line: 35,
@@ -175,6 +191,14 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 2,
           },
+          {
+            column: 146,
+            line: 40,
+            message: 'Use of deprecated property \'tap\' of class \'Button\'',
+            messageDetails: 'Deprecated test message',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
         ],
         warningCount: 0,
       },
@@ -186,14 +210,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       {
-        coverageInfo: [
-          {
-            category: 1,
-            column: 3,
-            line: 27,
-            message: 'Unable to analyze this method call because the type of identifier "placeAt" in "oView2.placeAt("content")"" could not be determined',
-          },
-        ],
+        coverageInfo: [],
         errorCount: 2,
         fatalErrorCount: 0,
         filePath: 'ViewCreate.js',

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