@sapui5/sap.fe.core 1.98.0 → 1.99.0

package/src/sap/fe/core/services/CacheHandlerServiceFactory.ts

@@ -0,0 +1,212 @@
+import Service from "sap/ui/core/service/Service";
+import ServiceFactory from "sap/ui/core/service/ServiceFactory";
+import CacheManager from "sap/ui/core/cache/CacheManager";
+import hash from "sap/base/strings/hash";
+import { ServiceContext } from "sap/ui/core/service";
+import jQuery from "sap/ui/thirdparty/jquery";
+import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import { AppComponent } from "sap/fe/core";
+import UIComponent from "sap/ui/core/UIComponent";
+
+function getMetadataETag(sUrl: any, sETag: any, mUpdatedMetaModelETags: any) {
+	return new Promise(function(resolve) {
+		// There is an Url in the FE cache, that's not in the MetaModel yet -> we need to check the ETag
+		(jQuery as any)
+			.ajax(sUrl, { method: "GET" })
+			.done(function(oResponse: any, sTextStatus: any, jqXHR: any) {
+				// ETag is not the same -> invalid
+				// ETag is the same -> valid
+				// If ETag is available use it, otherwise use Last-Modified
+				mUpdatedMetaModelETags[sUrl] = jqXHR.getResponseHeader("ETag") || jqXHR.getResponseHeader("Last-Modified");
+				resolve(sETag === mUpdatedMetaModelETags[sUrl]);
+			})
+			.fail(function() {
+				// Case 2z - Make sure we update the map so that we invalidate the cache
+				mUpdatedMetaModelETags[sUrl] = "";
+				resolve(false);
+			});
+	});
+}
+type CacheHandlerServiceSettings = {
+	metaModel: ODataMetaModel;
+};
+
+export class CacheHandlerService extends Service<CacheHandlerServiceSettings> {
+	resolveFn: any;
+	rejectFn: any;
+	initPromise!: Promise<any>;
+
+	oFactory!: CacheHandlerServiceFactory;
+	oMetaModel!: ODataMetaModel;
+	oAppComponent: AppComponent;
+	oComponent!: UIComponent;
+	mCacheNeedsInvalidate: any;
+
+	init() {
+		const oContext = this.getContext();
+		this.oFactory = oContext.factory;
+		const mSettings = oContext.settings;
+		if (!mSettings.metaModel) {
+			throw new Error("a `metaModel` property is expected when instantiating the CacheHandlerService");
+		}
+		this.oMetaModel = mSettings.metaModel;
+		this.oAppComponent = mSettings.appComponent;
+		this.oComponent = mSettings.component;
+		this.initPromise = this.oMetaModel.fetchEntityContainer().then(() => {
+			return this;
+		});
+		this.mCacheNeedsInvalidate = {};
+	}
+	exit() {
+		// Deregister global instance
+		this.oFactory.removeGlobalInstance(this.oMetaModel);
+	}
+	validateCacheKey(sCacheIdentifier: any): Promise<string> {
+		// Keep track if the cache will anyway need to be updated
+		let bCacheNeedUpdate = true;
+		return CacheManager.get(sCacheIdentifier)
+			.then((mCacheOutput: any) => {
+				// We provide a default key so that an xml view cache is written
+				const mMetaModelETags = this.getETags();
+				let sUpdatedCacheKey: string | null = JSON.stringify(mMetaModelETags);
+				// Case #1a - No cache, so mCacheOuput is empty, cacheKey = current metamodel ETags
+				if (mCacheOutput) {
+					// Case #2 - Cache entry found, check if it's still valid
+					const mUpdatedMetaModelETags: any = {};
+					const mCachedETags = JSON.parse(mCacheOutput.cachedETags);
+					return Promise.all(
+						Object.keys(mCachedETags).map(function(sUrl: string) {
+							// Check validity of every single Url that's in the FE Cache object
+							if (mCachedETags[sUrl]) {
+								if (mMetaModelETags[sUrl]) {
+									// Case #2a - Same number of ETags in the cache and in the metadata
+									mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
+									return mCachedETags[sUrl] === mMetaModelETags[sUrl];
+								} else {
+									// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced
+									return getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);
+								}
+							} else {
+								// Case #2z - Last Templating added an URL without ETag
+								mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
+								return mCachedETags[sUrl] === mMetaModelETags[sUrl];
+							}
+						})
+					).then(function(aValidETags: any[]) {
+						bCacheNeedUpdate = aValidETags.indexOf(false) >= 0;
+						// Case #2a - Same number of ETags and all valid -> we return the viewCacheKey
+						// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey
+						// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key
+						// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey
+						// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey
+						if (
+							Object.keys(mUpdatedMetaModelETags).some(function(sUrl: string) {
+								return !mUpdatedMetaModelETags[sUrl];
+							})
+						) {
+							// At least one of the MetaModel URLs doesn't provide an ETag, so no caching
+							return null;
+						} else {
+							return bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;
+						}
+					});
+				} else if (
+					Object.keys(mMetaModelETags).some(function(sUrl: string) {
+						return !mMetaModelETags[sUrl];
+					})
+				) {
+					// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)
+					// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching
+					bCacheNeedUpdate = true;
+					sUpdatedCacheKey = null;
+				}
+				return sUpdatedCacheKey;
+			})
+			.catch(() => {
+				// Don't use view cache in case of issues with the LRU cache
+				bCacheNeedUpdate = true;
+				return null;
+			})
+			.then((sCacheKey: any) => {
+				this.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;
+				return sCacheKey;
+			});
+	}
+	invalidateIfNeeded(sCacheKeys: string, sCacheIdentifier: string) {
+		// Check FE cache after XML view is processed completely
+		const sDataSourceETags = JSON.stringify(this.getETags());
+		if (this.mCacheNeedsInvalidate[sCacheIdentifier] || (sCacheKeys && sCacheKeys !== sDataSourceETags)) {
+			// Something in the sources and/or its ETags changed -> update the FE cache
+			const mCacheKeys: any = {};
+			// New ETags that need to be verified, may differ from the one used to generate the view
+			mCacheKeys.cachedETags = sDataSourceETags;
+			// Old ETags that are used for the xml view cache as key
+			mCacheKeys.viewCacheKey = sCacheKeys;
+			return CacheManager.set(sCacheIdentifier, mCacheKeys);
+		} else {
+			return Promise.resolve();
+		}
+	}
+	getETags() {
+		const mMetaModelETags = (this.oMetaModel as any).getETags();
+		// ETags from UI5 are either a Date or a string, let's rationalize that
+		Object.keys(mMetaModelETags).forEach(function(sMetaModelKey: string) {
+			if (mMetaModelETags[sMetaModelKey] instanceof Date) {
+				// MetaModel contains a Last-Modified timestamp for the URL
+				mMetaModelETags[sMetaModelKey] = mMetaModelETags[sMetaModelKey].toISOString();
+			}
+		});
+
+		// add also the manifest hash as UI5 only considers the root component hash
+		const oManifestContent = this.oAppComponent.getManifest();
+		const sManifestHash = hash(
+			JSON.stringify({
+				sapApp: oManifestContent["sap.app"],
+				viewData: (this.oComponent as any).getViewData()
+			})
+		);
+		mMetaModelETags["manifest"] = sManifestHash;
+		return mMetaModelETags;
+	}
+	getInterface(): any {
+		return this;
+	}
+}
+
+class CacheHandlerServiceFactory extends ServiceFactory<CacheHandlerServiceSettings> {
+	_oInstanceRegistry: Record<string, CacheHandlerService | null> = {};
+	createInstance(oServiceContext: ServiceContext<CacheHandlerServiceSettings>) {
+		const sMetaModelId = oServiceContext.settings.metaModel.getId();
+		let cacheHandlerInstance = this._oInstanceRegistry[sMetaModelId];
+		if (!cacheHandlerInstance) {
+			this._oInstanceRegistry[sMetaModelId] = cacheHandlerInstance = new CacheHandlerService(
+				Object.assign(
+					{
+						factory: this,
+						scopeObject: null,
+						scopeType: "service"
+					},
+					oServiceContext
+				)
+			);
+		}
+
+		return cacheHandlerInstance.initPromise
+			.then(() => {
+				return this._oInstanceRegistry[sMetaModelId] as CacheHandlerService;
+			})
+			.catch((e: any) => {
+				// In case of error delete the global instance;
+				this._oInstanceRegistry[sMetaModelId] = null;
+				throw e;
+			});
+	}
+	getInstance(oMetaModel: ODataMetaModel) {
+		return this._oInstanceRegistry[oMetaModel.getId()];
+	}
+	removeGlobalInstance(oMetaModel: ODataMetaModel) {
+		this._oInstanceRegistry[oMetaModel.getId()] = null;
+	}
+}
+
+export default CacheHandlerServiceFactory;

