@sapui5/sap.fe.core 1.99.0 → 1.100.0

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

@@ -7,17 +7,17 @@ import Component from "sap/ui/core/Component";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import Log from "sap/base/Log";
 import TemplateModel from "sap/fe/core/TemplateModel";
-import DynamicAnnotationPathHelper from "sap/fe/core/helpers/DynamicAnnotationPathHelper";
 import CacheManager from "sap/ui/core/cache/CacheManager";
 import VersionInfo from "sap/ui/VersionInfo";
 import Device from "sap/ui/Device";
 import UriParameters from "sap/base/util/UriParameters";
 import { ServiceContext } from "sap/ui/core/service";
 import { ResourceModelService } from "./ResourceModelServiceFactory";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 import { CacheHandlerService } from "sap/fe/core/services/CacheHandlerServiceFactory";
-import { ResourceModel } from "sap/fe/macros";
+import ResourceModel from "sap/fe/macros/ResourceModel";
 import Model from "sap/ui/model/Model";
+import { resolveDynamicExpression } from "../helpers/DynamicAnnotationPathHelper";
 
 type TemplatedViewServiceSettings = {};
 
@@ -27,7 +27,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 	oResourceModelService!: ResourceModelService;
 	oCacheHandlerService!: CacheHandlerService;
 	oFactory!: TemplatedViewServiceFactory;
-	resourceModel!: ResourceModel;
+	resourceModel!: typeof ResourceModel;
 	stableId!: string;
 	TemplateConverter: any;
 	MetaModelConverter: any;
@@ -116,7 +116,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				})
 		);
 
-		let sPageModelCacheKey = "";
+		let sPageModelCacheKey: string | undefined;
 		this.initPromise = Promise.all(aServiceDependencies)
 			.then((aDependenciesResult: any[]) => {
 				const sCacheKey = aDependenciesResult[1];
@@ -126,7 +126,10 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 
 				oSideEffectsServices.initializeSideEffects(oAppComponent.getEnvironmentCapabilities().getCapabilities());
 
-				sPageModelCacheKey = sCacheKey + "-" + sVersionInfo + "-" + sStableId + "-" + oShellServices.instanceType + "-pageModel";
+				// In case there is no cache key we ignore the view cache
+				sPageModelCacheKey = sCacheKey
+					? sCacheKey + "-" + sVersionInfo + "-" + sStableId + "-" + oShellServices.instanceType + "-pageModel"
+					: undefined;
 				return Promise.all(aDependenciesResult.concat([this._getCachedModel(sPageModelCacheKey)]));
 			})
 			.then((aDependenciesResult: any[]) => {
@@ -157,8 +160,9 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				oCacheHandlerService.invalidateIfNeeded(sCacheKey, sCacheIdentifier);
 			});
 	}
-	_getCachedModel(sCacheKey: any) {
+	_getCachedModel(sCacheKey: string | undefined) {
 		if (
+			sCacheKey &&
 			sap.ui
 				.getCore()
 				.getConfiguration()
@@ -168,8 +172,9 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		}
 		return undefined;
 	}
-	_setCachedModel(sCacheKey: string, oCacheModel: any) {
+	_setCachedModel(sCacheKey: string | undefined, oCacheModel: any) {
 		if (
+			sCacheKey &&
 			sap.ui
 				.getCore()
 				.getConfiguration()
@@ -207,7 +212,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		oResourceModel: any,
 		sStableId: any,
 		sCacheKey: any,
-		sPageModelCacheKey: any,
+		sPageModelCacheKey: string | undefined,
 		oPageModelCache: any,
 		TemplateConverter: any,
 		MetaModelConverter: any
@@ -220,7 +225,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		const mServiceSettings = oContext.settings;
 		const sConverterType = mServiceSettings.converterType;
 		const oComponent = oContext.scopeObject;
-		const oAppComponent: AppComponent = Component.getOwnerComponentFor(oComponent);
+		const oAppComponent: AppComponent = Component.getOwnerComponentFor(oComponent) as AppComponent;
 		const sFullContextPath = oAppComponent.getRoutingService().getTargetInformationFor(oComponent).options.settings.fullContextPath;
 		const oMetaModel = oAppComponent.getMetaModel();
 		const oManifestContent: any = oAppComponent.getManifest();
@@ -355,7 +360,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				if (mViewData && mViewData.controlConfiguration) {
 					Object.keys(mViewData.controlConfiguration).forEach(function(sAnnotationPath: string) {
 						if (sAnnotationPath.indexOf("[") !== -1) {
-							const sTargetAnnotationPath = DynamicAnnotationPathHelper.resolveDynamicExpression(sAnnotationPath, oMetaModel);
+							const sTargetAnnotationPath = resolveDynamicExpression(sAnnotationPath, oMetaModel);
 							mViewData.controlConfiguration[sTargetAnnotationPath] = mViewData.controlConfiguration[sAnnotationPath];
 						}
 					});
@@ -384,8 +389,6 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 									"Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core"
 								);
 							}
-							// Fire and forget in the cache
-							this._setCachedModel(sPageModelCacheKey, oConverterPageModel);
 							return oConverterPageModel;
 						}
 					} catch (error) {
@@ -406,9 +409,13 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 								this.oView.setModel(new ManagedObjectModel(this.oView), "$view");
 								this.oView.setModel(oViewDataModel, "viewData");
 								oComponent.setAggregation("rootControl", this.oView);
+								// Fire and forget in the cache
+								if (!oPageModelCache) {
+									this._setCachedModel(sPageModelCacheKey, (oPageModel as any).getData());
+								}
 								return sCacheKey;
 							})
-							.catch(Log.error);
+							.catch(e => Log.error(e.message, e));
 					});
 				}
 			})

package/src/sap/fe/core/services/view/TemplatingErrorPage.controller.js

