@openui5/sap.ui.fl 1.98.0 → 1.101.0

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -44,10 +44,12 @@ sap.ui.define([
 	 * The persistence happens inside an object mapped to the component reference, with the following properties:
 	 *
 	 *	{
-	 * 		appDescriptorMap: {},
-	 * 		changesMap: {},
-	 * 		variantsMap: {},
-	 * 		compVariantsMap: {},
+	 * 		preparedMaps: {
+	 * 			appDescriptorMap: {},
+	 * 			changesMap: {},
+	 * 			variantsMap: {},
+	 * 			compVariantsMap: {},
+	 * 		},
 	 * 		storageResponse: {
 	 * 			changes: {
 	 * 				changes: [...],
@@ -65,14 +67,16 @@ sap.ui.define([
 	 * 			},
 	 * 			loadModules: <boolean>
 	 * 		},
+	 * 		unfilteredStorageResnonse: {...}, // same as above but without layer filtering
 	 *		partialFlexState: <boolean>,
-	 *		componentId: "<componentId>"
+	 *		componentId: "<componentId>",
+	 *		componentData: {...}
 	 *	}
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -84,7 +88,6 @@ sap.ui.define([
 	var _oShellNavigationService;
 	var _oURLParsingService;
 	var _oChangePersistenceFactory;
-	var _oFlexControllerFactory;
 	var _mFlexObjectInfo = {
 		appDescriptorChanges: {
 			prepareFunction: prepareAppDescriptorMap,
@@ -104,16 +107,12 @@ sap.ui.define([
 		}
 	};
 	// some runtime data is only fetched once (e.g. during control init) and has to survive an invalidation of the FlexState
+	// TODO: move to maps as soon as they don't get cleared with cache invalidation
 	var _mExternalData = {
 		compVariants: {},
 		variants: {}
 	};
 
-	function updateComponentData(mPropertyBag) {
-		var oComponent = Component.get(mPropertyBag.componentId);
-		_mInstances[mPropertyBag.reference].componentData = oComponent ? oComponent.getComponentData() : mPropertyBag.componentData;
-	}
-
 	function enhancePropertyBag(mPropertyBag) {
 		var oComponent = Component.get(mPropertyBag.componentId);
 		mPropertyBag.componentData = mPropertyBag.componentData || oComponent.getComponentData() || {};
@@ -127,6 +126,9 @@ sap.ui.define([
 		}
 
 		if (!_mInstances[sReference].preparedMaps[sMapName]) {
+			if (!_mInstances[sReference].storageResponse) {
+				_mInstances[sReference].storageResponse = filterByMaxLayer(_mInstances[sReference].unfilteredStorageResponse);
+			}
 			var mPropertyBag = {
 				unfilteredStorageResponse: _mInstances[sReference].unfilteredStorageResponse,
 				storageResponse: _mInstances[sReference].storageResponse,
@@ -214,7 +216,7 @@ sap.ui.define([
 
 	function registerMaxLayerHandler(sReference) {
 		var oShellNavigationService = getUShellService("ShellNavigation");
-		if (oShellNavigationService) {
+		if (oShellNavigationService && !_mNavigationHandlers[sReference]) {
 			_mNavigationHandlers[sReference] = handleMaxLayerChange.bind(null, sReference);
 			oShellNavigationService.registerNavigationFilter(_mNavigationHandlers[sReference]);
 		}
@@ -248,10 +250,6 @@ sap.ui.define([
 		return undefined;
 	}
 
-	function clearPreparedMaps(sReference) {
-		_mInstances[sReference].preparedMaps = {};
-	}
-
 	function checkPartialFlexState(mInitProperties) {
 		var oFlexInstance = _mInstances[mInitProperties.reference];
 		if (oFlexInstance.partialFlexState === true && mInitProperties.partialFlexState !== true) {
@@ -296,16 +294,14 @@ sap.ui.define([
 		return undefined;
 	}
 
-	// TODO: get rid of the following module dependencies as far as the change state
-	//       is migrated from changePersistenceFactory to the FlexState
+	// TODO: get rid of the following module dependencies as soon as the change state
+	// is migrated from changePersistenceFactory to the FlexState
 	function lazyLoadModules() {
 		return Promise.all([
-			Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory"),
-			Utils.requireAsync("sap/ui/fl/FlexControllerFactory")
+			Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory")
 		])
 			.then(function(aModules) {
 				_oChangePersistenceFactory = aModules[0];
-				_oFlexControllerFactory = aModules[1];
 			})
 			.catch(function(oError) {
 				Log.error("Error loading modules: " + oError.message);
@@ -325,7 +321,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
 	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
 	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
-	 * @returns {promise<undefined>} Resolves a promise as soon as FlexState is initialized
+	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
 	FlexState.initialize = function(mPropertyBag) {
 		return Promise.all([
@@ -349,11 +345,10 @@ sap.ui.define([
 
 				return loadFlexData(mPropertyBag);
 			})
-			.then(function(mPropertyBag, mResponse) {
-				// filtering should only be done once; can be reset via function
-				if (!_mInstances[mPropertyBag.reference].storageResponse) {
-					_mInstances[mPropertyBag.reference].storageResponse = filterByMaxLayer(mResponse);
-					updateComponentData(mPropertyBag);
+			.then(function(mPropertyBag) {
+				if (!_mInstances[mPropertyBag.reference].componentData) {
+					var oComponent = Component.get(mPropertyBag.componentId);
+					_mInstances[mPropertyBag.reference].componentData = oComponent ? oComponent.getComponentData() : mPropertyBag.componentData;
 				}
 			}.bind(null, mPropertyBag));
 	};
@@ -367,7 +362,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.manifest] - Manifest that belongs to actual component
 	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
 	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
-	 * @returns {promise<undefined>} Resolves a promise as soon as FlexState is initialized again
+	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized again
 	 */
 	FlexState.clearAndInitialize = function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
@@ -383,13 +378,13 @@ sap.ui.define([
 			deRegisterMaxLayerHandler(sReference);
 			delete _mInstances[sReference];
 			delete _mInitPromises[sReference];
-			// TODO: get rid of the following deletes as far as the change state
-			//       is migrated from changePersistenceFactory to the FlexState
-			if (_oChangePersistenceFactory && _oChangePersistenceFactory._instanceCache) {
-				delete _oChangePersistenceFactory._instanceCache[sReference];
-			}
-			if (_oFlexControllerFactory && _oFlexControllerFactory._instanceCache) {
-				delete _oFlexControllerFactory._instanceCache[sReference];
+			// TODO: get rid of the following deletes as soon as the change state
+			// is migrated from changePersistenceFactory to the FlexState
+			if (
+				_oChangePersistenceFactory
+				&& (_oChangePersistenceFactory._instanceCache || {}).hasOwnProperty(sReference)
+			) {
+				_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 			}
 		} else {
 			Object.keys(_mInstances).forEach(function(sReference) {
@@ -433,14 +428,10 @@ sap.ui.define([
 	 * The next initialize call will add it again.
 	 *
 	 * @param {string} sReference - Flex reference of the app
-	 * @param {string} sComponentId - Component instance ID
 	 */
-	FlexState.clearFilteredResponse = function(sReference, sComponentId) {
-		if (
-			_mInstances[sReference]
-			&& (!sComponentId || sComponentId === _mInstances[sReference].componentId)
-		) {
-			clearPreparedMaps(sReference);
+	FlexState.clearFilteredResponse = function(sReference) {
+		if (_mInstances[sReference]) {
+			_mInstances[sReference].preparedMaps = {};
 			delete _mInstances[sReference].storageResponse;
 		}
 	};

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -5,12 +5,10 @@
  */
 
 sap.ui.define([
-	"sap/base/util/deepClone",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Storage",
 	"sap/ui/fl/Utils"
 ], function(
-	deepClone,
 	ManifestUtils,
 	ApplyStorage,
 	Utils
@@ -75,7 +73,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -33,7 +33,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 */
 	var ManifestUtils = {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @experimental Since 1.75
 	 * @since 1.75
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -5,17 +5,19 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/write/api/ChangesWriteAPI",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/base/util/restricted/_omit",
 	"sap/base/util/merge",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/fl/apply/_internal/changes/Utils",
+	"sap/ui/fl/write/api/ChangesWriteAPI",
+	"sap/ui/fl/ChangePersistenceFactory"
 ], function(
-	ChangesWriteAPI,
-	ChangePersistenceFactory,
 	_omit,
 	merge,
-	Log
+	Log,
+	ChangesUtils,
+	ChangesWriteAPI,
+	ChangePersistenceFactory
 ) {
 	"use strict";
 
@@ -26,17 +28,17 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted
 	 */
 	var ExtensionPointState = {};
 
-	function isChangeValidForExtensionPoint(oChangePersistence, mPropertyBag, oChange) {
+	function isChangeValidForExtensionPoint(mPropertyBag, oChange) {
 		if (oChange.getSelector().name !== mPropertyBag.extensionPointName) {
 			return false;
 		}
-		return oChangePersistence.changesHavingCorrectViewPrefix(mPropertyBag, oChange);
+		return ChangesUtils.filterChangeByView(mPropertyBag, oChange);
 	}
 
 	function isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo) {
@@ -101,7 +103,7 @@ sap.ui.define([
 		}
 		return oChangePersistence.getChangesForComponent()
 			.then(function(aChanges) {
-				return aChanges.filter(isChangeValidForExtensionPoint.bind(this, oChangePersistence, mPropertyBag));
+				return aChanges.filter(isChangeValidForExtensionPoint.bind(undefined, mPropertyBag));
 			});
 	};
 

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -114,7 +114,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -179,7 +179,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -36,7 +36,6 @@ sap.ui.define([
 		var aCurrentVariantChanges = VariantManagementState.getControlChangesForVariant(
 			Object.assign(
 				_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"]), {
-					changeInstance: true,
 					vReference: mPropertyBag.currentVReference
 				}
 			)
@@ -44,7 +43,6 @@ sap.ui.define([
 		var aNewChanges = VariantManagementState.getControlChangesForVariant(
 			Object.assign(
 				_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"]), {
-					changeInstance: true,
 					vReference: mPropertyBag.newVReference
 				}
 			)
@@ -93,7 +91,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -108,7 +106,6 @@ sap.ui.define([
 		 * @param {string} mPropertyBag.newVReference - Variant reference to be switched to
 		 * @param {string} mPropertyBag.currentVReference - Variant reference to be switched from
 		 * @param {sap.ui.core.Component} mPropertyBag.appComponent - App component
-		 * @param {boolean} [mPropertyBag.changeInstance] <code>true</code> if each change has to be an instance of <code>sap.ui.fl.Change</code>
 		 *
 		 * @returns {Promise} Resolves after variant has been switched
 		 * @private

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -43,19 +43,20 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted
 	 */
 	var VariantManagementState = {};
 
+	var mUpdateStateListeners = {};
+
 	function getReferencedChanges(mPropertyBag) {
 		var aReferencedVariantChanges = [];
 		if (mPropertyBag.variantData.content.variantReference) {
 			aReferencedVariantChanges = VariantManagementState.getControlChangesForVariant(Object.assign(
 				mPropertyBag, {
-					vReference: mPropertyBag.variantData.content.variantReference,
-					changeInstance: true
+					vReference: mPropertyBag.variantData.content.variantReference
 				}));
 			return aReferencedVariantChanges.filter(function(oReferencedChange) {
 				return LayerUtils.compareAgainstCurrentLayer(oReferencedChange.getDefinition().layer, mPropertyBag.variantData.content.layer) === -1; /* Referenced change layer below current layer*/
@@ -123,6 +124,27 @@ sap.ui.define([
 		}
 	}
 
+	/**
+	 * TODO: adapt as soon as the ChangePersistence is removed
+	 * Temporary function to inform the VariantModel about the state being updated, so that the dirty state can be updated.
+	 * The concept is fine, but the functionality will probably move somewhere else
+	 *
+	 * @param {string} sReference - Flex Reference
+	 * @param {function} fnListener - Function to call when the state changes
+	 */
+	VariantManagementState.addUpdateStateListener = function(sReference, fnListener) {
+		mUpdateStateListeners[sReference] = fnListener;
+	};
+
+	/**
+	 * Removes the listener registered for the given reference
+	 *
+	 * @param {string} sReference - Flex Reference
+	 */
+	VariantManagementState.removeUpdateStateListener = function(sReference) {
+		delete mUpdateStateListeners[sReference];
+	};
+
 	/**
 	 * Returns variant management state for the passed component reference.
 	 *
@@ -143,30 +165,14 @@ sap.ui.define([
 		FlexState.resetFakedStandardVariants(sReference, sComponentId);
 	};
 
-	/**
-	 * Resets variant management state
-	 *
-	 * @param {string} sReference - Component reference
-	 * @param {string} sComponentId - Component instance ID
-	 *
-	 * @private
-	 * @ui5-restricted
-	 */
-	VariantManagementState.resetContent = function(sReference, sComponentId) {
-		// reset on component destroy() should be handled more centrally
-		// once all maps are prepared in flex state
-		FlexState.clearFilteredResponse(sReference, sComponentId);
-	};
-
 	/**
 	 * Returns control changes for a given variant reference.
 	 *
 	 * @param {object} mPropertyBag Object with the necessary properties
-	 * @param {String} mPropertyBag.vmReference - Variant management reference
-	 * @param {String} mPropertyBag.vReference - ID of the variant
+	 * @param {string} mPropertyBag.vmReference - Variant management reference
+	 * @param {string} mPropertyBag.vReference - ID of the variant
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Whether dirty changes of the current session should be included, <code>true</code> by default
-	 * @param {boolean} [mPropertyBag.changeInstance] <code>true</code> if each change has to be an instance of <code>sap.ui.fl.Change</code>
 	 *
 	 * @returns {object[]|sap.ui.fl.Change[]} All changes of the variant
 	 * @private
@@ -182,11 +188,6 @@ sap.ui.define([
 					|| oChange.getState() === Change.states.PERSISTED
 				);
 			});
-			if (!mPropertyBag.changeInstance) {
-				aResult = aResult.map(function(oChange) {
-					return oChange.getDefinition();
-				});
-			}
 		}
 		return aResult;
 	};
@@ -235,7 +236,7 @@ sap.ui.define([
 	 * Returns the current variant reference for a given variant management reference.
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
-	 * @param {String} mPropertyBag.vmReference - Variant management reference
+	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @returns {string} Reference of the current variant
 	 */
@@ -368,7 +369,7 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	VariantManagementState.addChangeToVariant = function(mPropertyBag) {
-		var aExistingChanges = VariantManagementState.getControlChangesForVariant(Object.assign(mPropertyBag, {changeInstance: true}));
+		var aExistingChanges = VariantManagementState.getControlChangesForVariant(mPropertyBag);
 		var aChangeFileNames = aExistingChanges.map(function(oChange) {
 			return oChange.getDefinition().fileName;
 		});
@@ -395,7 +396,7 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	VariantManagementState.removeChangeFromVariant = function(mPropertyBag) {
-		var aControlChanges = VariantManagementState.getControlChangesForVariant(Object.assign(mPropertyBag, {changeInstance: true}));
+		var aControlChanges = VariantManagementState.getControlChangesForVariant(mPropertyBag);
 		var oVariant = VariantManagementState.getVariant(mPropertyBag);
 		var bChangeFound = false;
 
@@ -420,7 +421,6 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Object with the necessary properties
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @param {string} [mPropertyBag.vmReference] - Variant management reference
-	 * @param {boolean} [mPropertyBag.changeInstance] <code>true</code> if each change has to be an instance of <code>sap.ui.fl.Change</code>
 	 *
 	 * @returns {Array} All changes of current or default variants
 	 * @private
@@ -569,6 +569,9 @@ sap.ui.define([
 					break;
 				default:
 			}
+			if (mUpdateStateListeners[mPropertyBag.reference]) {
+				mUpdateStateListeners[mPropertyBag.reference]();
+			}
 		}
 	};
 
@@ -585,8 +588,7 @@ sap.ui.define([
 	VariantManagementState.waitForInitialVariantChanges = function(mPropertyBag) {
 		var aCurrentVariantChanges = VariantManagementState.getInitialChanges({
 			vmReference: mPropertyBag.vmReference,
-			reference: mPropertyBag.reference,
-			changeInstance: true
+			reference: mPropertyBag.reference
 		});
 		var aControls = aCurrentVariantChanges.reduce(function(aCurrentControls, oChange) {
 			var oSelector = oChange.getSelector();

package/src/sap/ui/fl/{PreprocessorImpl.js → apply/_internal/preprocessors/ControllerExtension.js}

@@ -19,28 +19,48 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	function isCodeExt(oChange) {
-		return oChange.getChangeType() === "codeExt";
-	}
-
-	function isForController (sControllerName, oChange) {
-		var sSelectorControllerName = oChange.getSelector().controllerName;
-		return sControllerName === sSelectorControllerName;
-	}
-
 	/**
-	 * The implementation of the <code>Preprocessor</code> for the SAPUI5 flexibility services that can be hooked in the <code>View</code> life cycle.
+	 * Provides the Controller Extensions to the ControllerExtensionProvider from the core
 	 *
-	 * @name sap.ui.fl.PreprocessorImpl
+	 * @name sap.ui.fl.apply._internal.preprocessors.ControllerExtension
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core
 	 */
-	var PreprocessorImpl = function() {};
+	var ControllerExtension = function() {};
+
+	function isCodeExt(oChange) {
+		return oChange.getChangeType() === "codeExt";
+	}
+
+	function isForController(sControllerName, oChange) {
+		var sSelectorControllerName = oChange.getSelector().controllerName;
+		return sControllerName === sSelectorControllerName;
+	}
+
+	function getExtensionModules(aCodeExtModuleNames) {
+		if (aCodeExtModuleNames.length === 0) {
+			return Promise.resolve([]);
+		}
+
+		return new Promise(function(resolve) {
+			sap.ui.require(
+				aCodeExtModuleNames,
+				function() {
+					// arguments are not a real array. This creates one for further processing
+					resolve(Array.prototype.slice.call(arguments));
+				},
+				function(oError) {
+					Log.error("Code Extension not found", oError.message);
+					resolve([]);
+				}
+			);
+		});
+	}
 
 	/**
 	 * Provides an array of extension providers. An extension provider is an object which were defined as controller extensions. These objects
@@ -51,9 +71,8 @@ sap.ui.define([
 	 * @param {boolean} bAsync - Flag whether <code>Promise</code> should be returned or not (async=true)
 	 * @returns {Promise|Array} An empty array in case of a sync processing or a Promise with all successful loaded controller extensions
 	 * @see sap.ui.core.mvc.Controller for an overview of the available functions on controllers.
-	 * @since 1.34.0
 	 */
-	PreprocessorImpl.prototype.getControllerExtensions = function(sControllerName, sComponentId, bAsync) {
+	ControllerExtension.prototype.getControllerExtensions = function(sControllerName, sComponentId, bAsync) {
 		if (bAsync) {
 			if (!sComponentId) {
 				Log.warning("No component ID for determining the anchor of the code extensions was passed.");
@@ -82,41 +101,13 @@ sap.ui.define([
 					return oChange.getModuleName();
 				});
 
-				return PreprocessorImpl.getExtensionModules(aExtensionModules);
+				return getExtensionModules(aExtensionModules);
 			});
 		}
 
-		Log.warning("Synchronous extensions are not supported by sap.ui.fl.PreprocessorImpl");
+		Log.warning("Synchronous extensions are not supported via UI5 Flexibility");
 		return [];
 	};
 
-	/**
-	 * Asynchronous loading of all passed controller extensions.
-	 *
-	 * @param {Array} aCodeExtModuleNames - Names of all controller extensions which have to be requested
-	 * @returns {Promise} Promise resolved with an array with all successful loaded controller extensions
-	 * @since 1.60.0
-	 */
-	PreprocessorImpl.getExtensionModules = function(aCodeExtModuleNames) {
-		if (aCodeExtModuleNames.length === 0) {
-			return Promise.resolve([]);
-		}
-
-		return new Promise(function(resolve) {
-			sap.ui.require(
-				aCodeExtModuleNames,
-				function() {
-					// arguments are not a real array. This creates one for further processing
-					var aModules = Array.prototype.slice.call(arguments);
-					resolve(aModules);
-				},
-				function(oError) {
-					Log.error("Code Extension not found", oError.message);
-					resolve([]);
-				}
-			);
-		});
-	};
-
-	return PreprocessorImpl;
-}, /* bExport= */true);
+	return ControllerExtension;
+});

package/src/sap/ui/fl/{EventHistory.js → apply/_internal/preprocessors/EventHistory.js}

@@ -4,20 +4,20 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(function () {
+sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	"use strict";
 
 	/**
 	 * Provides a history of events. This is needed to show/hide the personalization icon
 	 *
 	 * @namespace
-	 * @alias sap.ui.fl.EventHistory
+	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
-	 * @ui5-restricted sap.ui.fl.RegistrationDelegator
+	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator
 	 */
 	var EventHistory = function () {
 	};
@@ -36,7 +36,7 @@ sap.ui.define(function () {
 	EventHistory.start = function () {
 		EventHistory._aEventIds.forEach(function(sEventId) {
 			if (EventHistory._aUnsubscribedEventIds.indexOf(sEventId) === -1) {
-				sap.ui.getCore().getEventBus().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
+				oCore.getEventBus().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
 				EventHistory._oHistory[sEventId] = [];
 			}
 		});
@@ -76,7 +76,7 @@ sap.ui.define(function () {
 	 * @return {array} List of events
 	 */
 	EventHistory.getHistoryAndStop = function (sEventId) {
-		sap.ui.getCore().getEventBus().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
+		oCore.getEventBus().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
 		EventHistory._addUnsubscribedEvent(sEventId);
 		return EventHistory._oHistory[sEventId] || [];
 	};
@@ -88,4 +88,4 @@ sap.ui.define(function () {
 	};
 
 	return EventHistory;
-}, /* bExport= */true);
+});