package/src/sap/fe/core/services/EnvironmentServiceFactory.js

@@ -126,4 +126,4 @@ sap.ui.define(["sap/ui/core/service/ServiceFactory", "sap/ui/core/service/Servic
 
   return EnvironmentServiceFactory;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudmlyb25tZW50U2VydmljZUZhY3RvcnkudHMiXSwibmFtZXMiOlsiRW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlIiwiaW5pdFByb21pc2UiLCJQcm9taXNlIiwicmVzb2x2ZSIsInJlamVjdCIsInJlc29sdmVGbiIsInJlamVjdEZuIiwib0NvbnRleHQiLCJnZXRDb250ZXh0IiwiZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMiLCJPYmplY3QiLCJhc3NpZ24iLCJEZWZhdWx0RW52aXJvbm1lbnRDYXBhYmlsaXRpZXMiLCJWZXJzaW9uSW5mbyIsImxvYWQiLCJ1bmRlZmluZWQiLCJ0aGVuIiwidmVyc2lvbkluZm8iLCJDaGFydCIsImxpYnJhcmllcyIsImZpbmQiLCJsaWIiLCJuYW1lIiwiTWljcm9DaGFydCIsIlVTaGVsbCIsInNhcCIsInVzaGVsbCIsIkNvbnRhaW5lciIsIkludGVudEJhc2VkTmF2aWdhdGlvbiIsIlNpdHVhdGlvbnMiLCJVcmlQYXJhbWV0ZXJzIiwiZnJvbVF1ZXJ5Iiwid2luZG93IiwibG9jYXRpb24iLCJzZWFyY2giLCJnZXQiLCJzZXR0aW5ncyIsImNhdGNoIiwibGlicmFyeU5hbWUiLCJ1aSIsImdldENvcmUiLCJsb2FkTGlicmFyeSIsInJlcGxhY2UiLCJhc3luYyIsImUiLCJvQ2FwYWJpbGl0aWVzIiwiU2VydmljZSIsIkVudmlyb25tZW50U2VydmljZUZhY3RvcnkiLCJvU2VydmljZUNvbnRleHQiLCJlbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UiLCJTZXJ2aWNlRmFjdG9yeSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7TUFHTUEsOEI7Ozs7Ozs7Ozs7Ozs7YUFLTDtBQUVBLHNCQUFPO0FBQUE7O0FBQ04sYUFBS0MsV0FBTCxHQUFtQixJQUFJQyxPQUFKLENBQVksVUFBQ0MsT0FBRCxFQUFVQyxNQUFWLEVBQXFCO0FBQ25ELFVBQUEsS0FBSSxDQUFDQyxT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eUU7QUFDeEUsWUFBTUMsOEJBQThCLEdBQUcsSUFBSWpELDhCQUFKLENBQW1DZ0QsZUFBbkMsQ0FBdkM7QUFDQSxlQUFPQyw4QkFBOEIsQ0FBQ2hELFdBQXRDO0FBQ0E7Ozs7SUFKc0NpRCxjOztTQU96QkgseUIiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNlcnZpY2VGYWN0b3J5LCBTZXJ2aWNlLCBTZXJ2aWNlQ29udGV4dCB9IGZyb20gXCJzYXAvdWkvY29yZS9zZXJ2aWNlXCI7XG5pbXBvcnQgeyBEZWZhdWx0RW52aXJvbm1lbnRDYXBhYmlsaXRpZXMsIEVudmlyb25tZW50Q2FwYWJpbGl0aWVzIH0gZnJvbSBcIi4uL2NvbnZlcnRlcnMvTWV0YU1vZGVsQ29udmVydGVyXCI7XG5pbXBvcnQgeyBWZXJzaW9uSW5mbyB9IGZyb20gXCJzYXAvdWlcIjtcbmltcG9ydCB7IFVyaVBhcmFtZXRlcnMgfSBmcm9tIFwic2FwL2Jhc2UvdXRpbFwiO1xuXG5jbGFzcyBFbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UgZXh0ZW5kcyBTZXJ2aWNlPEVudmlyb25tZW50Q2FwYWJpbGl0aWVzPiB7XG5cdHJlc29sdmVGbjogYW55O1xuXHRyZWplY3RGbjogYW55O1xuXHRpbml0UHJvbWlzZSE6IFByb21pc2U8YW55Pjtcblx0ZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMhOiBFbnZpcm9ubWVudENhcGFiaWxpdGllcztcblx0Ly8gITogbWVhbnMgdGhhdCB3ZSBrbm93IGl0IHdpbGwgYmUgYXNzaWduZWQgYmVmb3JlIHVzYWdlXG5cblx0aW5pdCgpIHtcblx0XHR0aGlzLmluaXRQcm9taXNlID0gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4ge1xuXHRcdFx0dGhpcy5yZXNvbHZlRm4gPSByZXNvbHZlO1xuXHRcdFx0dGhpcy5yZWplY3RGbiA9IHJlamVjdDtcblx0XHR9KTtcblx0XHRjb25zdCBvQ29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpO1xuXHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMgPSBPYmplY3QuYXNzaWduKHt9LCBEZWZhdWx0RW52aXJvbm1lbnRDYXBhYmlsaXRpZXMpO1xuXHRcdFZlcnNpb25JbmZvLmxvYWQodW5kZWZpbmVkIGFzIGFueSlcblx0XHRcdC50aGVuKHZlcnNpb25JbmZvID0+IHtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5DaGFydCA9ICEhdmVyc2lvbkluZm8ubGlicmFyaWVzLmZpbmQoKGxpYjogYW55KSA9PiBsaWIubmFtZSA9PT0gXCJzYXAudml6XCIpO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLk1pY3JvQ2hhcnQgPSAhIXZlcnNpb25JbmZvLmxpYnJhcmllcy5maW5kKFxuXHRcdFx0XHRcdChsaWI6IGFueSkgPT4gbGliLm5hbWUgPT09IFwic2FwLnN1aXRlLnVpLm1pY3JvY2hhcnRcIlxuXHRcdFx0XHQpO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLlVTaGVsbCA9ICEhKHNhcCAmJiBzYXAudXNoZWxsICYmIHNhcC51c2hlbGwuQ29udGFpbmVyKTtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5JbnRlbnRCYXNlZE5hdmlnYXRpb24gPSAhIShzYXAgJiYgc2FwLnVzaGVsbCAmJiBzYXAudXNoZWxsLkNvbnRhaW5lcik7XG5cdFx0XHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMuU2l0dWF0aW9ucyA9XG5cdFx0XHRcdFx0VXJpUGFyYW1ldGVycy5mcm9tUXVlcnkod2luZG93LmxvY2F0aW9uLnNlYXJjaCkuZ2V0KFwic2FwLWZlLXh4LXNpdHVhdGlvbnNcIikgPT09IFwidHJ1ZVwiO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzID0gT2JqZWN0LmFzc2lnbih0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLCBvQ29udGV4dC5zZXR0aW5ncyk7XG5cdFx0XHRcdHRoaXMucmVzb2x2ZUZuKHRoaXMpO1xuXHRcdFx0fSlcblx0XHRcdC5jYXRjaCh0aGlzLnJlamVjdEZuKTtcblx0fVxuXG5cdHJlc29sdmVMaWJyYXJ5KGxpYnJhcnlOYW1lOiBzdHJpbmcpOiBQcm9taXNlPGJvb2xlYW4+IHtcblx0XHRyZXR1cm4gbmV3IFByb21pc2UoZnVuY3Rpb24ocmVzb2x2ZSkge1xuXHRcdFx0dHJ5IHtcblx0XHRcdFx0c2FwLnVpXG5cdFx0XHRcdFx0LmdldENvcmUoKVxuXHRcdFx0XHRcdC5sb2FkTGlicmFyeShgJHtsaWJyYXJ5TmFtZS5yZXBsYWNlKC9cXC4vZywgXCIvXCIpfWAsIHsgYXN5bmM6IHRydWUgfSlcblx0XHRcdFx0XHQudGhlbihmdW5jdGlvbigpIHtcblx0XHRcdFx0XHRcdHJlc29sdmUodHJ1ZSk7XG5cdFx0XHRcdFx0fSlcblx0XHRcdFx0XHQuY2F0Y2goZnVuY3Rpb24oKSB7XG5cdFx0XHRcdFx0XHRyZXNvbHZlKGZhbHNlKTtcblx0XHRcdFx0XHR9KTtcblx0XHRcdH0gY2F0Y2ggKGUpIHtcblx0XHRcdFx0cmVzb2x2ZShmYWxzZSk7XG5cdFx0XHR9XG5cdFx0fSk7XG5cdH1cblxuXHRwdWJsaWMgc2V0Q2FwYWJpbGl0aWVzKG9DYXBhYmlsaXRpZXM6IEVudmlyb25tZW50Q2FwYWJpbGl0aWVzKSB7XG5cdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcyA9IG9DYXBhYmlsaXRpZXM7XG5cdH1cblxuXHRwdWJsaWMgZ2V0Q2FwYWJpbGl0aWVzKCkge1xuXHRcdHJldHVybiB0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzO1xuXHR9XG5cblx0Z2V0SW50ZXJmYWNlKCk6IGFueSB7XG5cdFx0cmV0dXJuIHRoaXM7XG5cdH1cbn1cblxuY2xhc3MgRW52aXJvbm1lbnRTZXJ2aWNlRmFjdG9yeSBleHRlbmRzIFNlcnZpY2VGYWN0b3J5PEVudmlyb25tZW50Q2FwYWJpbGl0aWVzPiB7XG5cdGNyZWF0ZUluc3RhbmNlKG9TZXJ2aWNlQ29udGV4dDogU2VydmljZUNvbnRleHQ8RW52aXJvbm1lbnRDYXBhYmlsaXRpZXM+KSB7XG5cdFx0Y29uc3QgZW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlID0gbmV3IEVudmlyb25tZW50Q2FwYWJpbGl0aWVzU2VydmljZShvU2VydmljZUNvbnRleHQpO1xuXHRcdHJldHVybiBlbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UuaW5pdFByb21pc2U7XG5cdH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgRW52aXJvbm1lbnRTZXJ2aWNlRmFjdG9yeTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudmlyb25tZW50U2VydmljZUZhY3RvcnkudHMiXSwibmFtZXMiOlsiRW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlIiwiaW5pdFByb21pc2UiLCJQcm9taXNlIiwicmVzb2x2ZSIsInJlamVjdCIsInJlc29sdmVGbiIsInJlamVjdEZuIiwib0NvbnRleHQiLCJnZXRDb250ZXh0IiwiZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMiLCJPYmplY3QiLCJhc3NpZ24iLCJEZWZhdWx0RW52aXJvbm1lbnRDYXBhYmlsaXRpZXMiLCJWZXJzaW9uSW5mbyIsImxvYWQiLCJ1bmRlZmluZWQiLCJ0aGVuIiwidmVyc2lvbkluZm8iLCJDaGFydCIsImxpYnJhcmllcyIsImZpbmQiLCJsaWIiLCJuYW1lIiwiTWljcm9DaGFydCIsIlVTaGVsbCIsInNhcCIsInVzaGVsbCIsIkNvbnRhaW5lciIsIkludGVudEJhc2VkTmF2aWdhdGlvbiIsIlNpdHVhdGlvbnMiLCJVcmlQYXJhbWV0ZXJzIiwiZnJvbVF1ZXJ5Iiwid2luZG93IiwibG9jYXRpb24iLCJzZWFyY2giLCJnZXQiLCJzZXR0aW5ncyIsImNhdGNoIiwibGlicmFyeU5hbWUiLCJ1aSIsImdldENvcmUiLCJsb2FkTGlicmFyeSIsInJlcGxhY2UiLCJhc3luYyIsImUiLCJvQ2FwYWJpbGl0aWVzIiwiU2VydmljZSIsIkVudmlyb25tZW50U2VydmljZUZhY3RvcnkiLCJvU2VydmljZUNvbnRleHQiLCJlbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UiLCJTZXJ2aWNlRmFjdG9yeSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7TUFNTUEsOEI7Ozs7Ozs7Ozs7Ozs7YUFLTDtBQUVBLHNCQUFPO0FBQUE7O0FBQ04sYUFBS0MsV0FBTCxHQUFtQixJQUFJQyxPQUFKLENBQVksVUFBQ0MsT0FBRCxFQUFVQyxNQUFWLEVBQXFCO0FBQ25ELFVBQUEsS0FBSSxDQUFDQyxTQUFMLEdBQWlCRixPQUFqQjtBQUNBLFVBQUEsS0FBSSxDQUFDRyxRQUFMLEdBQWdCRixNQUFoQjtBQUNBLFNBSGtCLENBQW5CO0FBSUEsWUFBTUcsUUFBUSxHQUFHLEtBQUtDLFVBQUwsRUFBakI7QUFDQSxhQUFLQyx1QkFBTCxHQUErQkMsTUFBTSxDQUFDQyxNQUFQLENBQWMsRUFBZCxFQUFrQkMsOEJBQWxCLENBQS9CO0FBQ0FDLFFBQUFBLFdBQVcsQ0FBQ0MsSUFBWixDQUFpQkMsU0FBakIsRUFDRUMsSUFERixDQUNPLFVBQUFDLFdBQVcsRUFBSTtBQUNwQixVQUFBLEtBQUksQ0FBQ1IsdUJBQUwsQ0FBNkJTLEtBQTdCLEdBQXFDLENBQUMsQ0FBQ0QsV0FBVyxDQUFDRSxTQUFaLENBQXNCQyxJQUF0QixDQUEyQixVQUFDQyxHQUFEO0FBQUEsbUJBQWNBLEdBQUcsQ0FBQ0MsSUFBSixLQUFhLFNBQTNCO0FBQUEsV0FBM0IsQ0FBdkM7QUFDQSxVQUFBLEtBQUksQ0FBQ2IsdUJBQUwsQ0FBNkJjLFVBQTdCLEdBQTBDLENBQUMsQ0FBQ04sV0FBVyxDQUFDRSxTQUFaLENBQXNCQyxJQUF0QixDQUMzQyxVQUFDQyxHQUFEO0FBQUEsbUJBQWNBLEdBQUcsQ0FBQ0MsSUFBSixLQUFhLHlCQUEzQjtBQUFBLFdBRDJDLENBQTVDO0FBR0EsVUFBQSxLQUFJLENBQUNiLHVCQUFMLENBQTZCZSxNQUE3QixHQUFzQyxDQUFDLEVBQUVDLEdBQUcsSUFBSUEsR0FBRyxDQUFDQyxNQUFYLElBQXFCRCxHQUFHLENBQUNDLE1BQUosQ0FBV0MsU0FBbEMsQ0FBdkM7QUFDQSxVQUFBLEtBQUksQ0FBQ2xCLHVCQUFMLENBQTZCbUIscUJBQTdCLEdBQXFELENBQUMsRUFBRUgsR0FBRyxJQUFJQSxHQUFHLENBQUNDLE1BQVgsSUFBcUJELEdBQUcsQ0FBQ0MsTUFBSixDQUFXQyxTQUFsQyxDQUF0RDtBQUNBLFVBQUEsS0FBSSxDQUFDbEIsdUJBQUwsQ0FBNkJvQixVQUE3QixHQUNDQyxhQUFhLENBQUNDLFNBQWQsQ0FBd0JDLE1BQU0sQ0FBQ0MsUUFBUCxDQUFnQkMsTUFBeEMsRUFBZ0RDLEdBQWhELENBQW9ELHNCQUFwRCxNQUFnRixNQURqRjtBQUVBLFVBQUEsS0FBSSxDQUFDMUIsdUJBQUwsR0FBK0JDLE1BQU0sQ0FBQ0MsTUFBUCxDQUFjLEtBQUksQ0FBQ0YsdUJBQW5CLEVBQTRDRixRQUFRLENBQUM2QixRQUFyRCxDQUEvQjs7QUFDQSxVQUFBLEtBQUksQ0FBQy9CLFNBQUwsQ0FBZSxLQUFmO0FBQ0EsU0FaRixFQWFFZ0MsS0FiRixDQWFRLEtBQUsvQixRQWJiO0FBY0E7OzthQUVELHdCQUFlZ0MsV0FBZixFQUFzRDtBQUNyRCxlQUFPLElBQUlwQyxPQUFKLENBQVksVUFBU0MsT0FBVCxFQUFrQjtBQUNwQyxjQUFJO0FBQ0ZzQixZQUFBQSxHQUFHLENBQUNjLEVBQUosQ0FBT0MsT0FBUCxHQUFpQkMsV0FBakIsV0FBZ0NILFdBQVcsQ0FBQ0ksT0FBWixDQUFvQixLQUFwQixFQUEyQixHQUEzQixDQUFoQyxHQUFtRTtBQUFFQyxjQUFBQSxLQUFLLEVBQUU7QUFBVCxhQUFuRSxDQUFELENBQ0UzQixJQURGLENBQ08sWUFBVztBQUNoQmIsY0FBQUEsT0FBTyxDQUFDLElBQUQsQ0FBUDtBQUNBLGFBSEYsRUFJRWtDLEtBSkYsQ0FJUSxZQUFXO0FBQ2pCbEMsY0FBQUEsT0FBTyxDQUFDLEtBQUQsQ0FBUDtBQUNBLGFBTkY7QUFPQSxXQVJELENBUUUsT0FBT3lDLENBQVAsRUFBVTtBQUNYekMsWUFBQUEsT0FBTyxDQUFDLEtBQUQsQ0FBUDtBQUNBO0FBQ0QsU0FaTSxDQUFQO0FBYUE7OzthQUVELHlCQUF1QjBDLGFBQXZCLEVBQStEO0FBQzlELGFBQUtwQyx1QkFBTCxHQUErQm9DLGFBQS9CO0FBQ0E7OzthQUVELDJCQUF5QjtBQUN4QixlQUFPLEtBQUtwQyx1QkFBWjtBQUNBOzs7YUFFRCx3QkFBb0I7QUFDbkIsZUFBTyxJQUFQO0FBQ0E7Ozs7SUF4RDJDcUMsTzs7TUEyRHZDQyx5Qjs7Ozs7Ozs7Ozs7OzthQUNMLHdCQUFlQyxlQUFmLEVBQXlFO0FBQ3hFLFlBQU1DLDhCQUE4QixHQUFHLElBQUlqRCw4QkFBSixDQUFtQ2dELGVBQW5DLENBQXZDO0FBQ0EsZUFBT0MsOEJBQThCLENBQUNoRCxXQUF0QztBQUNBOzs7O0lBSnNDaUQsYzs7U0FPekJILHlCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgU2VydmljZUZhY3RvcnkgZnJvbSBcInNhcC91aS9jb3JlL3NlcnZpY2UvU2VydmljZUZhY3RvcnlcIjtcbmltcG9ydCBTZXJ2aWNlIGZyb20gXCJzYXAvdWkvY29yZS9zZXJ2aWNlL1NlcnZpY2VcIjtcbmltcG9ydCB7IFNlcnZpY2VDb250ZXh0IH0gZnJvbSBcInNhcC91aS9jb3JlL3NlcnZpY2VcIjtcblxuaW1wb3J0IHsgRGVmYXVsdEVudmlyb25tZW50Q2FwYWJpbGl0aWVzLCBFbnZpcm9ubWVudENhcGFiaWxpdGllcyB9IGZyb20gXCIuLi9jb252ZXJ0ZXJzL01ldGFNb2RlbENvbnZlcnRlclwiO1xuaW1wb3J0IFZlcnNpb25JbmZvIGZyb20gXCJzYXAvdWkvVmVyc2lvbkluZm9cIjtcbmltcG9ydCBVcmlQYXJhbWV0ZXJzIGZyb20gXCJzYXAvYmFzZS91dGlsL1VyaVBhcmFtZXRlcnNcIjtcblxuY2xhc3MgRW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlIGV4dGVuZHMgU2VydmljZTxFbnZpcm9ubWVudENhcGFiaWxpdGllcz4ge1xuXHRyZXNvbHZlRm46IGFueTtcblx0cmVqZWN0Rm46IGFueTtcblx0aW5pdFByb21pc2UhOiBQcm9taXNlPGFueT47XG5cdGVudmlyb25tZW50Q2FwYWJpbGl0aWVzITogRW52aXJvbm1lbnRDYXBhYmlsaXRpZXM7XG5cdC8vICE6IG1lYW5zIHRoYXQgd2Uga25vdyBpdCB3aWxsIGJlIGFzc2lnbmVkIGJlZm9yZSB1c2FnZVxuXG5cdGluaXQoKSB7XG5cdFx0dGhpcy5pbml0UHJvbWlzZSA9IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHtcblx0XHRcdHRoaXMucmVzb2x2ZUZuID0gcmVzb2x2ZTtcblx0XHRcdHRoaXMucmVqZWN0Rm4gPSByZWplY3Q7XG5cdFx0fSk7XG5cdFx0Y29uc3Qgb0NvbnRleHQgPSB0aGlzLmdldENvbnRleHQoKTtcblx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzID0gT2JqZWN0LmFzc2lnbih7fSwgRGVmYXVsdEVudmlyb25tZW50Q2FwYWJpbGl0aWVzKTtcblx0XHRWZXJzaW9uSW5mby5sb2FkKHVuZGVmaW5lZCBhcyBhbnkpXG5cdFx0XHQudGhlbih2ZXJzaW9uSW5mbyA9PiB7XG5cdFx0XHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMuQ2hhcnQgPSAhIXZlcnNpb25JbmZvLmxpYnJhcmllcy5maW5kKChsaWI6IGFueSkgPT4gbGliLm5hbWUgPT09IFwic2FwLnZpelwiKTtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5NaWNyb0NoYXJ0ID0gISF2ZXJzaW9uSW5mby5saWJyYXJpZXMuZmluZChcblx0XHRcdFx0XHQobGliOiBhbnkpID0+IGxpYi5uYW1lID09PSBcInNhcC5zdWl0ZS51aS5taWNyb2NoYXJ0XCJcblx0XHRcdFx0KTtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5VU2hlbGwgPSAhIShzYXAgJiYgc2FwLnVzaGVsbCAmJiBzYXAudXNoZWxsLkNvbnRhaW5lcik7XG5cdFx0XHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMuSW50ZW50QmFzZWROYXZpZ2F0aW9uID0gISEoc2FwICYmIHNhcC51c2hlbGwgJiYgc2FwLnVzaGVsbC5Db250YWluZXIpO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLlNpdHVhdGlvbnMgPVxuXHRcdFx0XHRcdFVyaVBhcmFtZXRlcnMuZnJvbVF1ZXJ5KHdpbmRvdy5sb2NhdGlvbi5zZWFyY2gpLmdldChcInNhcC1mZS14eC1zaXR1YXRpb25zXCIpID09PSBcInRydWVcIjtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcyA9IE9iamVjdC5hc3NpZ24odGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcywgb0NvbnRleHQuc2V0dGluZ3MpO1xuXHRcdFx0XHR0aGlzLnJlc29sdmVGbih0aGlzKTtcblx0XHRcdH0pXG5cdFx0XHQuY2F0Y2godGhpcy5yZWplY3RGbik7XG5cdH1cblxuXHRyZXNvbHZlTGlicmFyeShsaWJyYXJ5TmFtZTogc3RyaW5nKTogUHJvbWlzZTxib29sZWFuPiB7XG5cdFx0cmV0dXJuIG5ldyBQcm9taXNlKGZ1bmN0aW9uKHJlc29sdmUpIHtcblx0XHRcdHRyeSB7XG5cdFx0XHRcdChzYXAudWkuZ2V0Q29yZSgpLmxvYWRMaWJyYXJ5KGAke2xpYnJhcnlOYW1lLnJlcGxhY2UoL1xcLi9nLCBcIi9cIil9YCwgeyBhc3luYzogdHJ1ZSB9KSBhcyBQcm9taXNlPG9iamVjdD4pXG5cdFx0XHRcdFx0LnRoZW4oZnVuY3Rpb24oKSB7XG5cdFx0XHRcdFx0XHRyZXNvbHZlKHRydWUpO1xuXHRcdFx0XHRcdH0pXG5cdFx0XHRcdFx0LmNhdGNoKGZ1bmN0aW9uKCkge1xuXHRcdFx0XHRcdFx0cmVzb2x2ZShmYWxzZSk7XG5cdFx0XHRcdFx0fSk7XG5cdFx0XHR9IGNhdGNoIChlKSB7XG5cdFx0XHRcdHJlc29sdmUoZmFsc2UpO1xuXHRcdFx0fVxuXHRcdH0pO1xuXHR9XG5cblx0cHVibGljIHNldENhcGFiaWxpdGllcyhvQ2FwYWJpbGl0aWVzOiBFbnZpcm9ubWVudENhcGFiaWxpdGllcykge1xuXHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMgPSBvQ2FwYWJpbGl0aWVzO1xuXHR9XG5cblx0cHVibGljIGdldENhcGFiaWxpdGllcygpIHtcblx0XHRyZXR1cm4gdGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcztcblx0fVxuXG5cdGdldEludGVyZmFjZSgpOiBhbnkge1xuXHRcdHJldHVybiB0aGlzO1xuXHR9XG59XG5cbmNsYXNzIEVudmlyb25tZW50U2VydmljZUZhY3RvcnkgZXh0ZW5kcyBTZXJ2aWNlRmFjdG9yeTxFbnZpcm9ubWVudENhcGFiaWxpdGllcz4ge1xuXHRjcmVhdGVJbnN0YW5jZShvU2VydmljZUNvbnRleHQ6IFNlcnZpY2VDb250ZXh0PEVudmlyb25tZW50Q2FwYWJpbGl0aWVzPikge1xuXHRcdGNvbnN0IGVudmlyb25tZW50Q2FwYWJpbGl0aWVzU2VydmljZSA9IG5ldyBFbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2Uob1NlcnZpY2VDb250ZXh0KTtcblx0XHRyZXR1cm4gZW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlLmluaXRQcm9taXNlO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEVudmlyb25tZW50U2VydmljZUZhY3Rvcnk7XG4iXX0=

package/src/sap/fe/core/services/EnvironmentServiceFactory.ts

@@ -1,7 +1,10 @@
-import { ServiceFactory, Service, ServiceContext } from "sap/ui/core/service";
+import ServiceFactory from "sap/ui/core/service/ServiceFactory";
+import Service from "sap/ui/core/service/Service";
+import { ServiceContext } from "sap/ui/core/service";
+
 import { DefaultEnvironmentCapabilities, EnvironmentCapabilities } from "../converters/MetaModelConverter";
-import { VersionInfo } from "sap/ui";
-import { UriParameters } from "sap/base/util";
+import VersionInfo from "sap/ui/VersionInfo";
+import UriParameters from "sap/base/util/UriParameters";
 
 class EnvironmentCapabilitiesService extends Service<EnvironmentCapabilities> {
 	resolveFn: any;
@@ -36,9 +39,7 @@ class EnvironmentCapabilitiesService extends Service<EnvironmentCapabilities> {
 	resolveLibrary(libraryName: string): Promise<boolean> {
 		return new Promise(function(resolve) {
 			try {
-				sap.ui
-					.getCore()
-					.loadLibrary(`${libraryName.replace(/\./g, "/")}`, { async: true })
+				(sap.ui.getCore().loadLibrary(`${libraryName.replace(/\./g, "/")}`, { async: true }) as Promise<object>)
 					.then(function() {
 						resolve(true);
 					})