@@ -10,4 +10,4 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/controllerextensions/I
   });
   return TemplatingErrorPage;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRpbmdFcnJvclBhZ2UuY29udHJvbGxlci50cyJdLCJuYW1lcyI6WyJUZW1wbGF0aW5nRXJyb3JQYWdlIiwiQ29udHJvbGxlciIsImV4dGVuZCIsIl9yb3V0aW5nIiwiSW50ZXJuYWxSb3V0aW5nIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBQ0EsTUFBTUEsbUJBQW1CLEdBQUdDLFVBQVUsQ0FBQ0MsTUFBWCxDQUFrQiwrQ0FBbEIsRUFBbUU7QUFDOUZDLElBQUFBLFFBQVEsRUFBRUM7QUFEb0YsR0FBbkUsQ0FBNUI7U0FJZUosbUIiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IHsgSW50ZXJuYWxSb3V0aW5nIH0gZnJvbSBcInNhcC9mZS9jb3JlL2NvbnRyb2xsZXJleHRlbnNpb25zXCI7XG5cbmNvbnN0IFRlbXBsYXRpbmdFcnJvclBhZ2UgPSBDb250cm9sbGVyLmV4dGVuZChcInNhcC5mZS5jb3JlLnNlcnZpY2VzLnZpZXcuVGVtcGxhdGluZ0Vycm9yUGFnZVwiLCB7XG5cdF9yb3V0aW5nOiBJbnRlcm5hbFJvdXRpbmdcbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBUZW1wbGF0aW5nRXJyb3JQYWdlO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRpbmdFcnJvclBhZ2UuY29udHJvbGxlci50cyJdLCJuYW1lcyI6WyJUZW1wbGF0aW5nRXJyb3JQYWdlIiwiQ29udHJvbGxlciIsImV4dGVuZCIsIl9yb3V0aW5nIiwiSW50ZXJuYWxSb3V0aW5nIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBQ0EsTUFBTUEsbUJBQW1CLEdBQUdDLFVBQVUsQ0FBQ0MsTUFBWCxDQUFrQiwrQ0FBbEIsRUFBbUU7QUFDOUZDLElBQUFBLFFBQVEsRUFBRUM7QUFEb0YsR0FBbkUsQ0FBNUI7U0FJZUosbUIiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IEludGVybmFsUm91dGluZyBmcm9tIFwic2FwL2ZlL2NvcmUvY29udHJvbGxlcmV4dGVuc2lvbnMvSW50ZXJuYWxSb3V0aW5nXCI7XG5cbmNvbnN0IFRlbXBsYXRpbmdFcnJvclBhZ2UgPSBDb250cm9sbGVyLmV4dGVuZChcInNhcC5mZS5jb3JlLnNlcnZpY2VzLnZpZXcuVGVtcGxhdGluZ0Vycm9yUGFnZVwiLCB7XG5cdF9yb3V0aW5nOiBJbnRlcm5hbFJvdXRpbmdcbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBUZW1wbGF0aW5nRXJyb3JQYWdlO1xuIl19

package/src/sap/fe/core/services/view/TemplatingErrorPage.controller.ts

@@ -1,5 +1,5 @@
 import Controller from "sap/ui/core/mvc/Controller";
