@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.core/src/sap/fe/core/services/NavigationServiceFactory.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/fe/navigation/NavigationHandler"],function(S,a,N){"use strict";var _={};function b(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function c(i,C){if(!(i instanceof C)){throw new TypeError("Cannot call a class as a function");}}function d(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function f(C,p,e){if(p)d(C.prototype,p);if(e)d(C,e);return C;}function g(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)h(e,i);}function h(o,p){h=Object.setPrototypeOf||function h(o,p){o.__proto__=p;return o;};return h(o,p);}function j(D){var e=m();return function w(){var i=n(D),o;if(e){var p=n(this).constructor;o=Reflect.construct(i,arguments,p);}else{o=i.apply(this,arguments);}return k(this,o);};}function k(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}else if(i!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return l(e);}function l(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function m(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function n(o){n=Object.setPrototypeOf?Object.getPrototypeOf:function n(o){return o.__proto__||Object.getPrototypeOf(o);};return n(o);}var q=function(e){g(q,e);var i=j(q);function q(){c(this,q);return i.apply(this,arguments);}f(q,[{key:"init",value:function p(){var C=this.getContext(),o=C&&C.scopeObject;this.oNavHandler=new N(o);this.oNavHandler.setModel(o.getModel());this.initPromise=Promise.resolve(this);}},{key:"exit",value:function o(){this.oNavHandler.destroy();}},{key:"navigate",value:function x(o,A,p,I,O,E,w){this.oNavHandler.navigate(o,A,p,I,O,E,w);}},{key:"parseNavigation",value:function p(){return this.oNavHandler.parseNavigation();}},{key:"_processBeforeSmartLinkPopoverOpens",value:function p(T,o,I){return this.oNavHandler.processBeforeSmartLinkPopoverOpens(T,o,I);}},{key:"getAppStateKeyAndUrlParameters",value:function p(o){return this.oNavHandler._getAppStateKeyAndUrlParameters(o);}},{key:"getTechnicalParameters",value:function o(){return this.oNavHandler.getTechnicalParameters();}},{key:"setTechnicalParameters",value:function o(T){this.oNavHandler.setTechnicalParameters(T);}},{key:"setModel",value:function o(M){this.oNavHandler.setModel(M);}},{key:"storeInnerAppState",value:function o(I){return this.oNavHandler.storeInnerAppState(I);}},{key:"storeInnerAppStateWithImmediateReturn",value:function w(I,o,p){return this.oNavHandler.storeInnerAppStateWithImmediateReturn(I,o,p);}},{key:"replaceHash",value:function o(A){this.oNavHandler.replaceHash(A);}},{key:"replaceInnerAppStateKey",value:function p(A,o){return this.oNavHandler._replaceInnerAppStateKey(A,o);}},{key:"getUrlParametersFromSelectionVariant",value:function p(o){return this.oNavHandler._getURLParametersFromSelectionVariant(o);}},{key:"saveAppStateWithImmediateReturn",value:function w(I){if(I){var o=I.toJSONString(),p=JSON.parse(o),x={selectionVariant:p},R=this.oNavHandler._saveAppStateWithImmediateReturn(x);return R.appStateKey?R.appStateKey:"";}}},{key:"mixAttributesAndSelectionVariant",value:function x(o,p,w){return this.oNavHandler.mixAttributesAndSelectionVariant(o,p,w);}},{key:"constructContextUrl",value:function o(E,M){return this.oNavHandler.constructContextUrl(E,M);}},{key:"getInterface",value:function o(){return this;}}]);return q;}(S);function G(){return{};}function r(){return Promise.resolve({});}function s(){var M=jQuery.Deferred();M.resolve({},{},"initial");return M.promise();}function t(){return"";}var u=function(){function u(){c(this,u);b(this,"createEmptyAppState",G);b(this,"storeInnerAppStateWithImmediateReturn",G);b(this,"mixAttributesAndSelectionVariant",G);b(this,"getAppState",r);b(this,"getStartupAppState",r);b(this,"parseNavigation",s);b(this,"constructContextUrl",t);this.initPromise=Promise.resolve(this);}_.NavigationServicesMock=u;f(u,[{key:"getInterface",value:function e(){return this;}},{key:"replaceInnerAppStateKey",value:function e(A){return A?A:"";}},{key:"navigate",value:function e(){}}]);return u;}();_.NavigationServicesMock=u;var v=function(e){g(v,e);var i=j(v);function v(){c(this,v);return i.apply(this,arguments);}f(v,[{key:"createInstance",value:function w(o){var p=sap.ushell&&sap.ushell.Container?new q(o):new u();return p.initPromise.then(function(x){return x;});}}]);return v;}(a);return v;},false);
+sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/fe/navigation/NavigationHandler"],function(S,a,N){"use strict";var _={};function b(s,j){if(typeof j!=="function"&&j!==null){throw new TypeError("Super expression must either be null or a function");}s.prototype=Object.create(j&&j.prototype,{constructor:{value:s,writable:true,configurable:true}});if(j)c(s,j);}function c(o,p){c=Object.setPrototypeOf||function c(o,p){o.__proto__=p;return o;};return c(o,p);}var d=function(j){b(d,j);function d(){return j.apply(this,arguments)||this;}_.NavigationService=d;var k=d.prototype;k.init=function l(){var C=this.getContext(),o=C&&C.scopeObject;this.oNavHandler=new N(o);this.oNavHandler.setModel(o.getModel());this.initPromise=Promise.resolve(this);};k.exit=function l(){this.oNavHandler.destroy();};k.navigate=function m(s,A,n,I,o,E,l){this.oNavHandler.navigate(s,A,n,I,o,E,l);};k.parseNavigation=function p(){return this.oNavHandler.parseNavigation();};k._processBeforeSmartLinkPopoverOpens=function l(t,s,I){return this.oNavHandler.processBeforeSmartLinkPopoverOpens(t,s,I);};k.getAppStateKeyAndUrlParameters=function l(s){return this.oNavHandler._getAppStateKeyAndUrlParameters(s);};k.getTechnicalParameters=function l(){return this.oNavHandler.getTechnicalParameters();};k.setTechnicalParameters=function s(t){this.oNavHandler.setTechnicalParameters(t);};k.setModel=function s(m){this.oNavHandler.setModel(m);};k.storeInnerAppState=function s(I){return this.oNavHandler.storeInnerAppState(I);};k.storeInnerAppStateWithImmediateReturn=function s(I,l,n){return this.oNavHandler.storeInnerAppStateWithImmediateReturn(I,l,n);};k.replaceHash=function r(A){this.oNavHandler.replaceHash(A);};k.replaceInnerAppStateKey=function r(A,s){return this.oNavHandler._replaceInnerAppStateKey(A,s);};k.getUrlParametersFromSelectionVariant=function l(s){return this.oNavHandler._getURLParametersFromSelectionVariant(s);};k.saveAppStateWithImmediateReturn=function l(I){if(I){var s=I.toJSONString(),o=JSON.parse(s),x={selectionVariant:o},r=this.oNavHandler._saveAppStateWithImmediateReturn(x);return r.appStateKey?r.appStateKey:"";}};k.mixAttributesAndSelectionVariant=function n(s,l,m){return this.oNavHandler.mixAttributesAndSelectionVariant(s,l,m);};k.constructContextUrl=function l(E,m){return this.oNavHandler.constructContextUrl(E,m);};k.getInterface=function l(){return this;};return d;}(S);_.NavigationService=d;function g(){return{};}function G(){return Promise.resolve({});}function f(){var m=jQuery.Deferred();m.resolve({},{},"initial");return m.promise();}function e(){return"";}var h=function(){function h(){this.createEmptyAppState=g;this.storeInnerAppStateWithImmediateReturn=g;this.mixAttributesAndSelectionVariant=g;this.getAppState=G;this.getStartupAppState=G;this.parseNavigation=f;this.constructContextUrl=e;this.initPromise=Promise.resolve(this);}_.NavigationServicesMock=h;var j=h.prototype;j.getInterface=function k(){return this;};j.replaceInnerAppStateKey=function r(A){return A?A:"";};j.navigate=function n(){};return h;}();_.NavigationServicesMock=h;var i=function(j){b(i,j);function i(){return j.apply(this,arguments)||this;}var k=i.prototype;k.createInstance=function l(s){var n=sap.ushell&&sap.ushell.Container?new d(s):new h();return n.initPromise.then(function(o){return o;});};return i;}(a);return i;},false);

