feat: Autofix for jQuery complex cases (multple iterations required)

src/linter/ui5Types/fix/collections/jqueryFixes.ts

@@ -77,11 +77,21 @@ t.declareModule("jQuery", [
 				scope: FixScope.FirstChild,
 			})),
 		]),
+		t.namespace("resources", [
+			t.namespace("isBundle", callExpressionGeneratorFix({ // https://github.com/SAP/ui5-linter/issues/657
+				moduleName: "sap/base/i18n/ResourceBundle",
+				generator(_ctx, [moduleIdentifier], arg1) {
+					return `${arg1.trim()} instanceof ${moduleIdentifier}`;
+				},
+			})),
+		],
 		// jQuery.sap.resources => ResourceBundle.create
-		t.namespace("resources", accessExpressionFix({ // https://github.com/SAP/ui5-linter/issues/521
+		callExpressionFix({ // https://github.com/SAP/ui5-linter/issues/521
+			scope: FixScope.FirstChild,
 			moduleName: "sap/base/i18n/ResourceBundle",
 			propertyAccess: "create",
-		})),
+		})
+		),
 		t.namespace("encodeCSS", accessExpressionFix({ // https://github.com/SAP/ui5-linter/issues/524
 			moduleName: "sap/base/security/encodeCSS",
 		})),
@@ -714,6 +724,47 @@ t.declareModule("jQuery", [
 				return res;
 			},
 		})),
