@openui5/sap.ui.core 1.92.0 → 1.93.3

package/src/sap/ui/core/LayoutData.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData

package/src/sap/ui/core/ListItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem

package/src/sap/ui/core/LocalBusyIndicator.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @public
 	 * @since 1.11.0

package/src/sap/ui/core/Locale.js

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 * @public
 		 * @alias sap.ui.core.Locale
 		 */

package/src/sap/ui/core/LocaleData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 * @alias sap.ui.core.LocaleData
 	 */

package/src/sap/ui/core/Manifest.js

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */
@@ -154,7 +154,6 @@ sap.ui.define([
 
 			// instance variables
 			this._iInstanceCount = 0;
-			this._bIncludesLoaded = false;
 
 			// apply the manifest related values
 			this._oRawManifest = oManifest;
@@ -162,6 +161,10 @@ sap.ui.define([
 			this._bAsync = !(mOptions && mOptions.async === false);
 			this._activeTerminologies = mOptions && mOptions.activeTerminologies;
 
+			// This should be only the case if manifestFirst is true but there was no manifest.json
+			// As of 08.07.2021 we only set this parameter in Manifest.load in case of failing request
+			this._bLoadManifestRequestFailed = mOptions && mOptions._bLoadManifestRequestFailed;
+
 			// component name is passed via options (overrides the one defined in manifest)
 			this._sComponentName = mOptions && mOptions.componentName;
 
@@ -393,16 +396,13 @@ sap.ui.define([
 		 * Loads the included CSS and JavaScript resources. The resources will be
 		 * resolved relative to the component location.
 		 *
+		 * @param {boolean} bAsync indicator whether the *.js resources should be loaded asynchronous
+		 * @return {Promise<void>|undefined} Promise for required *.js resources
+		 *
 		 * @private
 		 */
-		loadIncludes: function() {
-
-			// skip loading includes once already loaded
-			if (this._bIncludesLoaded) {
-				return;
-			}
-
-			var mResources = this.getEntry("/sap.ui5/resources");
+		_loadIncludes: function(bAsync) {
+			var mResources = this.getEntry("/sap.ui5/resources"), oPromise;
 
 			if (!mResources) {
 				return;
@@ -413,6 +413,17 @@ sap.ui.define([
 			// load JS files
 			var aJSResources = mResources["js"];
 			if (aJSResources) {
+				var requireAsync = function (sModule) {
+					// Wrap promise within function because OPA waitFor (sap/ui/test/autowaiter/_promiseWaiter.js)
+					// can't deal with a promise instance in the wrapped then handler
+					return function() {
+						return new Promise(function(resolve, reject) {
+							sap.ui.require([sModule], resolve, reject);
+						});
+					};
+				};
+
+				oPromise = Promise.resolve();
 				for (var i = 0; i < aJSResources.length; i++) {
 					var oJSResource = aJSResources[i];
 					var sFile = oJSResource.uri;
@@ -420,11 +431,14 @@ sap.ui.define([
 						// load javascript file
 						var m = sFile.match(/\.js$/i);
 						if (m) {
-							//var sJsUrl = this.resolveUri(sFile.slice(0, m.index));
+							// call internal sap.ui.require variant that accepts a requireJS path and loads the module synchronously
 							var sJsUrl = sComponentName.replace(/\./g, '/') + (sFile.slice(0, 1) === '/' ? '' : '/') + sFile.slice(0, m.index);
 							Log.info("Component \"" + sComponentName + "\" is loading JS: \"" + sJsUrl + "\"");
-							// call internal sap.ui.require variant that accepts a requireJS path and loads the module synchronously
-							sap.ui.requireSync(sJsUrl);
+							if (bAsync) {
+								oPromise = oPromise.then(requireAsync(sJsUrl));
+							} else {
+								sap.ui.requireSync(sJsUrl);
+							}
 						}
 					}
 				}
@@ -446,8 +460,7 @@ sap.ui.define([
 				}
 			}
 
-			this._bIncludesLoaded = true;
-
+			return oPromise;
 		},
 
 		/**
@@ -456,12 +469,6 @@ sap.ui.define([
 		 * @private
 		 */
 		removeIncludes: function() {
-
-			// skip removing includes when not loaded yet
-			if (!this._bIncludesLoaded) {
-				return;
-			}
-
 			var mResources = this.getEntry("/sap.ui5/resources");
 
 			if (!mResources) {
@@ -484,18 +491,18 @@ sap.ui.define([
 					oLink.parentNode.removeChild(oLink);
 				}
 			}
-
-			this._bIncludesLoaded = false;
-
 		},
 
 		/**
 		 * Load external dependencies (like libraries and components)
 		 *
+		 * @param {boolean} bAsync indicator whether the dependent libraries and components should be loaded asynchronous
+		 * @return {Promise<void>} Promise containing further promises of dependent libs and components requests
+		 *
 		 * @private
 		 */
-		loadDependencies: function() {
-
+		_loadDependencies: function(bAsync) {
+			var aPromises = [];
 			// afterwards we load our dependencies!
 			var oDep = this.getEntry("/sap.ui5/dependencies"),
 				sComponentName = this.getComponentName();
@@ -508,37 +515,64 @@ sap.ui.define([
 					for (var sLib in mLibraries) {
 						if (!mLibraries[sLib].lazy) {
 							Log.info("Component \"" + sComponentName + "\" is loading library: \"" + sLib + "\"");
-							sap.ui.getCore().loadLibrary(sLib);
+							aPromises.push(sap.ui.getCore().loadLibrary(sLib, {async: bAsync}));
 						}
 					}
 				}
 
-				// load the components
+				// collect all "non-lazy" components
 				var mComponents = oDep["components"];
+				var aComponentDependencies = [];
 				if (mComponents) {
 					for (var sName in mComponents) {
 						if (!mComponents[sName].lazy) {
-							// TODO: refactor component/library loading code within Manifest / Component
-							// Only load component if not (pre-)loaded already
-							// Usually the dependencies are already loaded beforehand within Component.create
-							var sControllerModule = sName.replace(/\./g, "/") + "/Component";
-							var iModuleState = sap.ui.loader._.getModuleState(sControllerModule + ".js");
-							if (iModuleState === -1 /* PRELOADED */) {
-								// Execute preloaded component controller module
-								sap.ui.requireSync(sControllerModule);
-							} else if (iModuleState === 0 /* INITIAL */) {
-								Log.info("Component \"" + sComponentName + "\" is loading component: \"" + sName + ".Component\"");
-								// This can't be migrated to "Component.load" as the contract is sync
-								sap.ui.requireSync("sap/ui/core/Component");
-								sap.ui.component.load({
-									name: sName
-								});
-							}
+							aComponentDependencies.push(sName);
 						}
 					}
 				}
 
+				if (bAsync) {
+					// Async loading of Component, so that Component.load is available
+					var pComponentLoad = new Promise(function(fnResolve, fnReject) {
+						sap.ui.require(["sap/ui/core/Component"], function(Component) {
+							fnResolve(Component);
+						}, fnReject);
+					}).then(function(Component) {
+						// trigger Component.load for all "non-lazy" component dependencies (parallel)
+						return Promise.all(aComponentDependencies.map(function(sComponentName) {
+							// Component.load does not load the dependencies of a dependent component in case property manifest: false
+							// because this could have a negative impact on performance and we do not know if there is a necessity
+							// to load the dependencies
+							// If needed we could make this configurable via manifest.json by adding a 'manifestFirst' option
+							return Component.load({
+								name: sComponentName,
+								manifest: false
+							});
+						}));
+					});
+
+					aPromises.push(pComponentLoad);
+				} else {
+					aComponentDependencies.forEach(function(sName) {
+						// Check for and execute preloaded component controller module
+						// Don't use sap.ui.component.load in order to avoid a warning log
+						// See comments in commit 83f4b601f896dbfcab76fffd455cce841f15b2fb
+						var sControllerModule = sName.replace(/\./g, "/") + "/Component";
+						var iModuleState = sap.ui.loader._.getModuleState(sControllerModule + ".js");
+						if (iModuleState === -1 /* PRELOADED */) {
+							sap.ui.requireSync(sControllerModule);
+						} else if (iModuleState === 0 /* INITIAL */) {
+							Log.info("Component \"" + sComponentName + "\" is loading component: \"" + sName + ".Component\"");
+							// requireSync needed because of cyclic dependency
+							sap.ui.requireSync("sap/ui/core/Component");
+							sap.ui.component.load({
+								name: sName
+							});
+						}
+					});
+				}
 			}
+			return Promise.all(aPromises);
 
 		},
 
@@ -651,31 +685,9 @@ sap.ui.define([
 		 * @private
 		 */
 		init: function(oInstance) {
-
 			if (this._iInstanceCount === 0) {
 
-				// version check => only if minVersion is available a warning
-				// will be logged and the debug mode is turned on
-				this.checkUI5Version();
-
-				// define the resource roots
-				// => if not loaded via manifest first approach the resource roots
-				//    will be registered too late for the AMD modules of the Component
-				//    controller. This is a constraint for the resource roots config
-				//    in the manifest!
-				this.defineResourceRoots();
-
-				// resolve "ui5://..." URLs after the resource-rooots have been defined
-				// this way all ui5 URLs can rely on any resource root definition
-				this._preprocess({
-					resolveUI5Urls: true
-				});
-
-				// load the component dependencies (other UI5 libraries)
-				this.loadDependencies();
-
-				// load the custom scripts and CSS files
-				this.loadIncludes();
+				this.loadDependenciesAndIncludes();
 
 				// activate the static customizing
 				this.activateCustomizing();
@@ -688,7 +700,43 @@ sap.ui.define([
 			}
 
 			this._iInstanceCount++;
+		},
 
+		/**
+		 * Executes checks, define the resource roots, load the dependencies and the includes.
+		 *
+		 * @param {boolean} bAsync indicator whether the dependent dependencies and includes should be loaded asynchronous
+		 * @return {Promise<void>} Promise containing further promises of dependent libs and includes requests
+		 *
+		 * @private
+		 */
+		loadDependenciesAndIncludes: function (bAsync) {
+			if (this._pDependenciesAndIncludes) {
+				return this._pDependenciesAndIncludes;
+			}
+			// version check => only if minVersion is available a warning
+			// will be logged and the debug mode is turned on
+			this.checkUI5Version();
+
+			// define the resource roots
+			// => if not loaded via manifest first approach the resource roots
+			//    will be registered too late for the AMD modules of the Component
+			//    controller. This is a constraint for the resource roots config
+			//    in the manifest!
+			this.defineResourceRoots();
+
+			// resolve "ui5://..." URLs after the resource-rooots have been defined
+			// this way all ui5 URLs can rely on any resource root definition
+			this._preprocess({
+				resolveUI5Urls: true
+			});
+
+			this._pDependenciesAndIncludes = Promise.all([
+				this._loadDependencies(bAsync), // load the component dependencies (other UI5 libraries)
+				this._loadIncludes(bAsync) // load the custom scripts and CSS files
+			]);
+
+			return this._pDependenciesAndIncludes;
 		},
 
 		/**
@@ -715,6 +763,7 @@ sap.ui.define([
 				// remove the custom scripts and CSS files
 				this.removeIncludes();
 
+				delete this._pDependenciesAndIncludes;
 			}
 
 			this._iInstanceCount = iInstanceCount;
@@ -900,12 +949,18 @@ sap.ui.define([
 		if (bAsync) {
 			return oManifestJSON.then(function(oManifestJSON) {
 				// callback for preprocessing the json, e.g. via flex-hook in Component
-				if (fnProcessJson) {
+				if (fnProcessJson && oManifestJSON) {
 					return fnProcessJson(oManifestJSON);
 				} else {
 					return oManifestJSON;
 				}
 			}).then(function(oManifestJSON) {
+				if (!oManifestJSON) {
+					// Loading manifest.json was not successful e.g. because there is no manifest.json
+					// This should be only the case if manifestFirst is true but there was
+					// no manifest.json
+					mSettings._bLoadManifestRequestFailed = true;
+				}
 				return new Manifest(oManifestJSON, mSettings);
 			});
 		}
@@ -942,4 +997,4 @@ sap.ui.define([
 
 	return Manifest;
 
-});
+});

package/src/sap/ui/core/Message.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message