-import { InternalRouting } from "sap/fe/core/controllerextensions";
+import InternalRouting from "sap/fe/core/controllerextensions/InternalRouting";
 
 const TemplatingErrorPage = Controller.extend("sap.fe.core.services.view.TemplatingErrorPage", {
 	_routing: InternalRouting

package/src/sap/fe/core/support/CommonHelper.js

@@ -68,4 +68,4 @@ sap.ui.define(["sap/ui/support/library", "sap/fe/core/converters/helpers/IssueMa
   _exports.getIssueByCategory = getIssueByCategory;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1vbkhlbHBlci50cyJdLCJuYW1lcyI6WyJDYXRlZ29yaWVzIiwiU3VwcG9ydExpYiIsIlNldmVyaXR5IiwiQXVkaWVuY2VzIiwiZ2V0U2V2ZXJpdHkiLCJvU2V2ZXJpdHkiLCJJc3N1ZVNldmVyaXR5IiwiTG93IiwiSGlnaCIsIk1lZGl1bSIsImdldElzc3VlQnlDYXRlZ29yeSIsIm9Jc3N1ZU1hbmFnZXIiLCJvQ29yZUZhY2FkZSIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwiaXNzdWVTdWJDYXRlZ29yeVR5cGUiLCJtQ29tcG9uZW50cyIsImdldENvbXBvbmVudHMiLCJvQXBwQ29tcG9uZW50IiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJzS2V5Iiwib0NvbXBvbmVudCIsImdldE1ldGFkYXRhIiwiZ2V0UGFyZW50IiwiZ2V0TmFtZSIsImFJc3N1ZXMiLCJnZXREaWFnbm9zdGljcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJJc3N1ZUNhdGVnb3J5Iiwib0VsZW1lbnQiLCJhZGRJc3N1ZSIsInNldmVyaXR5IiwiZGV0YWlscyIsImNvbnRleHQiLCJpZCIsImNhdGVnb3J5Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7OztBQVNPLE1BQU1BLFVBQVUsR0FBR0MsVUFBVSxDQUFDRCxVQUE5QjtBQUFBLE1BQTBDO0FBQ2hERSxFQUFBQSxRQUFRLEdBQUdELFVBQVUsQ0FBQ0MsUUFEaEI7QUFBQSxNQUMwQjtBQUNoQ0MsRUFBQUEsU0FBUyxHQUFHRixVQUFVLENBQUNFLFNBRmpCLEMsQ0FFNEI7QUFFbkM7QUFDQTtBQUNBO0FBRUE7Ozs7OztBQUVPLE1BQU1DLFdBQVcsR0FBRyxVQUFTQyxTQUFULEVBQW1DO0FBQzdELFlBQVFBLFNBQVI7QUFDQyxXQUFLQyxhQUFhLENBQUNDLEdBQW5CO0FBQ0MsZUFBT0wsUUFBUSxDQUFDSyxHQUFoQjs7QUFDRCxXQUFLRCxhQUFhLENBQUNFLElBQW5CO0FBQ0MsZUFBT04sUUFBUSxDQUFDTSxJQUFoQjs7QUFDRCxXQUFLRixhQUFhLENBQUNHLE1BQW5CO0FBQ0MsZUFBT1AsUUFBUSxDQUFDTyxNQUFoQjtBQU5GO0FBUUEsR0FUTTs7OztBQVdBLE1BQU1DLGtCQUFrQixHQUFHLFVBQ2pDQyxhQURpQyxFQUVqQ0MsV0FGaUMsRUFHakNDLGlCQUhpQyxFQUlqQ0Msb0JBSmlDLEVBS2hDO0FBQ0QsUUFBTUMsV0FBVyxHQUFHSCxXQUFXLENBQUNJLGFBQVosRUFBcEI7QUFDQSxRQUFJQyxhQUFKO0FBQ0FDLElBQUFBLE1BQU0sQ0FBQ0MsSUFBUCxDQUFZSixXQUFaLEVBQXlCSyxPQUF6QixDQUFpQyxVQUFBQyxJQUFJLEVBQUk7QUFBQTs7QUFDeEMsVUFBTUMsVUFBVSxHQUFHUCxXQUFXLENBQUNNLElBQUQsQ0FBOUI7O0FBQ0EsVUFDQyxDQUFBQyxVQUFVLFNBQVYsSUFBQUEsVUFBVSxXQUFWLHFDQUFBQSxVQUFVLENBQ1BDLFdBREgsNEdBRUdDLFNBRkgsb0ZBR0dDLE9BSEgsUUFHaUIsMEJBSmxCLEVBS0U7QUFDRFIsUUFBQUEsYUFBYSxHQUFHSyxVQUFoQjtBQUNBO0FBQ0QsS0FWRDs7QUFXQSxRQUFJTCxhQUFKLEVBQW1CO0FBQ2xCLFVBQU1TLE9BQU8sR0FBR1QsYUFBYSxDQUFDVSxjQUFkLEdBQStCQyxtQkFBL0IsQ0FBbURDLGFBQWEsQ0FBQ2hCLGlCQUFELENBQWhFLEVBQXFGQyxvQkFBckYsQ0FBaEI7QUFFQVksTUFBQUEsT0FBTyxDQUFDTixPQUFSLENBQWdCLFVBQVNVLFFBQVQsRUFBb0M7QUFDbkRuQixRQUFBQSxhQUFhLENBQUNvQixRQUFkLENBQXVCO0FBQ3RCQyxVQUFBQSxRQUFRLEVBQUU1QixXQUFXLENBQUMwQixRQUFRLENBQUNFLFFBQVYsQ0FEQztBQUV0QkMsVUFBQUEsT0FBTyxFQUFFSCxRQUFRLENBQUNHLE9BRkk7QUFHdEJDLFVBQUFBLE9BQU8sRUFBRTtBQUNSQyxZQUFBQSxFQUFFLEVBQUVMLFFBQVEsQ0FBQ007QUFETDtBQUhhLFNBQXZCO0FBT0EsT0FSRDtBQVNBO0FBQ0QsR0FoQ00iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbIi8qIVxuICogJHtjb3B5cmlnaHR9XG4gKi9cbi8qKlxuICogRGVmaW5lcyBzdXBwb3J0IHJ1bGVzIG9mIHRoZSBPYmplY3RQYWdlSGVhZGVyIGNvbnRyb2wgb2Ygc2FwLnV4YXAgbGlicmFyeS5cbiAqL1xuaW1wb3J0IFN1cHBvcnRMaWIgZnJvbSBcInNhcC91aS9zdXBwb3J0L2xpYnJhcnlcIjtcbmltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuaW1wb3J0IHsgSXNzdWVEZWZpbml0aW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3N1cHBvcnQvRGlhZ25vc3RpY3NcIjtcbmltcG9ydCB7IEFwcENvbXBvbmVudCB9IGZyb20gXCJzYXAvZmUvY29yZVwiO1xuXG5leHBvcnQgY29uc3QgQ2F0ZWdvcmllcyA9IFN1cHBvcnRMaWIuQ2F0ZWdvcmllcywgLy8gQWNjZXNzaWJpbGl0eSwgUGVyZm9ybWFuY2UsIE1lbW9yeSwgLi4uXG5cdFNldmVyaXR5ID0gU3VwcG9ydExpYi5TZXZlcml0eSwgLy8gSGludCwgV2FybmluZywgRXJyb3Jcblx0QXVkaWVuY2VzID0gU3VwcG9ydExpYi5BdWRpZW5jZXM7IC8vIENvbnRyb2wsIEludGVybmFsLCBBcHBsaWNhdGlvblxuXG4vLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbi8vIFJ1bGUgRGVmaW5pdGlvbnNcbi8vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuXG4vLyBSdWxlIGNoZWNrcyBpZiBvYmplY3RQYWdlIGNvbXBvbmVudENvbnRhaW5lciBoZWlnaHQgaXMgc2V0XG5cbmV4cG9ydCBjb25zdCBnZXRTZXZlcml0eSA9IGZ1bmN0aW9uKG9TZXZlcml0eTogSXNzdWVTZXZlcml0eSkge1xuXHRzd2l0Y2ggKG9TZXZlcml0eSkge1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5Mb3c6XG5cdFx0XHRyZXR1cm4gU2V2ZXJpdHkuTG93O1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5IaWdoOlxuXHRcdFx0cmV0dXJuIFNldmVyaXR5LkhpZ2g7XG5cdFx0Y2FzZSBJc3N1ZVNldmVyaXR5Lk1lZGl1bTpcblx0XHRcdHJldHVybiBTZXZlcml0eS5NZWRpdW07XG5cdH1cbn07XG5cbmV4cG9ydCBjb25zdCBnZXRJc3N1ZUJ5Q2F0ZWdvcnkgPSBmdW5jdGlvbihcblx0b0lzc3VlTWFuYWdlcjogYW55LFxuXHRvQ29yZUZhY2FkZTogYW55IC8qb1Njb3BlOiBhbnkqLyxcblx0aXNzdWVDYXRlZ29yeVR5cGU6IElzc3VlQ2F0ZWdvcnksXG5cdGlzc3VlU3ViQ2F0ZWdvcnlUeXBlPzogc3RyaW5nXG4pIHtcblx0Y29uc3QgbUNvbXBvbmVudHMgPSBvQ29yZUZhY2FkZS5nZXRDb21wb25lbnRzKCk7XG5cdGxldCBvQXBwQ29tcG9uZW50ITogQXBwQ29tcG9uZW50O1xuXHRPYmplY3Qua2V5cyhtQ29tcG9uZW50cykuZm9yRWFjaChzS2V5ID0+IHtcblx0XHRjb25zdCBvQ29tcG9uZW50ID0gbUNvbXBvbmVudHNbc0tleV07XG5cdFx0aWYgKFxuXHRcdFx0b0NvbXBvbmVudFxuXHRcdFx0XHQ/LmdldE1ldGFkYXRhKClcblx0XHRcdFx0Py5nZXRQYXJlbnQoKVxuXHRcdFx0XHQ/LmdldE5hbWUoKSA9PT0gXCJzYXAuZmUuY29yZS5BcHBDb21wb25lbnRcIlxuXHRcdCkge1xuXHRcdFx0b0FwcENvbXBvbmVudCA9IG9Db21wb25lbnQ7XG5cdFx0fVxuXHR9KTtcblx0aWYgKG9BcHBDb21wb25lbnQpIHtcblx0XHRjb25zdCBhSXNzdWVzID0gb0FwcENvbXBvbmVudC5nZXREaWFnbm9zdGljcygpLmdldElzc3Vlc0J5Q2F0ZWdvcnkoSXNzdWVDYXRlZ29yeVtpc3N1ZUNhdGVnb3J5VHlwZV0sIGlzc3VlU3ViQ2F0ZWdvcnlUeXBlKTtcblxuXHRcdGFJc3N1ZXMuZm9yRWFjaChmdW5jdGlvbihvRWxlbWVudDogSXNzdWVEZWZpbml0aW9uKSB7XG5cdFx0XHRvSXNzdWVNYW5hZ2VyLmFkZElzc3VlKHtcblx0XHRcdFx0c2V2ZXJpdHk6IGdldFNldmVyaXR5KG9FbGVtZW50LnNldmVyaXR5KSxcblx0XHRcdFx0ZGV0YWlsczogb0VsZW1lbnQuZGV0YWlscyxcblx0XHRcdFx0Y29udGV4dDoge1xuXHRcdFx0XHRcdGlkOiBvRWxlbWVudC5jYXRlZ29yeVxuXHRcdFx0XHR9XG5cdFx0XHR9KTtcblx0XHR9KTtcblx0fVxufTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1vbkhlbHBlci50cyJdLCJuYW1lcyI6WyJDYXRlZ29yaWVzIiwiU3VwcG9ydExpYiIsIlNldmVyaXR5IiwiQXVkaWVuY2VzIiwiZ2V0U2V2ZXJpdHkiLCJvU2V2ZXJpdHkiLCJJc3N1ZVNldmVyaXR5IiwiTG93IiwiSGlnaCIsIk1lZGl1bSIsImdldElzc3VlQnlDYXRlZ29yeSIsIm9Jc3N1ZU1hbmFnZXIiLCJvQ29yZUZhY2FkZSIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwiaXNzdWVTdWJDYXRlZ29yeVR5cGUiLCJtQ29tcG9uZW50cyIsImdldENvbXBvbmVudHMiLCJvQXBwQ29tcG9uZW50IiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJzS2V5Iiwib0NvbXBvbmVudCIsImdldE1ldGFkYXRhIiwiZ2V0UGFyZW50IiwiZ2V0TmFtZSIsImFJc3N1ZXMiLCJnZXREaWFnbm9zdGljcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJJc3N1ZUNhdGVnb3J5Iiwib0VsZW1lbnQiLCJhZGRJc3N1ZSIsInNldmVyaXR5IiwiZGV0YWlscyIsImNvbnRleHQiLCJpZCIsImNhdGVnb3J5Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7OztBQVNPLE1BQU1BLFVBQVUsR0FBR0MsVUFBVSxDQUFDRCxVQUE5QjtBQUFBLE1BQTBDO0FBQ2hERSxFQUFBQSxRQUFRLEdBQUdELFVBQVUsQ0FBQ0MsUUFEaEI7QUFBQSxNQUMwQjtBQUNoQ0MsRUFBQUEsU0FBUyxHQUFHRixVQUFVLENBQUNFLFNBRmpCLEMsQ0FFNEI7QUFFbkM7QUFDQTtBQUNBO0FBRUE7Ozs7OztBQUVPLE1BQU1DLFdBQVcsR0FBRyxVQUFTQyxTQUFULEVBQW1DO0FBQzdELFlBQVFBLFNBQVI7QUFDQyxXQUFLQyxhQUFhLENBQUNDLEdBQW5CO0FBQ0MsZUFBT0wsUUFBUSxDQUFDSyxHQUFoQjs7QUFDRCxXQUFLRCxhQUFhLENBQUNFLElBQW5CO0FBQ0MsZUFBT04sUUFBUSxDQUFDTSxJQUFoQjs7QUFDRCxXQUFLRixhQUFhLENBQUNHLE1BQW5CO0FBQ0MsZUFBT1AsUUFBUSxDQUFDTyxNQUFoQjtBQU5GO0FBUUEsR0FUTTs7OztBQVdBLE1BQU1DLGtCQUFrQixHQUFHLFVBQ2pDQyxhQURpQyxFQUVqQ0MsV0FGaUMsRUFHakNDLGlCQUhpQyxFQUlqQ0Msb0JBSmlDLEVBS2hDO0FBQ0QsUUFBTUMsV0FBVyxHQUFHSCxXQUFXLENBQUNJLGFBQVosRUFBcEI7QUFDQSxRQUFJQyxhQUFKO0FBQ0FDLElBQUFBLE1BQU0sQ0FBQ0MsSUFBUCxDQUFZSixXQUFaLEVBQXlCSyxPQUF6QixDQUFpQyxVQUFBQyxJQUFJLEVBQUk7QUFBQTs7QUFDeEMsVUFBTUMsVUFBVSxHQUFHUCxXQUFXLENBQUNNLElBQUQsQ0FBOUI7O0FBQ0EsVUFDQyxDQUFBQyxVQUFVLFNBQVYsSUFBQUEsVUFBVSxXQUFWLHFDQUFBQSxVQUFVLENBQ1BDLFdBREgsNEdBRUdDLFNBRkgsb0ZBR0dDLE9BSEgsUUFHaUIsMEJBSmxCLEVBS0U7QUFDRFIsUUFBQUEsYUFBYSxHQUFHSyxVQUFoQjtBQUNBO0FBQ0QsS0FWRDs7QUFXQSxRQUFJTCxhQUFKLEVBQW1CO0FBQ2xCLFVBQU1TLE9BQU8sR0FBR1QsYUFBYSxDQUFDVSxjQUFkLEdBQStCQyxtQkFBL0IsQ0FBbURDLGFBQWEsQ0FBQ2hCLGlCQUFELENBQWhFLEVBQXFGQyxvQkFBckYsQ0FBaEI7QUFFQVksTUFBQUEsT0FBTyxDQUFDTixPQUFSLENBQWdCLFVBQVNVLFFBQVQsRUFBb0M7QUFDbkRuQixRQUFBQSxhQUFhLENBQUNvQixRQUFkLENBQXVCO0FBQ3RCQyxVQUFBQSxRQUFRLEVBQUU1QixXQUFXLENBQUMwQixRQUFRLENBQUNFLFFBQVYsQ0FEQztBQUV0QkMsVUFBQUEsT0FBTyxFQUFFSCxRQUFRLENBQUNHLE9BRkk7QUFHdEJDLFVBQUFBLE9BQU8sRUFBRTtBQUNSQyxZQUFBQSxFQUFFLEVBQUVMLFFBQVEsQ0FBQ007QUFETDtBQUhhLFNBQXZCO0FBT0EsT0FSRDtBQVNBO0FBQ0QsR0FoQ00iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbIi8qIVxuICogJHtjb3B5cmlnaHR9XG4gKi9cbi8qKlxuICogRGVmaW5lcyBzdXBwb3J0IHJ1bGVzIG9mIHRoZSBPYmplY3RQYWdlSGVhZGVyIGNvbnRyb2wgb2Ygc2FwLnV4YXAgbGlicmFyeS5cbiAqL1xuaW1wb3J0IFN1cHBvcnRMaWIgZnJvbSBcInNhcC91aS9zdXBwb3J0L2xpYnJhcnlcIjtcbmltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuaW1wb3J0IHsgSXNzdWVEZWZpbml0aW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3N1cHBvcnQvRGlhZ25vc3RpY3NcIjtcbmltcG9ydCBBcHBDb21wb25lbnQgZnJvbSBcInNhcC9mZS9jb3JlL0FwcENvbXBvbmVudFwiO1xuXG5leHBvcnQgY29uc3QgQ2F0ZWdvcmllcyA9IFN1cHBvcnRMaWIuQ2F0ZWdvcmllcywgLy8gQWNjZXNzaWJpbGl0eSwgUGVyZm9ybWFuY2UsIE1lbW9yeSwgLi4uXG5cdFNldmVyaXR5ID0gU3VwcG9ydExpYi5TZXZlcml0eSwgLy8gSGludCwgV2FybmluZywgRXJyb3Jcblx0QXVkaWVuY2VzID0gU3VwcG9ydExpYi5BdWRpZW5jZXM7IC8vIENvbnRyb2wsIEludGVybmFsLCBBcHBsaWNhdGlvblxuXG4vLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbi8vIFJ1bGUgRGVmaW5pdGlvbnNcbi8vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuXG4vLyBSdWxlIGNoZWNrcyBpZiBvYmplY3RQYWdlIGNvbXBvbmVudENvbnRhaW5lciBoZWlnaHQgaXMgc2V0XG5cbmV4cG9ydCBjb25zdCBnZXRTZXZlcml0eSA9IGZ1bmN0aW9uKG9TZXZlcml0eTogSXNzdWVTZXZlcml0eSkge1xuXHRzd2l0Y2ggKG9TZXZlcml0eSkge1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5Mb3c6XG5cdFx0XHRyZXR1cm4gU2V2ZXJpdHkuTG93O1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5IaWdoOlxuXHRcdFx0cmV0dXJuIFNldmVyaXR5LkhpZ2g7XG5cdFx0Y2FzZSBJc3N1ZVNldmVyaXR5Lk1lZGl1bTpcblx0XHRcdHJldHVybiBTZXZlcml0eS5NZWRpdW07XG5cdH1cbn07XG5cbmV4cG9ydCBjb25zdCBnZXRJc3N1ZUJ5Q2F0ZWdvcnkgPSBmdW5jdGlvbihcblx0b0lzc3VlTWFuYWdlcjogYW55LFxuXHRvQ29yZUZhY2FkZTogYW55IC8qb1Njb3BlOiBhbnkqLyxcblx0aXNzdWVDYXRlZ29yeVR5cGU6IElzc3VlQ2F0ZWdvcnksXG5cdGlzc3VlU3ViQ2F0ZWdvcnlUeXBlPzogc3RyaW5nXG4pIHtcblx0Y29uc3QgbUNvbXBvbmVudHMgPSBvQ29yZUZhY2FkZS5nZXRDb21wb25lbnRzKCk7XG5cdGxldCBvQXBwQ29tcG9uZW50ITogQXBwQ29tcG9uZW50O1xuXHRPYmplY3Qua2V5cyhtQ29tcG9uZW50cykuZm9yRWFjaChzS2V5ID0+IHtcblx0XHRjb25zdCBvQ29tcG9uZW50ID0gbUNvbXBvbmVudHNbc0tleV07XG5cdFx0aWYgKFxuXHRcdFx0b0NvbXBvbmVudFxuXHRcdFx0XHQ/LmdldE1ldGFkYXRhKClcblx0XHRcdFx0Py5nZXRQYXJlbnQoKVxuXHRcdFx0XHQ/LmdldE5hbWUoKSA9PT0gXCJzYXAuZmUuY29yZS5BcHBDb21wb25lbnRcIlxuXHRcdCkge1xuXHRcdFx0b0FwcENvbXBvbmVudCA9IG9Db21wb25lbnQ7XG5cdFx0fVxuXHR9KTtcblx0aWYgKG9BcHBDb21wb25lbnQpIHtcblx0XHRjb25zdCBhSXNzdWVzID0gb0FwcENvbXBvbmVudC5nZXREaWFnbm9zdGljcygpLmdldElzc3Vlc0J5Q2F0ZWdvcnkoSXNzdWVDYXRlZ29yeVtpc3N1ZUNhdGVnb3J5VHlwZV0sIGlzc3VlU3ViQ2F0ZWdvcnlUeXBlKTtcblxuXHRcdGFJc3N1ZXMuZm9yRWFjaChmdW5jdGlvbihvRWxlbWVudDogSXNzdWVEZWZpbml0aW9uKSB7XG5cdFx0XHRvSXNzdWVNYW5hZ2VyLmFkZElzc3VlKHtcblx0XHRcdFx0c2V2ZXJpdHk6IGdldFNldmVyaXR5KG9FbGVtZW50LnNldmVyaXR5KSxcblx0XHRcdFx0ZGV0YWlsczogb0VsZW1lbnQuZGV0YWlscyxcblx0XHRcdFx0Y29udGV4dDoge1xuXHRcdFx0XHRcdGlkOiBvRWxlbWVudC5jYXRlZ29yeVxuXHRcdFx0XHR9XG5cdFx0XHR9KTtcblx0XHR9KTtcblx0fVxufTtcbiJdfQ==

package/src/sap/fe/core/support/CommonHelper.ts

@@ -7,7 +7,7 @@
 import SupportLib from "sap/ui/support/library";
 import { IssueCategory, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
 import { IssueDefinition } from "sap/fe/core/support/Diagnostics";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 
 export const Categories = SupportLib.Categories, // Accessibility, Performance, Memory, ...
 	Severity = SupportLib.Severity, // Hint, Warning, Error

package/src/sap/fe/core/support/Diagnostics.js

@@ -5,69 +5,57 @@
 sap.ui.define([], function () {
   "use strict";
 
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
   var Diagnostics = /*#__PURE__*/function () {
     function Diagnostics() {
-      _classCallCheck(this, Diagnostics);
-
       this._issues = [];
     }
 
-    _createClass(Diagnostics, [{
-      key: "addIssue",
-      value: function addIssue(issueCategory, issueSeverity, details, issueCategoryType, subCategory) {
-        var checkIfIssueExists = this.checkIfIssueExists(issueCategory, issueSeverity, details, issueCategoryType, subCategory);
+    var _proto = Diagnostics.prototype;
 
-        if (!checkIfIssueExists) {
-          this._issues.push({
-            category: issueCategory,
-            severity: issueSeverity,
-            details: details,
-            subCategory: subCategory
-          });
-        }
-      }
-    }, {
-      key: "getIssues",
-      value: function getIssues() {
-        return this._issues;
+    _proto.addIssue = function addIssue(issueCategory, issueSeverity, details, issueCategoryType, subCategory) {
+      var checkIfIssueExists = this.checkIfIssueExists(issueCategory, issueSeverity, details, issueCategoryType, subCategory);
+
+      if (!checkIfIssueExists) {
+        this._issues.push({
+          category: issueCategory,
+          severity: issueSeverity,
+          details: details,
+          subCategory: subCategory
+        });
       }
-    }, {
-      key: "getIssuesByCategory",
-      value: function getIssuesByCategory(inCategory, subCategory) {
-        if (subCategory) {
-          return this._issues.filter(function (issue) {
-            return issue.category === inCategory && issue.subCategory === subCategory;
-          });
-        } else {
-          return this._issues.filter(function (issue) {
-            return issue.category === inCategory;
-          });
-        }
+    };
+
+    _proto.getIssues = function getIssues() {
+      return this._issues;
+    };
+
+    _proto.getIssuesByCategory = function getIssuesByCategory(inCategory, subCategory) {
+      if (subCategory) {
+        return this._issues.filter(function (issue) {
+          return issue.category === inCategory && issue.subCategory === subCategory;
+        });
+      } else {
+        return this._issues.filter(function (issue) {
+          return issue.category === inCategory;
+        });
       }
-    }, {
-      key: "checkIfIssueExists",
-      value: function checkIfIssueExists(inCategory, severity, details, issueCategoryType, issueSubCategory) {
-        if (issueCategoryType && issueCategoryType[inCategory] && issueSubCategory) {
-          return this._issues.some(function (issue) {
-            return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "") && issue.subCategory === issueSubCategory;
-          });
-        }
+    };
 
+    _proto.checkIfIssueExists = function checkIfIssueExists(inCategory, severity, details, issueCategoryType, issueSubCategory) {
+      if (issueCategoryType && issueCategoryType[inCategory] && issueSubCategory) {
         return this._issues.some(function (issue) {
-          return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "");
+          return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "") && issue.subCategory === issueSubCategory;
         });
       }
-    }]);
+
+      return this._issues.some(function (issue) {
+        return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "");
+      });
+    };
 
     return Diagnostics;
   }();
 
   return Diagnostics;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sIm5hbWVzIjpbIkRpYWdub3N0aWNzIiwiX2lzc3VlcyIsImlzc3VlQ2F0ZWdvcnkiLCJpc3N1ZVNldmVyaXR5IiwiZGV0YWlscyIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwic3ViQ2F0ZWdvcnkiLCJjaGVja0lmSXNzdWVFeGlzdHMiLCJwdXNoIiwiY2F0ZWdvcnkiLCJzZXZlcml0eSIsImluQ2F0ZWdvcnkiLCJmaWx0ZXIiLCJpc3N1ZSIsImlzc3VlU3ViQ2F0ZWdvcnkiLCJzb21lIiwicmVwbGFjZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7OztNQU1NQSxXO0FBRUwsMkJBQWM7QUFBQTs7QUFDYixXQUFLQyxPQUFMLEdBQWUsRUFBZjtBQUNBOzs7O2FBQ0Qsa0JBQ0NDLGFBREQsRUFFQ0MsYUFGRCxFQUdDQyxPQUhELEVBSUNDLGlCQUpELEVBS0NDLFdBTEQsRUFNUTtBQUNQLFlBQU1DLGtCQUFrQixHQUFHLEtBQUtBLGtCQUFMLENBQXdCTCxhQUF4QixFQUF1Q0MsYUFBdkMsRUFBc0RDLE9BQXRELEVBQStEQyxpQkFBL0QsRUFBa0ZDLFdBQWxGLENBQTNCOztBQUNBLFlBQUksQ0FBQ0Msa0JBQUwsRUFBeUI7QUFDeEIsZUFBS04sT0FBTCxDQUFhTyxJQUFiLENBQWtCO0FBQ2pCQyxZQUFBQSxRQUFRLEVBQUVQLGFBRE87QUFFakJRLFlBQUFBLFFBQVEsRUFBRVAsYUFGTztBQUdqQkMsWUFBQUEsT0FBTyxFQUFFQSxPQUhRO0FBSWpCRSxZQUFBQSxXQUFXLEVBQUVBO0FBSkksV0FBbEI7QUFNQTtBQUNEOzs7YUFDRCxxQkFBK0I7QUFDOUIsZUFBTyxLQUFLTCxPQUFaO0FBQ0E7OzthQUNELDZCQUFvQlUsVUFBcEIsRUFBK0NMLFdBQS9DLEVBQXdGO0FBQ3ZGLFlBQUlBLFdBQUosRUFBaUI7QUFDaEIsaUJBQU8sS0FBS0wsT0FBTCxDQUFhVyxNQUFiLENBQW9CLFVBQUFDLEtBQUs7QUFBQSxtQkFBSUEsS0FBSyxDQUFDSixRQUFOLEtBQW1CRSxVQUFuQixJQUFpQ0UsS0FBSyxDQUFDUCxXQUFOLEtBQXNCQSxXQUEzRDtBQUFBLFdBQXpCLENBQVA7QUFDQSxTQUZELE1BRU87QUFDTixpQkFBTyxLQUFLTCxPQUFMLENBQWFXLE1BQWIsQ0FBb0IsVUFBQUMsS0FBSztBQUFBLG1CQUFJQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQXZCO0FBQUEsV0FBekIsQ0FBUDtBQUNBO0FBQ0Q7OzthQUNELDRCQUNDQSxVQURELEVBRUNELFFBRkQsRUFHQ04sT0FIRCxFQUlDQyxpQkFKRCxFQUtDUyxnQkFMRCxFQU1XO0FBQ1YsWUFBSVQsaUJBQWlCLElBQUlBLGlCQUFpQixDQUFDTSxVQUFELENBQXRDLElBQXNERyxnQkFBMUQsRUFBNEU7QUFDM0UsaUJBQU8sS0FBS2IsT0FBTCxDQUFhYyxJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLG1CQUNKQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0gsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUcsS0FBSyxDQUFDVCxPQUFOLENBQWNZLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNaLE9BQU8sQ0FBQ1ksT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUZyQyxJQUdBSCxLQUFLLENBQUNQLFdBQU4sS0FBc0JRLGdCQUpsQjtBQUFBLFdBREMsQ0FBUDtBQU9BOztBQUNELGVBQU8sS0FBS2IsT0FBTCxDQUFhYyxJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLGlCQUNKQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0gsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUcsS0FBSyxDQUFDVCxPQUFOLENBQWNZLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNaLE9BQU8sQ0FBQ1ksT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUhqQztBQUFBLFNBREMsQ0FBUDtBQU1BOzs7Ozs7U0FHYWhCLFciLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuXG5leHBvcnQgdHlwZSBJc3N1ZURlZmluaXRpb24gPSB7XG5cdGNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5O1xuXHRzZXZlcml0eTogSXNzdWVTZXZlcml0eTtcblx0ZGV0YWlsczogc3RyaW5nO1xuXHRzdWJDYXRlZ29yeT86IHN0cmluZyB8IHVuZGVmaW5lZDtcbn07XG5jbGFzcyBEaWFnbm9zdGljcyB7XG5cdF9pc3N1ZXM6IElzc3VlRGVmaW5pdGlvbltdO1xuXHRjb25zdHJ1Y3RvcigpIHtcblx0XHR0aGlzLl9pc3N1ZXMgPSBbXTtcblx0fVxuXHRhZGRJc3N1ZShcblx0XHRpc3N1ZUNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LFxuXHRcdGlzc3VlU2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55IHwgdW5kZWZpbmVkLFxuXHRcdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkXG5cdCk6IHZvaWQge1xuXHRcdGNvbnN0IGNoZWNrSWZJc3N1ZUV4aXN0cyA9IHRoaXMuY2hlY2tJZklzc3VlRXhpc3RzKGlzc3VlQ2F0ZWdvcnksIGlzc3VlU2V2ZXJpdHksIGRldGFpbHMsIGlzc3VlQ2F0ZWdvcnlUeXBlLCBzdWJDYXRlZ29yeSk7XG5cdFx0aWYgKCFjaGVja0lmSXNzdWVFeGlzdHMpIHtcblx0XHRcdHRoaXMuX2lzc3Vlcy5wdXNoKHtcblx0XHRcdFx0Y2F0ZWdvcnk6IGlzc3VlQ2F0ZWdvcnksXG5cdFx0XHRcdHNldmVyaXR5OiBpc3N1ZVNldmVyaXR5LFxuXHRcdFx0XHRkZXRhaWxzOiBkZXRhaWxzLFxuXHRcdFx0XHRzdWJDYXRlZ29yeTogc3ViQ2F0ZWdvcnlcblx0XHRcdH0pO1xuXHRcdH1cblx0fVxuXHRnZXRJc3N1ZXMoKTogSXNzdWVEZWZpbml0aW9uW10ge1xuXHRcdHJldHVybiB0aGlzLl9pc3N1ZXM7XG5cdH1cblx0Z2V0SXNzdWVzQnlDYXRlZ29yeShpbkNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LCBzdWJDYXRlZ29yeT86IHN0cmluZyk6IElzc3VlRGVmaW5pdGlvbltdIHtcblx0XHRpZiAoc3ViQ2F0ZWdvcnkpIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuZmlsdGVyKGlzc3VlID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmIGlzc3VlLnN1YkNhdGVnb3J5ID09PSBzdWJDYXRlZ29yeSk7XG5cdFx0fSBlbHNlIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuZmlsdGVyKGlzc3VlID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5KTtcblx0XHR9XG5cdH1cblx0Y2hlY2tJZklzc3VlRXhpc3RzKFxuXHRcdGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0c2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55LFxuXHRcdGlzc3VlU3ViQ2F0ZWdvcnk/OiBzdHJpbmdcblx0KTogYm9vbGVhbiB7XG5cdFx0aWYgKGlzc3VlQ2F0ZWdvcnlUeXBlICYmIGlzc3VlQ2F0ZWdvcnlUeXBlW2luQ2F0ZWdvcnldICYmIGlzc3VlU3ViQ2F0ZWdvcnkpIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdFx0aXNzdWUgPT5cblx0XHRcdFx0XHRpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJlxuXHRcdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRcdGlzc3VlLmRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpID09PSBkZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSAmJlxuXHRcdFx0XHRcdGlzc3VlLnN1YkNhdGVnb3J5ID09PSBpc3N1ZVN1YkNhdGVnb3J5XG5cdFx0XHQpO1xuXHRcdH1cblx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLnNvbWUoXG5cdFx0XHRpc3N1ZSA9PlxuXHRcdFx0XHRpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJlxuXHRcdFx0XHRpc3N1ZS5zZXZlcml0eSA9PT0gc2V2ZXJpdHkgJiZcblx0XHRcdFx0aXNzdWUuZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIikgPT09IGRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpXG5cdFx0KTtcblx0fVxufVxuXG5leHBvcnQgZGVmYXVsdCBEaWFnbm9zdGljcztcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sIm5hbWVzIjpbIkRpYWdub3N0aWNzIiwiX2lzc3VlcyIsImFkZElzc3VlIiwiaXNzdWVDYXRlZ29yeSIsImlzc3VlU2V2ZXJpdHkiLCJkZXRhaWxzIiwiaXNzdWVDYXRlZ29yeVR5cGUiLCJzdWJDYXRlZ29yeSIsImNoZWNrSWZJc3N1ZUV4aXN0cyIsInB1c2giLCJjYXRlZ29yeSIsInNldmVyaXR5IiwiZ2V0SXNzdWVzIiwiZ2V0SXNzdWVzQnlDYXRlZ29yeSIsImluQ2F0ZWdvcnkiLCJmaWx0ZXIiLCJpc3N1ZSIsImlzc3VlU3ViQ2F0ZWdvcnkiLCJzb21lIiwicmVwbGFjZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztNQU1NQSxXO0FBRUwsMkJBQWM7QUFDYixXQUFLQyxPQUFMLEdBQWUsRUFBZjtBQUNBOzs7O1dBQ0RDLFEsR0FBQSxrQkFDQ0MsYUFERCxFQUVDQyxhQUZELEVBR0NDLE9BSEQsRUFJQ0MsaUJBSkQsRUFLQ0MsV0FMRCxFQU1RO0FBQ1AsVUFBTUMsa0JBQWtCLEdBQUcsS0FBS0Esa0JBQUwsQ0FBd0JMLGFBQXhCLEVBQXVDQyxhQUF2QyxFQUFzREMsT0FBdEQsRUFBK0RDLGlCQUEvRCxFQUFrRkMsV0FBbEYsQ0FBM0I7O0FBQ0EsVUFBSSxDQUFDQyxrQkFBTCxFQUF5QjtBQUN4QixhQUFLUCxPQUFMLENBQWFRLElBQWIsQ0FBa0I7QUFDakJDLFVBQUFBLFFBQVEsRUFBRVAsYUFETztBQUVqQlEsVUFBQUEsUUFBUSxFQUFFUCxhQUZPO0FBR2pCQyxVQUFBQSxPQUFPLEVBQUVBLE9BSFE7QUFJakJFLFVBQUFBLFdBQVcsRUFBRUE7QUFKSSxTQUFsQjtBQU1BO0FBQ0QsSzs7V0FDREssUyxHQUFBLHFCQUErQjtBQUM5QixhQUFPLEtBQUtYLE9BQVo7QUFDQSxLOztXQUNEWSxtQixHQUFBLDZCQUFvQkMsVUFBcEIsRUFBK0NQLFdBQS9DLEVBQXdGO0FBQ3ZGLFVBQUlBLFdBQUosRUFBaUI7QUFDaEIsZUFBTyxLQUFLTixPQUFMLENBQWFjLE1BQWIsQ0FBb0IsVUFBQUMsS0FBSztBQUFBLGlCQUFJQSxLQUFLLENBQUNOLFFBQU4sS0FBbUJJLFVBQW5CLElBQWlDRSxLQUFLLENBQUNULFdBQU4sS0FBc0JBLFdBQTNEO0FBQUEsU0FBekIsQ0FBUDtBQUNBLE9BRkQsTUFFTztBQUNOLGVBQU8sS0FBS04sT0FBTCxDQUFhYyxNQUFiLENBQW9CLFVBQUFDLEtBQUs7QUFBQSxpQkFBSUEsS0FBSyxDQUFDTixRQUFOLEtBQW1CSSxVQUF2QjtBQUFBLFNBQXpCLENBQVA7QUFDQTtBQUNELEs7O1dBQ0ROLGtCLEdBQUEsNEJBQ0NNLFVBREQsRUFFQ0gsUUFGRCxFQUdDTixPQUhELEVBSUNDLGlCQUpELEVBS0NXLGdCQUxELEVBTVc7QUFDVixVQUFJWCxpQkFBaUIsSUFBSUEsaUJBQWlCLENBQUNRLFVBQUQsQ0FBdEMsSUFBc0RHLGdCQUExRCxFQUE0RTtBQUMzRSxlQUFPLEtBQUtoQixPQUFMLENBQWFpQixJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLGlCQUNKQSxLQUFLLENBQUNOLFFBQU4sS0FBbUJJLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0wsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUssS0FBSyxDQUFDWCxPQUFOLENBQWNjLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNkLE9BQU8sQ0FBQ2MsT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUZyQyxJQUdBSCxLQUFLLENBQUNULFdBQU4sS0FBc0JVLGdCQUpsQjtBQUFBLFNBREMsQ0FBUDtBQU9BOztBQUNELGFBQU8sS0FBS2hCLE9BQUwsQ0FBYWlCLElBQWIsQ0FDTixVQUFBRixLQUFLO0FBQUEsZUFDSkEsS0FBSyxDQUFDTixRQUFOLEtBQW1CSSxVQUFuQixJQUNBRSxLQUFLLENBQUNMLFFBQU4sS0FBbUJBLFFBRG5CLElBRUFLLEtBQUssQ0FBQ1gsT0FBTixDQUFjYyxPQUFkLENBQXNCLEtBQXRCLEVBQTZCLEVBQTdCLE1BQXFDZCxPQUFPLENBQUNjLE9BQVIsQ0FBZ0IsS0FBaEIsRUFBdUIsRUFBdkIsQ0FIakM7QUFBQSxPQURDLENBQVA7QUFNQSxLOzs7OztTQUdhbkIsVyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSXNzdWVDYXRlZ29yeSwgSXNzdWVTZXZlcml0eSB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL2hlbHBlcnMvSXNzdWVNYW5hZ2VyXCI7XG5cbmV4cG9ydCB0eXBlIElzc3VlRGVmaW5pdGlvbiA9IHtcblx0Y2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnk7XG5cdHNldmVyaXR5OiBJc3N1ZVNldmVyaXR5O1xuXHRkZXRhaWxzOiBzdHJpbmc7XG5cdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkO1xufTtcbmNsYXNzIERpYWdub3N0aWNzIHtcblx0X2lzc3VlczogSXNzdWVEZWZpbml0aW9uW107XG5cdGNvbnN0cnVjdG9yKCkge1xuXHRcdHRoaXMuX2lzc3VlcyA9IFtdO1xuXHR9XG5cdGFkZElzc3VlKFxuXHRcdGlzc3VlQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0aXNzdWVTZXZlcml0eTogSXNzdWVTZXZlcml0eSxcblx0XHRkZXRhaWxzOiBzdHJpbmcsXG5cdFx0aXNzdWVDYXRlZ29yeVR5cGU/OiBhbnkgfCB1bmRlZmluZWQsXG5cdFx0c3ViQ2F0ZWdvcnk/OiBzdHJpbmcgfCB1bmRlZmluZWRcblx0KTogdm9pZCB7XG5cdFx0Y29uc3QgY2hlY2tJZklzc3VlRXhpc3RzID0gdGhpcy5jaGVja0lmSXNzdWVFeGlzdHMoaXNzdWVDYXRlZ29yeSwgaXNzdWVTZXZlcml0eSwgZGV0YWlscywgaXNzdWVDYXRlZ29yeVR5cGUsIHN1YkNhdGVnb3J5KTtcblx0XHRpZiAoIWNoZWNrSWZJc3N1ZUV4aXN0cykge1xuXHRcdFx0dGhpcy5faXNzdWVzLnB1c2goe1xuXHRcdFx0XHRjYXRlZ29yeTogaXNzdWVDYXRlZ29yeSxcblx0XHRcdFx0c2V2ZXJpdHk6IGlzc3VlU2V2ZXJpdHksXG5cdFx0XHRcdGRldGFpbHM6IGRldGFpbHMsXG5cdFx0XHRcdHN1YkNhdGVnb3J5OiBzdWJDYXRlZ29yeVxuXHRcdFx0fSk7XG5cdFx0fVxuXHR9XG5cdGdldElzc3VlcygpOiBJc3N1ZURlZmluaXRpb25bXSB7XG5cdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcztcblx0fVxuXHRnZXRJc3N1ZXNCeUNhdGVnb3J5KGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksIHN1YkNhdGVnb3J5Pzogc3RyaW5nKTogSXNzdWVEZWZpbml0aW9uW10ge1xuXHRcdGlmIChzdWJDYXRlZ29yeSkge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5maWx0ZXIoaXNzdWUgPT4gaXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkgJiYgaXNzdWUuc3ViQ2F0ZWdvcnkgPT09IHN1YkNhdGVnb3J5KTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5maWx0ZXIoaXNzdWUgPT4gaXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkpO1xuXHRcdH1cblx0fVxuXHRjaGVja0lmSXNzdWVFeGlzdHMoXG5cdFx0aW5DYXRlZ29yeTogSXNzdWVDYXRlZ29yeSxcblx0XHRzZXZlcml0eTogSXNzdWVTZXZlcml0eSxcblx0XHRkZXRhaWxzOiBzdHJpbmcsXG5cdFx0aXNzdWVDYXRlZ29yeVR5cGU/OiBhbnksXG5cdFx0aXNzdWVTdWJDYXRlZ29yeT86IHN0cmluZ1xuXHQpOiBib29sZWFuIHtcblx0XHRpZiAoaXNzdWVDYXRlZ29yeVR5cGUgJiYgaXNzdWVDYXRlZ29yeVR5cGVbaW5DYXRlZ29yeV0gJiYgaXNzdWVTdWJDYXRlZ29yeSkge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5zb21lKFxuXHRcdFx0XHRpc3N1ZSA9PlxuXHRcdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdFx0aXNzdWUuc2V2ZXJpdHkgPT09IHNldmVyaXR5ICYmXG5cdFx0XHRcdFx0aXNzdWUuZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIikgPT09IGRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpICYmXG5cdFx0XHRcdFx0aXNzdWUuc3ViQ2F0ZWdvcnkgPT09IGlzc3VlU3ViQ2F0ZWdvcnlcblx0XHRcdCk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdGlzc3VlID0+XG5cdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRpc3N1ZS5kZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSA9PT0gZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIilcblx0XHQpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IERpYWdub3N0aWNzO1xuIl19