+		t.namespace("delayedCall", callExpressionGeneratorFix<{isFnString: boolean}>({
+			validateArguments: (ctx, _, _timeout, _objCtx, fnName) => {
+				ctx.isFnString = !!fnName && ts.isStringLiteralLike(fnName);
+				return true;
+			},
+			generator: (ctx, _, timeout, objCtx, fnName, params) => {
+				let fnRepresentation;
+				if (ctx.isFnString) {
+					fnRepresentation = `${objCtx.trim()}[${fnName.trim()}].bind(${objCtx.trim()})`;
+				} else {
+					fnRepresentation = `${fnName.trim()}.bind(${objCtx.trim()})`;
+				}
+
+				return `setTimeout(${fnRepresentation}, ${timeout}${params ? ", ..." + params.trim() : ""})`;
+			},
+		})),
+		t.namespace("clearDelayedCall", callExpressionFix({
+			globalName: "clearTimeout",
+		})),
+		t.namespace("intervalCall", callExpressionGeneratorFix<{isFnString: boolean}>({
+			globalName: "setInterval",
+			validateArguments: (ctx, _, _timeout, _objCtx, fnName) => {
+				ctx.isFnString = !!fnName && ts.isStringLiteralLike(fnName);
+				return true;
+			},
+			generator: (ctx, _, timeout, objCtx, fnName, params) => {
+				let fnRepresentation;
+				if (ctx.isFnString) {
+					fnRepresentation = `${objCtx.trim()}[${fnName.trim()}].bind(${objCtx.trim()})`;
+				} else {
+					fnRepresentation = `${fnName.trim()}.bind(${objCtx.trim()})`;
+				}
+
+				return `setInterval(${fnRepresentation}, ${timeout}${params ? ", ..." + params.trim() : ""})`;
+			},
+		})),
+		t.namespace("clearIntervalCall", callExpressionGeneratorFix({
+			generator: (_ctx, _, cbId) => {
+				return `clearInterval(${cbId})`;
+			},
+		})),
 	]), // jQuery.sap
 	// jQuery
 	t.namespace("inArray", callExpressionGeneratorFix({

test/fixtures/autofix/jQueryNativeReplacements.js

@@ -48,10 +48,29 @@ sap.ui.define(["sap/ui/thirdparty/jquery"], async function (jQuery) {
 	var delayedCallId = jQuery.sap.delayedCall(1000, myObject, "myFunction");
 	var delayedCallId2 = jQuery.sap.delayedCall(1000, myObject, myObject.myFunction, ["myParam1"]);
 	var delayedCallId3 = jQuery.sap.delayedCall(1000, window, Array.isArray, ["myParam1"]);
+	var delayedCallId4 = jQuery.sap.delayedCall(1000, this, function () {
+		var padRight = jQuery.sap.padRight("a", "0", 4); // Also migrate internal content
+	}, ["myParam1", "myParam2"]);
+	// OPA tests use this to wait for something to be ready
+	jQuery.sap.delayedCall(1000, this, function () {
+		var padRight = jQuery.sap.padRight("a", "0", 4); // Also migrate internal content
+
+		jQuery.sap.delayedCall(1000, this, function () {
+			var padRight = jQuery.sap.padRight("a", "0", 4); // Also migrate internal content
+
+			jQuery.sap.delayedCall(1000, this, function () {
+				var padRight = jQuery.sap.padRight("a", "0", 4); // Also migrate internal content
+			});
+		});
+	});
+
 	jQuery.sap.clearDelayedCall(delayedCallId);
 	var intervalCallId = jQuery.sap.intervalCall(1000, myObject, "myFunction");
 	var intervalCallId2 = jQuery.sap.intervalCall(1000, myObject, myObject.myFunction, ["myParam1"]);
 	var intervalCallId3 = jQuery.sap.intervalCall(1000, window, Array.isArray, ["myParam1"]);
+	var intervalCallId4 = jQuery.sap.intervalCall(1000, this, function () {
+		var padRight = jQuery.sap.padRight("a", "0", 4); // Also migrate internal content
+	}, ["myParam1", "myParam2"]);
 	jQuery.sap.clearIntervalCall(intervalCallId);
 
 	const document = globalThis.document;

test/fixtures/autofix/jQueryNoModule.js

@@ -9,6 +9,9 @@ const bundle = jQuery.sap.resources({
 	url: "resources/i18n.properties"
 });
 
+// https://github.com/SAP/ui5-linter/issues/521
+var isBundle = jQuery.sap.resources.isBundle(myBundle);
+
 // https://github.com/SAP/ui5-linter/issues/522
 const logObject = jQuery.sap.log;
 const myLogger = jQuery.sap.log.getLogger();

test/fixtures/autofix/jQuerySap.js

@@ -11,8 +11,12 @@ sap.ui.define(["sap/base/strings/NormalizePolyfill"], async function (NormalizeP
 		const bundle = jQuery.sap.resources({
 			url: "resources/i18n.properties"
 		});
+
+		// https://github.com/SAP/ui5-linter/issues/521
+		var myBundle = innerScopeResourceBundle.create({url : "i18n/messagebundle.properties"});
+		var isBundle = jQuery.sap.resources.isBundle(myBundle);
 	});
-
+	
 	// https://github.com/SAP/ui5-linter/issues/522
 	const logObject = jQuery.sap.log;
 	const myLogger = jQuery.sap.log.getLogger();

test/fixtures/e2e/runtime/test/qunit/jQuery.sap.resources.qunit.js

@@ -0,0 +1,14 @@
+/*global QUnit */
+sap.ui.define(["sap/base/i18n/ResourceBundle"], (ResourceBundle) => {
+	"use strict";
+
+	QUnit.module("jQuery.sap.resources");
+
+	QUnit.test("jQuery.sap.resources.isBundle", function (assert) {
+		// https://github.com/SAP/ui5-linter/issues/521
+		var myBundle = ResourceBundle.create({url : "i18n/messagebundle.properties"});
+		var isBundle = jQuery.sap.resources.isBundle(myBundle);
+
+		assert.ok(isBundle, "ResourceBundle is recognized as a bundle");
+	});
+});

test/fixtures/e2e/runtime/test/qunit/testsuite.qunit.js

@@ -22,6 +22,7 @@ sap.ui.define(() => {
 			"jQuery.sap.setObject": {},
 			"jQuery.sap.startsWith": {},
 			"jQuery.sap.pad": {},
+			"jQuery.sap.resources": {},
 
 		}
 	};