package/packages/sap.fe.core/src/sap/fe/core/services/NavigationServiceFactory.ts

@@ -1,10 +1,11 @@
 import Service from "sap/ui/core/service/Service";
 import ServiceFactory from "sap/ui/core/service/ServiceFactory";
 import { ServiceContext } from "sap/ui/core/service";
-import { SelectionVariant, NavigationHandler } from "sap/fe/navigation";
+import { NavigationHandler } from "sap/fe/navigation";
+import SelectionVariant from "sap/fe/navigation/SelectionVariant";
 
 type NavigationServiceSettings = {};
-class NavigationService extends Service<NavigationServiceSettings> {
+export class NavigationService extends Service<NavigationServiceSettings> {
 	initPromise!: Promise<any>;
 	oNavHandler!: NavigationHandler;
 	init() {
@@ -30,7 +31,7 @@ class NavigationService extends Service<NavigationServiceSettings> {
 	 *        <code>Measure</code> type.
 	 * @param {object} [oInnerAppData] Object for storing current state of the app
 	 * @param {Function} [fnOnError] Callback that is called if an error occurs during navigation <br>
-	 * @param {object} oExternalAppData Object for storing the state which will be forwarded to the target component.
+	 * @param {object} [oExternalAppData] Object for storing the state which will be forwarded to the target component.
 	 * @param {string} [sNavMode] Argument is used to overwrite the FLP-configured target for opening a URL. If used, only the
 	 *        <code>explace</code> or <code>inplace</code> values are allowed. Any other value will lead to an exception
 	 *        <code>NavigationHandler.INVALID_NAV_MODE</code>.
@@ -38,11 +39,11 @@ class NavigationService extends Service<NavigationServiceSettings> {
 	navigate(
 		sSemanticObject: string,
 		sActionName: string,
-		vNavigationParameters: string | object | undefined,
-		oInnerAppData: object | undefined,
-		fnOnError: Function | undefined,
-		oExternalAppData: object,
-		sNavMode: string | undefined
+		vNavigationParameters?: string | object,
+		oInnerAppData?: object,
+		fnOnError?: Function,
+		oExternalAppData?: object,
+		sNavMode?: string
 	) {
 		// TODO: Navigation Handler does not handle navigation without a context
 		// but in v4 DataFieldForIBN with requiresContext false can trigger a navigation without any context
@@ -231,11 +232,7 @@ class NavigationService extends Service<NavigationServiceSettings> {
 	 *        (|)
 	 * @returns {object} Instance of {@link sap.fe.navigation.SelectionVariant}
 	 */
-	mixAttributesAndSelectionVariant(
-		vSemanticAttributes: object | any[],
-		sSelectionVariant: string,
-		iSuppressionBehavior: number | undefined
-	) {
+	mixAttributesAndSelectionVariant(vSemanticAttributes: object | any[], sSelectionVariant: string, iSuppressionBehavior?: number) {
 		return this.oNavHandler.mixAttributesAndSelectionVariant(vSemanticAttributes, sSelectionVariant, iSuppressionBehavior);
 	}
 

package/packages/sap.fe.core/src/sap/fe/core/services/ResourceModelServiceFactory-dbg.js

@@ -7,95 +7,68 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
 
   var _exports = {};
 
-  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-  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; }
-
   function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
   function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
   var ResourceModelService = /*#__PURE__*/function (_Service) {
     _inherits(ResourceModelService, _Service);
 
-    var _super = _createSuper(ResourceModelService);
-
     function ResourceModelService() {
-      _classCallCheck(this, ResourceModelService);
-
-      return _super.apply(this, arguments);
+      return _Service.apply(this, arguments) || this;
     }
 
     _exports.ResourceModelService = ResourceModelService;
-
-    _createClass(ResourceModelService, [{
-      key: "init",
-      value: function init() {
-        var _this = this;
-
-        var oContext = this.getContext();
-        var mSettings = oContext.settings;
-        this.oFactory = oContext.factory; // When enhancing i18n keys the value in the last resource bundle takes precedence
-        // hence arrange various resource bundles so that enhanceI18n provided by the application is the last.
-        // The following order is used :
-        // 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)
-        // 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)
-        // 3. Multiple bundles passed by the application as part of enhanceI18n
-
-        var aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function (vI18n) {
-          // if value passed for enhanceI18n is a Resource Model, return the associated bundle
-          // else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created
-          return typeof vI18n.isA === "function" && vI18n.isA("sap.ui.model.resource.ResourceModel") ? vI18n.getResourceBundle() : {
-            bundleName: vI18n.replace(/\//g, ".")
-          };
-        });
-        this.oResourceModel = new ResourceModel({
-          bundleName: aBundles[0].bundleName,
-          enhanceWith: aBundles.slice(1),
-          async: true
-        });
-
-        if (oContext.scopeType === "component") {
-          var oComponent = oContext.scopeObject;
-          oComponent.setModel(this.oResourceModel, mSettings.modelName);
-        }
-
-        this.initPromise = this.oResourceModel.getResourceBundle().then(function (oBundle) {
-          _this.oResourceModel.__bundle = oBundle;
-          return _this;
-        });
-      }
-    }, {
-      key: "getResourceModel",
-      value: function getResourceModel() {
-        return this.oResourceModel;
+    var _proto = ResourceModelService.prototype;
+
+    _proto.init = function init() {
+      var _this = this;
+
+      var oContext = this.getContext();
+      var mSettings = oContext.settings;
+      this.oFactory = oContext.factory; // When enhancing i18n keys the value in the last resource bundle takes precedence
+      // hence arrange various resource bundles so that enhanceI18n provided by the application is the last.
+      // The following order is used :
+      // 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)
+      // 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)
+      // 3. Multiple bundles passed by the application as part of enhanceI18n
+
+      var aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function (vI18n) {
+        // if value passed for enhanceI18n is a Resource Model, return the associated bundle
+        // else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created
+        return typeof vI18n.isA === "function" && vI18n.isA("sap.ui.model.resource.ResourceModel") ? vI18n.getResourceBundle() : {
+          bundleName: vI18n.replace(/\//g, ".")
+        };
+      });
+      this.oResourceModel = new ResourceModel({
+        bundleName: aBundles[0].bundleName,
+        enhanceWith: aBundles.slice(1),
+        async: true
+      });
+
+      if (oContext.scopeType === "component") {
+        var oComponent = oContext.scopeObject;
+        oComponent.setModel(this.oResourceModel, mSettings.modelName);
       }
-    }, {
-      key: "getInterface",
-      value: function getInterface() {
-        return this;
-      }
-    }, {
-      key: "exit",
-      value: function exit() {
-        // Deregister global instance
-        this.oFactory.removeGlobalInstance();
-      }
-    }]);
+
+      this.initPromise = Promise.all([this.oResourceModel.getResourceBundle(), this.oResourceModel._pEnhanced || Promise.resolve()]).then(function (oBundle) {
+        _this.oResourceModel.__bundle = oBundle[0];
+        return _this;
+      });
+    };
+
+    _proto.getResourceModel = function getResourceModel() {
+      return this.oResourceModel;
+    };
+
+    _proto.getInterface = function getInterface() {
+      return this;
+    };
+
+    _proto.exit = function exit() {
+      // Deregister global instance
+      this.oFactory.removeGlobalInstance();
+    };
 
     return ResourceModelService;
   }(Service);
@@ -105,47 +78,39 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
   var ResourceModelServiceFactory = /*#__PURE__*/function (_ServiceFactory) {
     _inherits(ResourceModelServiceFactory, _ServiceFactory);
 
-    var _super2 = _createSuper(ResourceModelServiceFactory);
-
     function ResourceModelServiceFactory() {
       var _this2;
 
-      _classCallCheck(this, ResourceModelServiceFactory);
-
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
 
-      _this2 = _super2.call.apply(_super2, [this].concat(args));
-
-      _defineProperty(_assertThisInitialized(_this2), "_oInstances", {});
-
+      _this2 = _ServiceFactory.call.apply(_ServiceFactory, [this].concat(args)) || this;
+      _this2._oInstances = {};
       return _this2;
     }
 
-    _createClass(ResourceModelServiceFactory, [{
-      key: "createInstance",
-      value: function createInstance(oServiceContext) {
-        var sKey = oServiceContext.settings.bundles.join(",") + (oServiceContext.settings.enhanceI18n ? "," + oServiceContext.settings.enhanceI18n.join(",") : "");
+    var _proto2 = ResourceModelServiceFactory.prototype;
 
-        if (!this._oInstances[sKey]) {
-          this._oInstances[sKey] = new ResourceModelService(Object.assign({
-            factory: this
-          }, oServiceContext));
-        }
+    _proto2.createInstance = function createInstance(oServiceContext) {
+      var sKey = oServiceContext.settings.bundles.join(",") + (oServiceContext.settings.enhanceI18n ? "," + oServiceContext.settings.enhanceI18n.join(",") : "");
 
-        return this._oInstances[sKey].initPromise;
+      if (!this._oInstances[sKey]) {
+        this._oInstances[sKey] = new ResourceModelService(Object.assign({
+          factory: this
+        }, oServiceContext));
       }
-    }, {
-      key: "removeGlobalInstance",
-      value: function removeGlobalInstance() {
-        this._oInstances = {};
-      }
-    }]);
+
+      return this._oInstances[sKey].initPromise;
+    };
+
+    _proto2.removeGlobalInstance = function removeGlobalInstance() {
+      this._oInstances = {};
+    };
 
     return ResourceModelServiceFactory;
   }(ServiceFactory);
 
   return ResourceModelServiceFactory;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlJlc291cmNlTW9kZWxTZXJ2aWNlRmFjdG9yeS50cyJdLCJuYW1lcyI6WyJSZXNvdXJjZU1vZGVsU2VydmljZSIsIm9Db250ZXh0IiwiZ2V0Q29udGV4dCIsIm1TZXR0aW5ncyIsInNldHRpbmdzIiwib0ZhY3RvcnkiLCJmYWN0b3J5IiwiYUJ1bmRsZXMiLCJidW5kbGVzIiwiY29uY2F0IiwiZW5oYW5jZUkxOG4iLCJtYXAiLCJ2STE4biIsImlzQSIsImdldFJlc291cmNlQnVuZGxlIiwiYnVuZGxlTmFtZSIsInJlcGxhY2UiLCJvUmVzb3VyY2VNb2RlbCIsIlJlc291cmNlTW9kZWwiLCJlbmhhbmNlV2l0aCIsInNsaWNlIiwiYXN5bmMiLCJzY29wZVR5cGUiLCJvQ29tcG9uZW50Iiwic2NvcGVPYmplY3QiLCJzZXRNb2RlbCIsIm1vZGVsTmFtZSIsImluaXRQcm9taXNlIiwidGhlbiIsIm9CdW5kbGUiLCJfX2J1bmRsZSIsInJlbW92ZUdsb2JhbEluc3RhbmNlIiwiU2VydmljZSIsIlJlc291cmNlTW9kZWxTZXJ2aWNlRmFjdG9yeSIsIm9TZXJ2aWNlQ29udGV4dCIsInNLZXkiLCJqb2luIiwiX29JbnN0YW5jZXMiLCJPYmplY3QiLCJhc3NpZ24iLCJTZXJ2aWNlRmFjdG9yeSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztNQU9hQSxvQjs7Ozs7Ozs7Ozs7Ozs7O2FBSVosZ0JBQU87QUFBQTs7QUFDTixZQUFNQyxRQUFRLEdBQUcsS0FBS0MsVUFBTCxFQUFqQjtBQUNBLFlBQU1DLFNBQVMsR0FBR0YsUUFBUSxDQUFDRyxRQUEzQjtBQUNBLGFBQUtDLFFBQUwsR0FBZ0JKLFFBQVEsQ0FBQ0ssT0FBekIsQ0FITSxDQUtOO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7QUFDQSxZQUFNQyxRQUFRLEdBQUdKLFNBQVMsQ0FBQ0ssT0FBVixDQUFrQkMsTUFBbEIsQ0FBeUJOLFNBQVMsQ0FBQ08sV0FBVixJQUF5QixFQUFsRCxFQUFzREMsR0FBdEQsQ0FBMEQsVUFBU0MsS0FBVCxFQUFxQjtBQUMvRjtBQUNBO0FBQ0EsaUJBQU8sT0FBT0EsS0FBSyxDQUFDQyxHQUFiLEtBQXFCLFVBQXJCLElBQW1DRCxLQUFLLENBQUNDLEdBQU4sQ0FBVSxxQ0FBVixDQUFuQyxHQUNKRCxLQUFLLENBQUNFLGlCQUFOLEVBREksR0FFSjtBQUFFQyxZQUFBQSxVQUFVLEVBQUVILEtBQUssQ0FBQ0ksT0FBTixDQUFjLEtBQWQsRUFBcUIsR0FBckI7QUFBZCxXQUZIO0FBR0EsU0FOZ0IsQ0FBakI7QUFRQSxhQUFLQyxjQUFMLEdBQXNCLElBQUlDLGFBQUosQ0FBa0I7QUFDdkNILFVBQUFBLFVBQVUsRUFBRVIsUUFBUSxDQUFDLENBQUQsQ0FBUixDQUFZUSxVQURlO0FBRXZDSSxVQUFBQSxXQUFXLEVBQUVaLFFBQVEsQ0FBQ2EsS0FBVCxDQUFlLENBQWYsQ0FGMEI7QUFHdkNDLFVBQUFBLEtBQUssRUFBRTtBQUhnQyxTQUFsQixDQUF0Qjs7QUFNQSxZQUFJcEIsUUFBUSxDQUFDcUIsU0FBVCxLQUF1QixXQUEzQixFQUF3QztBQUN2QyxjQUFNQyxVQUFVLEdBQUd0QixRQUFRLENBQUN1QixXQUE1QjtBQUNBRCxVQUFBQSxVQUFVLENBQUNFLFFBQVgsQ0FBb0IsS0FBS1IsY0FBekIsRUFBeUNkLFNBQVMsQ0FBQ3VCLFNBQW5EO0FBQ0E7O0FBRUQsYUFBS0MsV0FBTCxHQUFvQixLQUFLVixjQUFMLENBQW9CSCxpQkFBcEIsRUFBRCxDQUFxRWMsSUFBckUsQ0FBMEUsVUFBQ0MsT0FBRCxFQUFrQjtBQUM3RyxVQUFBLEtBQUksQ0FBQ1osY0FBTixDQUE2QmEsUUFBN0IsR0FBd0NELE9BQXhDO0FBQ0EsaUJBQU8sS0FBUDtBQUNBLFNBSGtCLENBQW5CO0FBSUE7OzthQUVELDRCQUFtQjtBQUNsQixlQUFPLEtBQUtaLGNBQVo7QUFDQTs7O2FBQ0Qsd0JBQW9CO0FBQ25CLGVBQU8sSUFBUDtBQUNBOzs7YUFDRCxnQkFBTztBQUNOO0FBQ0EsYUFBS1osUUFBTCxDQUFjMEIsb0JBQWQ7QUFDQTs7OztJQWpEd0NDLE87Ozs7TUFvRHBDQywyQjs7Ozs7Ozs7Ozs7Ozs7OztxRUFDK0MsRTs7Ozs7OzthQUNwRCx3QkFBZUMsZUFBZixFQUE4RTtBQUM3RSxZQUFNQyxJQUFJLEdBQ1RELGVBQWUsQ0FBQzlCLFFBQWhCLENBQXlCSSxPQUF6QixDQUFpQzRCLElBQWpDLENBQXNDLEdBQXRDLEtBQ0NGLGVBQWUsQ0FBQzlCLFFBQWhCLENBQXlCTSxXQUF6QixHQUF1QyxNQUFNd0IsZUFBZSxDQUFDOUIsUUFBaEIsQ0FBeUJNLFdBQXpCLENBQXFDMEIsSUFBckMsQ0FBMEMsR0FBMUMsQ0FBN0MsR0FBOEYsRUFEL0YsQ0FERDs7QUFJQSxZQUFJLENBQUMsS0FBS0MsV0FBTCxDQUFpQkYsSUFBakIsQ0FBTCxFQUE2QjtBQUM1QixlQUFLRSxXQUFMLENBQWlCRixJQUFqQixJQUF5QixJQUFJbkMsb0JBQUosQ0FBeUJzQyxNQUFNLENBQUNDLE1BQVAsQ0FBYztBQUFFakMsWUFBQUEsT0FBTyxFQUFFO0FBQVgsV0FBZCxFQUFpQzRCLGVBQWpDLENBQXpCLENBQXpCO0FBQ0E7O0FBRUQsZUFBTyxLQUFLRyxXQUFMLENBQWlCRixJQUFqQixFQUF1QlIsV0FBOUI7QUFDQTs7O2FBQ0QsZ0NBQXVCO0FBQ3RCLGFBQUtVLFdBQUwsR0FBbUIsRUFBbkI7QUFDQTs7OztJQWZ3Q0csYzs7U0FrQjNCUCwyQiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFNlcnZpY2UgZnJvbSBcInNhcC91aS9jb3JlL3NlcnZpY2UvU2VydmljZVwiO1xuaW1wb3J0IFNlcnZpY2VGYWN0b3J5IGZyb20gXCJzYXAvdWkvY29yZS9zZXJ2aWNlL1NlcnZpY2VGYWN0b3J5XCI7XG5pbXBvcnQgUmVzb3VyY2VNb2RlbCBmcm9tIFwic2FwL3VpL21vZGVsL3Jlc291cmNlL1Jlc291cmNlTW9kZWxcIjtcbmltcG9ydCBSZXNvdXJjZUJ1bmRsZSBmcm9tIFwic2FwL2Jhc2UvaTE4bi9SZXNvdXJjZUJ1bmRsZVwiO1xuaW1wb3J0IHsgU2VydmljZUNvbnRleHQgfSBmcm9tIFwic2FwL3VpL2NvcmUvc2VydmljZVwiO1xudHlwZSBSZXNvdXJjZU1vZGVsU2VydmljZVNldHRpbmdzID0ge1xuXHRidW5kbGVzOiBSZXNvdXJjZUJ1bmRsZVtdO1xuXHRlbmhhbmNlSTE4bjogc3RyaW5nW107XG59O1xuZXhwb3J0IGNsYXNzIFJlc291cmNlTW9kZWxTZXJ2aWNlIGV4dGVuZHMgU2VydmljZTxSZXNvdXJjZU1vZGVsU2VydmljZVNldHRpbmdzPiB7XG5cdGluaXRQcm9taXNlITogUHJvbWlzZTxhbnk+O1xuXHRvRmFjdG9yeSE6IFJlc291cmNlTW9kZWxTZXJ2aWNlRmFjdG9yeTtcblx0b1Jlc291cmNlTW9kZWwhOiBSZXNvdXJjZU1vZGVsO1xuXHRpbml0KCkge1xuXHRcdGNvbnN0IG9Db250ZXh0ID0gdGhpcy5nZXRDb250ZXh0KCk7XG5cdFx0Y29uc3QgbVNldHRpbmdzID0gb0NvbnRleHQuc2V0dGluZ3M7XG5cdFx0dGhpcy5vRmFjdG9yeSA9IG9Db250ZXh0LmZhY3Rvcnk7XG5cblx0XHQvLyBXaGVuIGVuaGFuY2luZyBpMThuIGtleXMgdGhlIHZhbHVlIGluIHRoZSBsYXN0IHJlc291cmNlIGJ1bmRsZSB0YWtlcyBwcmVjZWRlbmNlXG5cdFx0Ly8gaGVuY2UgYXJyYW5nZSB2YXJpb3VzIHJlc291cmNlIGJ1bmRsZXMgc28gdGhhdCBlbmhhbmNlSTE4biBwcm92aWRlZCBieSB0aGUgYXBwbGljYXRpb24gaXMgdGhlIGxhc3QuXG5cdFx0Ly8gVGhlIGZvbGxvd2luZyBvcmRlciBpcyB1c2VkIDpcblx0XHQvLyAxLiBzYXAuZmUgYnVuZGxlIC0gc2FwLmZlLmNvcmUubWVzc2FnZWJ1bmRsZSAocGFzc2VkIHdpdGggbVNldHRpbmdzLmJ1bmRsZXMpXG5cdFx0Ly8gMi4gc2FwLmZlIGJ1bmRsZSAtIHNhcC5mZS50ZW1wbGF0ZXMubWVzc2FnZWJ1bmRsZSAocGFzc2VkIHdpdGggbVNldHRpbmdzLmJ1bmRsZXMpXG5cdFx0Ly8gMy4gTXVsdGlwbGUgYnVuZGxlcyBwYXNzZWQgYnkgdGhlIGFwcGxpY2F0aW9uIGFzIHBhcnQgb2YgZW5oYW5jZUkxOG5cblx0XHRjb25zdCBhQnVuZGxlcyA9IG1TZXR0aW5ncy5idW5kbGVzLmNvbmNhdChtU2V0dGluZ3MuZW5oYW5jZUkxOG4gfHwgW10pLm1hcChmdW5jdGlvbih2STE4bjogYW55KSB7XG5cdFx0XHQvLyBpZiB2YWx1ZSBwYXNzZWQgZm9yIGVuaGFuY2VJMThuIGlzIGEgUmVzb3VyY2UgTW9kZWwsIHJldHVybiB0aGUgYXNzb2NpYXRlZCBidW5kbGVcblx0XHRcdC8vIGVsc2UgdGhlIHZhbHVlIGlzIGEgYnVuZGxlVXJsLCByZXR1cm4gUmVzb3VyY2UgQnVuZGxlIGNvbmZpZ3VyYXRpb24gc28gdGhhdCBhIGJ1bmRsZSBjYW4gYmUgY3JlYXRlZFxuXHRcdFx0cmV0dXJuIHR5cGVvZiB2STE4bi5pc0EgPT09IFwiZnVuY3Rpb25cIiAmJiB2STE4bi5pc0EoXCJzYXAudWkubW9kZWwucmVzb3VyY2UuUmVzb3VyY2VNb2RlbFwiKVxuXHRcdFx0XHQ/IHZJMThuLmdldFJlc291cmNlQnVuZGxlKClcblx0XHRcdFx0OiB7IGJ1bmRsZU5hbWU6IHZJMThuLnJlcGxhY2UoL1xcLy9nLCBcIi5cIikgfTtcblx0XHR9KTtcblxuXHRcdHRoaXMub1Jlc291cmNlTW9kZWwgPSBuZXcgUmVzb3VyY2VNb2RlbCh7XG5cdFx0XHRidW5kbGVOYW1lOiBhQnVuZGxlc1swXS5idW5kbGVOYW1lLFxuXHRcdFx0ZW5oYW5jZVdpdGg6IGFCdW5kbGVzLnNsaWNlKDEpLFxuXHRcdFx0YXN5bmM6IHRydWVcblx0XHR9KTtcblxuXHRcdGlmIChvQ29udGV4dC5zY29wZVR5cGUgPT09IFwiY29tcG9uZW50XCIpIHtcblx0XHRcdGNvbnN0IG9Db21wb25lbnQgPSBvQ29udGV4dC5zY29wZU9iamVjdDtcblx0XHRcdG9Db21wb25lbnQuc2V0TW9kZWwodGhpcy5vUmVzb3VyY2VNb2RlbCwgbVNldHRpbmdzLm1vZGVsTmFtZSk7XG5cdFx0fVxuXG5cdFx0dGhpcy5pbml0UHJvbWlzZSA9ICh0aGlzLm9SZXNvdXJjZU1vZGVsLmdldFJlc291cmNlQnVuZGxlKCkgYXMgUHJvbWlzZTxSZXNvdXJjZUJ1bmRsZT4pLnRoZW4oKG9CdW5kbGU6IGFueSkgPT4ge1xuXHRcdFx0KHRoaXMub1Jlc291cmNlTW9kZWwgYXMgYW55KS5fX2J1bmRsZSA9IG9CdW5kbGU7XG5cdFx0XHRyZXR1cm4gdGhpcztcblx0XHR9KTtcblx0fVxuXG5cdGdldFJlc291cmNlTW9kZWwoKSB7XG5cdFx0cmV0dXJuIHRoaXMub1Jlc291cmNlTW9kZWw7XG5cdH1cblx0Z2V0SW50ZXJmYWNlKCk6IGFueSB7XG5cdFx0cmV0dXJuIHRoaXM7XG5cdH1cblx0ZXhpdCgpIHtcblx0XHQvLyBEZXJlZ2lzdGVyIGdsb2JhbCBpbnN0YW5jZVxuXHRcdHRoaXMub0ZhY3RvcnkucmVtb3ZlR2xvYmFsSW5zdGFuY2UoKTtcblx0fVxufVxuXG5jbGFzcyBSZXNvdXJjZU1vZGVsU2VydmljZUZhY3RvcnkgZXh0ZW5kcyBTZXJ2aWNlRmFjdG9yeTxSZXNvdXJjZU1vZGVsU2VydmljZVNldHRpbmdzPiB7XG5cdF9vSW5zdGFuY2VzOiBSZWNvcmQ8c3RyaW5nLCBSZXNvdXJjZU1vZGVsU2VydmljZT4gPSB7fTtcblx0Y3JlYXRlSW5zdGFuY2Uob1NlcnZpY2VDb250ZXh0OiBTZXJ2aWNlQ29udGV4dDxSZXNvdXJjZU1vZGVsU2VydmljZVNldHRpbmdzPikge1xuXHRcdGNvbnN0IHNLZXkgPVxuXHRcdFx0b1NlcnZpY2VDb250ZXh0LnNldHRpbmdzLmJ1bmRsZXMuam9pbihcIixcIikgK1xuXHRcdFx0KG9TZXJ2aWNlQ29udGV4dC5zZXR0aW5ncy5lbmhhbmNlSTE4biA/IFwiLFwiICsgb1NlcnZpY2VDb250ZXh0LnNldHRpbmdzLmVuaGFuY2VJMThuLmpvaW4oXCIsXCIpIDogXCJcIik7XG5cblx0XHRpZiAoIXRoaXMuX29JbnN0YW5jZXNbc0tleV0pIHtcblx0XHRcdHRoaXMuX29JbnN0YW5jZXNbc0tleV0gPSBuZXcgUmVzb3VyY2VNb2RlbFNlcnZpY2UoT2JqZWN0LmFzc2lnbih7IGZhY3Rvcnk6IHRoaXMgfSwgb1NlcnZpY2VDb250ZXh0KSk7XG5cdFx0fVxuXG5cdFx0cmV0dXJuIHRoaXMuX29JbnN0YW5jZXNbc0tleV0uaW5pdFByb21pc2U7XG5cdH1cblx0cmVtb3ZlR2xvYmFsSW5zdGFuY2UoKSB7XG5cdFx0dGhpcy5fb0luc3RhbmNlcyA9IHt9O1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IFJlc291cmNlTW9kZWxTZXJ2aWNlRmFjdG9yeTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ResourceModelServiceFactory.ts"],"names":["ResourceModelService","init","oContext","getContext","mSettings","settings","oFactory","factory","aBundles","bundles","concat","enhanceI18n","map","vI18n","isA","getResourceBundle","bundleName","replace","oResourceModel","ResourceModel","enhanceWith","slice","async","scopeType","oComponent","scopeObject","setModel","modelName","initPromise","Promise","all","_pEnhanced","resolve","then","oBundle","__bundle","getResourceModel","getInterface","exit","removeGlobalInstance","Service","ResourceModelServiceFactory","_oInstances","createInstance","oServiceContext","sKey","join","Object","assign","ServiceFactory"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;MAOaA,oB;;;;;;;;;;WAIZC,I,GAAA,gBAAO;AAAA;;AACN,UAAMC,QAAQ,GAAG,KAAKC,UAAL,EAAjB;AACA,UAAMC,SAAS,GAAGF,QAAQ,CAACG,QAA3B;AACA,WAAKC,QAAL,GAAgBJ,QAAQ,CAACK,OAAzB,CAHM,CAKN;AACA;AACA;AACA;AACA;AACA;;AACA,UAAMC,QAAQ,GAAGJ,SAAS,CAACK,OAAV,CAAkBC,MAAlB,CAAyBN,SAAS,CAACO,WAAV,IAAyB,EAAlD,EAAsDC,GAAtD,CAA0D,UAASC,KAAT,EAAqB;AAC/F;AACA;AACA,eAAO,OAAOA,KAAK,CAACC,GAAb,KAAqB,UAArB,IAAmCD,KAAK,CAACC,GAAN,CAAU,qCAAV,CAAnC,GACJD,KAAK,CAACE,iBAAN,EADI,GAEJ;AAAEC,UAAAA,UAAU,EAAEH,KAAK,CAACI,OAAN,CAAc,KAAd,EAAqB,GAArB;AAAd,SAFH;AAGA,OANgB,CAAjB;AAQA,WAAKC,cAAL,GAAsB,IAAIC,aAAJ,CAAkB;AACvCH,QAAAA,UAAU,EAAER,QAAQ,CAAC,CAAD,CAAR,CAAYQ,UADe;AAEvCI,QAAAA,WAAW,EAAEZ,QAAQ,CAACa,KAAT,CAAe,CAAf,CAF0B;AAGvCC,QAAAA,KAAK,EAAE;AAHgC,OAAlB,CAAtB;;AAMA,UAAIpB,QAAQ,CAACqB,SAAT,KAAuB,WAA3B,EAAwC;AACvC,YAAMC,UAAU,GAAGtB,QAAQ,CAACuB,WAA5B;AACAD,QAAAA,UAAU,CAACE,QAAX,CAAoB,KAAKR,cAAzB,EAAyCd,SAAS,CAACuB,SAAnD;AACA;;AAED,WAAKC,WAAL,GAAmBC,OAAO,CAACC,GAAR,CAAY,CAC9B,KAAKZ,cAAL,CAAoBH,iBAApB,EAD8B,EAE7B,KAAKG,cAAN,CAA6Ba,UAA7B,IAA2CF,OAAO,CAACG,OAAR,EAFb,CAAZ,EAGhBC,IAHgB,CAGX,UAACC,OAAD,EAAoB;AAC1B,QAAA,KAAI,CAAChB,cAAN,CAA6BiB,QAA7B,GAAwCD,OAAO,CAAC,CAAD,CAA/C;AACA,eAAO,KAAP;AACA,OANkB,CAAnB;AAOA,K;;WAEDE,gB,GAAA,4BAAmB;AAClB,aAAO,KAAKlB,cAAZ;AACA,K;;WACDmB,Y,GAAA,wBAAoB;AACnB,aAAO,IAAP;AACA,K;;WACDC,I,GAAA,gBAAO;AACN;AACA,WAAKhC,QAAL,CAAciC,oBAAd;AACA,K;;;IApDwCC,O;;;;MAuDpCC,2B;;;;;;;;;;;aACLC,W,GAAoD,E;;;;;;YACpDC,c,GAAA,wBAAeC,eAAf,EAA8E;AAC7E,UAAMC,IAAI,GACTD,eAAe,CAACvC,QAAhB,CAAyBI,OAAzB,CAAiCqC,IAAjC,CAAsC,GAAtC,KACCF,eAAe,CAACvC,QAAhB,CAAyBM,WAAzB,GAAuC,MAAMiC,eAAe,CAACvC,QAAhB,CAAyBM,WAAzB,CAAqCmC,IAArC,CAA0C,GAA1C,CAA7C,GAA8F,EAD/F,CADD;;AAIA,UAAI,CAAC,KAAKJ,WAAL,CAAiBG,IAAjB,CAAL,EAA6B;AAC5B,aAAKH,WAAL,CAAiBG,IAAjB,IAAyB,IAAI7C,oBAAJ,CAAyB+C,MAAM,CAACC,MAAP,CAAc;AAAEzC,UAAAA,OAAO,EAAE;AAAX,SAAd,EAAiCqC,eAAjC,CAAzB,CAAzB;AACA;;AAED,aAAO,KAAKF,WAAL,CAAiBG,IAAjB,EAAuBjB,WAA9B;AACA,K;;YACDW,oB,GAAA,gCAAuB;AACtB,WAAKG,WAAL,GAAmB,EAAnB;AACA,K;;;IAfwCO,c;;SAkB3BR,2B","sourceRoot":".","sourcesContent":["import Service from \"sap/ui/core/service/Service\";\nimport ServiceFactory from \"sap/ui/core/service/ServiceFactory\";\nimport ResourceModel from \"sap/ui/model/resource/ResourceModel\";\nimport ResourceBundle from \"sap/base/i18n/ResourceBundle\";\nimport { ServiceContext } from \"sap/ui/core/service\";\ntype ResourceModelServiceSettings = {\n\tbundles: ResourceBundle[];\n\tenhanceI18n: string[];\n};\nexport class ResourceModelService extends Service<ResourceModelServiceSettings> {\n\tinitPromise!: Promise<any>;\n\toFactory!: ResourceModelServiceFactory;\n\toResourceModel!: ResourceModel;\n\tinit() {\n\t\tconst oContext = this.getContext();\n\t\tconst mSettings = oContext.settings;\n\t\tthis.oFactory = oContext.factory;\n\n\t\t// When enhancing i18n keys the value in the last resource bundle takes precedence\n\t\t// hence arrange various resource bundles so that enhanceI18n provided by the application is the last.\n\t\t// The following order is used :\n\t\t// 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)\n\t\t// 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)\n\t\t// 3. Multiple bundles passed by the application as part of enhanceI18n\n\t\tconst aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function(vI18n: any) {\n\t\t\t// if value passed for enhanceI18n is a Resource Model, return the associated bundle\n\t\t\t// else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created\n\t\t\treturn typeof vI18n.isA === \"function\" && vI18n.isA(\"sap.ui.model.resource.ResourceModel\")\n\t\t\t\t? vI18n.getResourceBundle()\n\t\t\t\t: { bundleName: vI18n.replace(/\\//g, \".\") };\n\t\t});\n\n\t\tthis.oResourceModel = new ResourceModel({\n\t\t\tbundleName: aBundles[0].bundleName,\n\t\t\tenhanceWith: aBundles.slice(1),\n\t\t\tasync: true\n\t\t});\n\n\t\tif (oContext.scopeType === \"component\") {\n\t\t\tconst oComponent = oContext.scopeObject;\n\t\t\toComponent.setModel(this.oResourceModel, mSettings.modelName);\n\t\t}\n\n\t\tthis.initPromise = Promise.all([\n\t\t\tthis.oResourceModel.getResourceBundle() as Promise<ResourceBundle>,\n\t\t\t(this.oResourceModel as any)._pEnhanced || Promise.resolve()\n\t\t]).then((oBundle: any[]) => {\n\t\t\t(this.oResourceModel as any).__bundle = oBundle[0];\n\t\t\treturn this;\n\t\t});\n\t}\n\n\tgetResourceModel() {\n\t\treturn this.oResourceModel;\n\t}\n\tgetInterface(): any {\n\t\treturn this;\n\t}\n\texit() {\n\t\t// Deregister global instance\n\t\tthis.oFactory.removeGlobalInstance();\n\t}\n}\n\nclass ResourceModelServiceFactory extends ServiceFactory<ResourceModelServiceSettings> {\n\t_oInstances: Record<string, ResourceModelService> = {};\n\tcreateInstance(oServiceContext: ServiceContext<ResourceModelServiceSettings>) {\n\t\tconst sKey =\n\t\t\toServiceContext.settings.bundles.join(\",\") +\n\t\t\t(oServiceContext.settings.enhanceI18n ? \",\" + oServiceContext.settings.enhanceI18n.join(\",\") : \"\");\n\n\t\tif (!this._oInstances[sKey]) {\n\t\t\tthis._oInstances[sKey] = new ResourceModelService(Object.assign({ factory: this }, oServiceContext));\n\t\t}\n\n\t\treturn this._oInstances[sKey].initPromise;\n\t}\n\tremoveGlobalInstance() {\n\t\tthis._oInstances = {};\n\t}\n}\n\nexport default ResourceModelServiceFactory;\n"]}

package/packages/sap.fe.core/src/sap/fe/core/services/ResourceModelServiceFactory.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/model/resource/ResourceModel"],function(S,a,R){"use strict";var _={};function b(o,e,v){if(e in o){Object.defineProperty(o,e,{value:v,enumerable:true,configurable:true,writable:true});}else{o[e]=v;}return o;}function c(i,C){if(!(i instanceof C)){throw new TypeError("Cannot call a class as a function");}}function d(t,p){for(var i=0;i<p.length;i++){var e=p[i];e.enumerable=e.enumerable||false;e.configurable=true;if("value"in e)e.writable=true;Object.defineProperty(t,e.key,e);}}function f(C,p,s){if(p)d(C.prototype,p);if(s)d(C,s);return C;}function g(s,e){if(typeof e!=="function"&&e!==null){throw new TypeError("Super expression must either be null or a function");}s.prototype=Object.create(e&&e.prototype,{constructor:{value:s,writable:true,configurable:true}});if(e)h(s,e);}function h(o,p){h=Object.setPrototypeOf||function h(o,p){o.__proto__=p;return o;};return h(o,p);}function j(D){var e=m();return function p(){var i=n(D),o;if(e){var N=n(this).constructor;o=Reflect.construct(i,arguments,N);}else{o=i.apply(this,arguments);}return k(this,o);};}function k(s,e){if(e&&(typeof e==="object"||typeof e==="function")){return e;}else if(e!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return l(s);}function l(s){if(s===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return s;}function m(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function n(o){n=Object.setPrototypeOf?Object.getPrototypeOf:function n(o){return o.__proto__||Object.getPrototypeOf(o);};return n(o);}var q=function(e){g(q,e);var i=j(q);function q(){c(this,q);return i.apply(this,arguments);}_.ResourceModelService=q;f(q,[{key:"init",value:function t(){var o=this;var C=this.getContext();var s=C.settings;this.oFactory=C.factory;var B=s.bundles.concat(s.enhanceI18n||[]).map(function(I){return typeof I.isA==="function"&&I.isA("sap.ui.model.resource.ResourceModel")?I.getResourceBundle():{bundleName:I.replace(/\//g,".")};});this.oResourceModel=new R({bundleName:B[0].bundleName,enhanceWith:B.slice(1),async:true});if(C.scopeType==="component"){var p=C.scopeObject;p.setModel(this.oResourceModel,s.modelName);}this.initPromise=this.oResourceModel.getResourceBundle().then(function(u){o.oResourceModel.__bundle=u;return o;});}},{key:"getResourceModel",value:function o(){return this.oResourceModel;}},{key:"getInterface",value:function o(){return this;}},{key:"exit",value:function o(){this.oFactory.removeGlobalInstance();}}]);return q;}(S);_.ResourceModelService=q;var r=function(e){g(r,e);var i=j(r);function r(){var o;c(this,r);for(var p=arguments.length,s=new Array(p),t=0;t<p;t++){s[t]=arguments[t];}o=i.call.apply(i,[this].concat(s));b(l(o),"_oInstances",{});return o;}f(r,[{key:"createInstance",value:function o(s){var K=s.settings.bundles.join(",")+(s.settings.enhanceI18n?","+s.settings.enhanceI18n.join(","):"");if(!this._oInstances[K]){this._oInstances[K]=new q(Object.assign({factory:this},s));}return this._oInstances[K].initPromise;}},{key:"removeGlobalInstance",value:function o(){this._oInstances={};}}]);return r;}(a);return r;},false);
+sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/model/resource/ResourceModel"],function(S,a,R){"use strict";var _={};function b(s,f){if(typeof f!=="function"&&f!==null){throw new TypeError("Super expression must either be null or a function");}s.prototype=Object.create(f&&f.prototype,{constructor:{value:s,writable:true,configurable:true}});if(f)c(s,f);}function c(o,p){c=Object.setPrototypeOf||function c(o,p){o.__proto__=p;return o;};return c(o,p);}var d=function(f){b(d,f);function d(){return f.apply(this,arguments)||this;}_.ResourceModelService=d;var g=d.prototype;g.init=function i(){var h=this;var C=this.getContext();var s=C.settings;this.oFactory=C.factory;var B=s.bundles.concat(s.enhanceI18n||[]).map(function(I){return typeof I.isA==="function"&&I.isA("sap.ui.model.resource.ResourceModel")?I.getResourceBundle():{bundleName:I.replace(/\//g,".")};});this.oResourceModel=new R({bundleName:B[0].bundleName,enhanceWith:B.slice(1),async:true});if(C.scopeType==="component"){var o=C.scopeObject;o.setModel(this.oResourceModel,s.modelName);}this.initPromise=Promise.all([this.oResourceModel.getResourceBundle(),this.oResourceModel._pEnhanced||Promise.resolve()]).then(function(j){h.oResourceModel.__bundle=j[0];return h;});};g.getResourceModel=function h(){return this.oResourceModel;};g.getInterface=function h(){return this;};g.exit=function h(){this.oFactory.removeGlobalInstance();};return d;}(S);_.ResourceModelService=d;var e=function(f){b(e,f);function e(){var h;for(var i=arguments.length,j=new Array(i),k=0;k<i;k++){j[k]=arguments[k];}h=f.call.apply(f,[this].concat(j))||this;h._oInstances={};return h;}var g=e.prototype;g.createInstance=function h(s){var k=s.settings.bundles.join(",")+(s.settings.enhanceI18n?","+s.settings.enhanceI18n.join(","):"");if(!this._oInstances[k]){this._oInstances[k]=new d(Object.assign({factory:this},s));}return this._oInstances[k].initPromise;};g.removeGlobalInstance=function r(){this._oInstances={};};return e;}(a);return e;},false);

package/packages/sap.fe.core/src/sap/fe/core/services/ResourceModelServiceFactory.ts

@@ -41,8 +41,11 @@ export class ResourceModelService extends Service<ResourceModelServiceSettings>
 			oComponent.setModel(this.oResourceModel, mSettings.modelName);
 		}
 
-		this.initPromise = (this.oResourceModel.getResourceBundle() as Promise<ResourceBundle>).then((oBundle: any) => {
-			(this.oResourceModel as any).__bundle = oBundle;
+		this.initPromise = Promise.all([
+			this.oResourceModel.getResourceBundle() as Promise<ResourceBundle>,
+			(this.oResourceModel as any)._pEnhanced || Promise.resolve()
+		]).then((oBundle: any[]) => {
+			(this.oResourceModel as any).__bundle = oBundle[0];
 			return this;
 		});
 	}