@openui5/sap.ui.support 1.116.0 → 1.117.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.support",
-  "version": "1.116.0",
+  "version": "1.117.0",
   "description": "OpenUI5 UI Library sap.ui.support",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.116.0",
-    "@openui5/sap.ui.codeeditor": "1.116.0",
-    "@openui5/sap.ui.core": "1.116.0",
-    "@openui5/sap.ui.fl": "1.116.0",
-    "@openui5/sap.ui.layout": "1.116.0"
+    "@openui5/sap.m": "1.117.0",
+    "@openui5/sap.ui.codeeditor": "1.117.0",
+    "@openui5/sap.ui.core": "1.117.0",
+    "@openui5/sap.ui.fl": "1.117.0",
+    "@openui5/sap.ui.layout": "1.117.0"
   }
 }

package/src/sap/ui/support/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.116.0</version>
+	<version>1.117.0</version>
 
 	<documentation>UI5 library: sap.ui.support</documentation>
 

package/src/sap/ui/support/RuleAnalyzer.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @namespace
 		 * @alias sap.ui.support.RuleAnalyzer
 		 * @author SAP SE
-		 * @version 1.116.0
+		 * @version 1.117.0
 		 * @public
 		 */
 		var RuleAnalyzer = {

package/src/sap/ui/support/jQuery.sap.support.js

@@ -34,7 +34,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery",
 		 * @namespace
 		 * @deprecated Since version 1.60.0. Please use sap/ui/support/RuleAnalyzer instead.
 		 * @author SAP SE
-		 * @version 1.116.0
+		 * @version 1.117.0
 		 * @public
 		 */
 		jQuery.sap.support = {

package/src/sap/ui/support/library.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/ui/core/library"],
 	 * @namespace
 	 * @alias sap.ui.support
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 1.50
 	 * @public
 	 */
@@ -37,7 +37,7 @@ sap.ui.define(["sap/ui/core/library"],
 		controls: [],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.116.0",
+		version: "1.117.0",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/ui/support/supportRules/Main.js

@@ -128,7 +128,7 @@ function (Log, VersionInfo, ManagedObject, Core, Element, Component, Analyzer, C
 		this._oCoreFacade = CoreFacade(Core);
 		this._oExecutionScope = null;
 		this._createElementSpies();
-		Core.attachLibraryChanged(RuleSetLoader._onLibraryChanged);
+		Core.attachLibraryChanged(RuleSetLoader._onLibraryChanged.bind(RuleSetLoader));
 
 		// Make sure that we load UI frame, when no parameter supplied
 		// but tools is required to load, or when parameter is there
@@ -607,7 +607,7 @@ function (Log, VersionInfo, ManagedObject, Core, Element, Component, Analyzer, C
 
 		var copyElementsFromCoreObject = function (coreObject, elemNames) {
 			for (var i in coreObject) {
-				if (Object.prototype.hasOwnProperty.call(coreObject,i)) {
+				if (Object.hasOwn(coreObject,i)) {
 					var element = coreObject[i];
 					var elementCopy = {
 						content: [],

package/src/sap/ui/support/supportRules/RuleSet.js

@@ -11,10 +11,9 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/Version",
 	"sap/ui/support/library",
-	"sap/ui/support/supportRules/Storage",
-	"sap/ui/support/supportRules/Constants"
+	"sap/ui/support/supportRules/Storage"
 ],
-function (Log, Version, library, storage, constants) {
+function (Log, Version, library, storage) {
 	"use strict";
 
 	/**
@@ -35,7 +34,7 @@ function (Log, Version, library, storage, constants) {
 	 * @private
 	 * @alias sap.ui.support.RuleSet
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @param {object} oSettings Name of the initiated
 	 */
 	var RuleSet = function (oSettings) {
@@ -219,6 +218,31 @@ function (Log, Version, library, storage, constants) {
 		}
 	};
 
+	/**
+	 * Merge the rules (or array of rules) of another RuleSet, into this RuleSet.
+	 * @public
+	 * @param {sap.ui.support.RuleSet|sap.ui.support.RuleConfiguration[]} vRuleSetOrRules Rules to be merged
+	 */
+	RuleSet.prototype.mergeRuleSet = function (vRuleSetOrRules) {
+		var aRules = vRuleSetOrRules;
+
+		if (vRuleSetOrRules instanceof RuleSet) {
+			aRules = vRuleSetOrRules.getRules();
+		}
+
+		for (var i = 0; i < aRules.length; i++) {
+			var vRule = aRules[i];
+
+			if (Array.isArray(vRule)) {
+				for (var k = 0; k < vRule.length; k++) {
+					this.addRule(vRule[k]);
+				}
+			} else {
+				this.addRule(vRule);
+			}
+		}
+	};
+
 	/**
 	 * Stores which rules are selected to be run by the analyzer on the next check
 	 * @public

package/src/sap/ui/support/supportRules/RuleSetLoader.js

@@ -63,6 +63,7 @@ sap.ui.define([
 		var RuleSetLoader = {};
 
 		RuleSetLoader._mRuleSets = {};
+		RuleSetLoader._mRequireLibraryRuleSet = {};
 
 		RuleSetLoader.getRuleSets = function () {
 			return this._mRuleSets;
@@ -85,39 +86,31 @@ sap.ui.define([
 		 * @returns {Promise<CommunicationBus>} mainPromise Has promises for all libraries regarding rulesets in the SupportAssistant
 		 */
 		RuleSetLoader._fetchSupportRuleSets = function (fnReadyCbk, mLibraries) {
-			var that = this,
-				mLoadedLibraries = mLibraries || sap.ui.getCore().getLoadedLibraries(),
+			var mLoadedLibraries = mLibraries || sap.ui.getCore().getLoadedLibraries(),
 				oLibNamesWithRulesPromise = this._fetchLibraryNamesWithSupportRules(mLoadedLibraries);
 
-			var oMainPromise = new Promise(function (resolve) {
-
 				// VersionInfo.load() returns the web application's version.
 				// Temp Workaround: Using the core library's version correctly returns the version of the framework
-				VersionInfo.load({ library: "sap.ui.core" }).then(function (oCoreLibInfo) {
+			return VersionInfo.load({ library: "sap.ui.core" })
+				.then(function (oCoreLibInfo) {
 					RuleSet.versionInfo = oCoreLibInfo;
 
-					oLibNamesWithRulesPromise.then(function (oLibNamesWithRules) {
-						var libFetchPromises = that._fetchLibraryFiles(oLibNamesWithRules, RuleSetLoader._fetchRuleSet);
-
-						Promise.all(libFetchPromises).then(function () {
-							that._bRulesCreated = true;
-							CommunicationBus.publish(channelNames.UPDATE_SUPPORT_RULES, {
-								sRuleSet: RuleSerializer.serialize(that._mRuleSets),
-								oVersionInfo: RuleSet.versionInfo
-							});
-							resolve();
-
-							if (fnReadyCbk && typeof fnReadyCbk === "function") {
-								fnReadyCbk();
-							}
-						});
+					return oLibNamesWithRulesPromise;
+				})
+				.then(function (oLibNamesWithRules) {
+					return Promise.all(this._fetchLibraryFiles(oLibNamesWithRules, this._fetchRuleSet));
+				}.bind(this))
+				.then(function () {
+					this._bRulesCreated = true;
+					CommunicationBus.publish(channelNames.UPDATE_SUPPORT_RULES, {
+						sRuleSet: RuleSerializer.serialize(this._mRuleSets),
+						oVersionInfo: RuleSet.versionInfo
 					});
 
-				});
-
-			});
-
-			return oMainPromise;
+					if (fnReadyCbk && typeof fnReadyCbk === "function") {
+						fnReadyCbk();
+					}
+				}.bind(this));
 		};
 
 		/**
@@ -222,7 +215,6 @@ sap.ui.define([
 		 */
 		RuleSetLoader._fetchLibraryFiles = function (aLibNames, fnProcessFile, bSupressProgressReporting) {
 			var aAjaxPromises = [],
-				that = this,
 				supportModulePath = sap.ui.require.toUrl("sap/ui/support"),
 				supportModulesRoot = supportModulePath.replace("sap/ui/support", ""),
 				bCanLoadInternalRules = Utils.canLoadInternalRules(),
@@ -243,44 +235,50 @@ sap.ui.define([
 				CommunicationBus.publish(channelNames.CURRENT_LOADING_PROGRESS, { value: iPercentileProgressValue });
 			}
 
+			// CHECK FOR PUBLIC RULES
 			if (aLibNames.publicRules.length > 0) {
 				aLibNames.publicRules.forEach(function (oLibName) {
-					var libraryNames = that._registerLibraryPath(oLibName, supportModulePath, supportModulesRoot);
+					var customizableLibName = this._registerLibraryPath(oLibName, supportModulePath, supportModulesRoot).customizableLibName;
 
-					if (libraryNames) {
-						// CHECK FOR PUBLIC RULES
-						var oLibPublicRulesPromise = that._requireRuleSet(libraryNames.customizableLibName, fnProcessFile);
+					if (this._mRequireLibraryRuleSet[customizableLibName]) {
+						return;
+					}
 
-						// Do not report progress if in silent mode
-						if (!bSilentMode && !bSupressProgressReporting) {
-							oLibPublicRulesPromise.then(function () {
-								reportCurrentLoadingProgress();
-							});
-						}
+					var oLibPublicRulesPromise = this._requireRuleSet(customizableLibName, fnProcessFile);
 
-						aAjaxPromises.push(oLibPublicRulesPromise);
+					// Do not report progress if in silent mode
+					if (!bSilentMode && !bSupressProgressReporting) {
+						oLibPublicRulesPromise.then(function () {
+							reportCurrentLoadingProgress();
+						});
 					}
-				});
+
+					this._mRequireLibraryRuleSet[customizableLibName] = oLibPublicRulesPromise;
+					aAjaxPromises.push(oLibPublicRulesPromise);
+				}.bind(this));
 			}
 
+			// CHECK FOR INTERNAL RULES
 			if (bCanLoadInternalRules && aLibNames.internalRules.length > 0) {
 				aLibNames.internalRules.forEach(function (oLibName) {
-					var libraryNames = that._registerLibraryPath(oLibName, supportModulePath, supportModulesRoot);
+					var internalLibName = this._registerLibraryPath(oLibName, supportModulePath, supportModulesRoot).internalLibName;
 
-					if (libraryNames) {
-						// CHECK FOR INTERNAL RULES
-						var oLibPrivateRulesPromise = that._requireRuleSet(libraryNames.internalLibName, fnProcessFile);
+					if (this._mRequireLibraryRuleSet[internalLibName]) {
+						return;
+					}
 
-						// Do not report progress if in silent mode
-						if (!bSilentMode && !bSupressProgressReporting) {
-							oLibPrivateRulesPromise.then(function () {
-								reportCurrentLoadingProgress();
-							});
-						}
+					var oLibPrivateRulesPromise = this._requireRuleSet(internalLibName, fnProcessFile);
 
-						aAjaxPromises.push(oLibPrivateRulesPromise);
+					// Do not report progress if in silent mode
+					if (!bSilentMode && !bSupressProgressReporting) {
+						oLibPrivateRulesPromise.then(function () {
+							reportCurrentLoadingProgress();
+						});
 					}
-				});
+
+					this._mRequireLibraryRuleSet[internalLibName] = oLibPrivateRulesPromise;
+					aAjaxPromises.push(oLibPrivateRulesPromise);
+				}.bind(this));
 			}
 
 			return aAjaxPromises;
@@ -291,15 +289,11 @@ sap.ui.define([
 		 * @param {string} libraryName The name of the library
 		 * @param {string} supportModulePath Module path of the SupportAssistant
 		 * @param {string} supportModulesRoot Root path of the SupportAssistant
-		 * @returns {{internalLibName: string, customizableLibName: string}|null} Object, containing the library names
+		 * @returns {{internalLibName: string, customizableLibName: string}} Object, containing the library names
 		 * for the internal rules or null if there isn't such a library loaded in the RuleSets array
 		 * @private
 		 */
 		RuleSetLoader._registerLibraryPath = function (libraryName, supportModulePath, supportModulesRoot) {
-			if (this._mRuleSets[libraryName]) {
-				return null;
-			}
-
 			var libResourceName = libraryName.replace(/\./g, "/");
 			var customizableLibResourceName = libResourceName;
 			var loadFromSupportOrigin = this._getLoadFromSupportOrigin();
@@ -357,31 +351,30 @@ sap.ui.define([
 		 */
 		RuleSetLoader._fetchRuleSet = function (sLibName) {
 			try {
-				var sNormalizedLibName,
-					oLibSupportCopy,
-					oLibrary,
-					oLibSupport = ObjectPath.get(sLibName).library.support;
+				var sNormalizedLibName = sLibName.replace("." + sCustomSuffix, "").replace(".internal", ""),
+					oLibSupport = ObjectPath.get(sLibName).library.support,
+					oRuleSet = this._mRuleSets[sNormalizedLibName];
 
 				if (!oLibSupport) {
 					// This case usually happens when the library flag bExport is set to true.
 					throw "The library.support file was not fetched successfully.";
 				}
 
-				sNormalizedLibName = sLibName.replace("." + sCustomSuffix, "").replace(".internal", "");
-				oLibSupportCopy = extend({}, oLibSupport);
-				oLibrary = this._mRuleSets[sNormalizedLibName];
-
-				if (!(oLibSupportCopy.ruleset instanceof RuleSet)) {
-					oLibSupportCopy = this._createRuleSet(oLibSupportCopy);
+				// ruleset already exists, just merge the new rules into it
+				if (oRuleSet) {
+					oRuleSet.ruleset.mergeRuleSet(oLibSupport.ruleset);
+					return;
 				}
 
-				if (oLibrary) {
-					oLibrary.ruleset._mRules = extend(oLibrary.ruleset._mRules, oLibSupportCopy.ruleset._mRules);
+				// create the ruleset for the first time
+				if (oLibSupport.ruleset instanceof RuleSet) {
+					oRuleSet = extend({}, oLibSupport);
 				} else {
-					oLibrary = oLibSupportCopy;
+					oRuleSet =  this._createRuleSet(oLibSupport);
 				}
 
-				this._mRuleSets[sNormalizedLibName] = oLibrary;
+				this._mRuleSets[sNormalizedLibName] = oRuleSet;
+
 			} catch (e) {
 				Log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Failed to load RuleSet for " + sLibName + " library", e);
 			}
@@ -439,9 +432,8 @@ sap.ui.define([
 		 * @param {Event} oEvent Contains information about the library and newly created rules
 		 */
 		RuleSetLoader._onLibraryChanged = function (oEvent) {
-			var that = this;
-			if (oEvent.getParameter("stereotype") === "library" && RuleSetLoader._bRulesCreated) {
-				that._oMainPromise = RuleSetLoader._fetchSupportRuleSets();
+			if (oEvent.getParameter("stereotype") === "library" && this._bRulesCreated) {
+				this._oMainPromise = this._fetchSupportRuleSets();
 			}
 		};
 
@@ -451,7 +443,7 @@ sap.ui.define([
 		 * @param {function} fnReadyCbk the function to be called after the rules are loaded initially.
 		 */
 		RuleSetLoader.updateRuleSets = function (fnReadyCbk) {
-			this._oMainPromise = RuleSetLoader._fetchSupportRuleSets(fnReadyCbk);
+			this._oMainPromise = this._fetchSupportRuleSets(fnReadyCbk);
 		};
 
 		/**
@@ -468,18 +460,7 @@ sap.ui.define([
 			};
 			var oRuleSet = new RuleSet(oLib);
 
-			for (var i = 0; i < oLibrarySupport.ruleset.length; i++) {
-				var ruleset = oLibrarySupport.ruleset[i];
-
-				// If the ruleset contains arrays of rules make sure we add them.
-				if (Array.isArray(ruleset)) {
-					for (var k = 0; k < ruleset.length; k++) {
-						oRuleSet.addRule(ruleset[k]);
-					}
-				} else {
-					oRuleSet.addRule(ruleset);
-				}
-			}
+			oRuleSet.mergeRuleSet(oLibrarySupport.ruleset);
 
 			return {
 				lib: oLib,

package/src/sap/ui/support/supportRules/Storage.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 *
 	 * @name sap.ui.support.Storage
 	 * @author SAP SE.
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @private
 	 */
 	return /** @lends sap.ui.support.Storage */ {

package/src/sap/ui/support/supportRules/WindowCommunicationBus.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @alias sap.ui.support.WindowCommunicationBus
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @private
 	 */
 	var WindowCommunicationBus = BaseObject.extend("sap.ui.support.supportRules.WindowCommunicationBus", {

package/src/sap/ui/support/supportRules/ui/controllers/PresetsController.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.support.supportRules.ui.controllers.BaseController
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @private
 	 * @alias sap.ui.support.supportRules.ui.controllers.PresetsController
 	 */

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "2.0"
+specVersion: "3.0"
 type: library
 metadata:
   name: sap.ui.support