@sapui5/sap.rules.ui 1.120.1 → 1.122.0

package/src/sap/rules/ui/providers/ValueHelpProvider.js

@@ -8,9 +8,10 @@
 // ValueList In/Out/InOut parameter to set data)
 // -----------------------------------------------------------------------------
 sap.ui.define([
-	'jquery.sap.global', 'sap/m/List', 'sap/m/PlacementType', 'sap/m/ResponsivePopover', 'sap/m/StandardListItem',
-	'sap/ui/comp/providers/ValueHelpProvider', 'sap/ui/model/json/JSONModel'
-], function(jQuery, List, PlacementType, ResponsivePopover, StandardListItem, ValueListProvider, JSONModel) {
+	'sap/m/List', 'sap/m/ResponsivePopover', 'sap/m/StandardListItem',
+	'sap/ui/comp/providers/ValueHelpProvider', 'sap/ui/model/json/JSONModel',"sap/m/MultiInput"
+	/*'sap/rules/ui/ExpressionAdvanced',*/ /*'sap/rules/ui/DecisionTableCellExpressionAdvanced'*/
+], function(List,ResponsivePopover, StandardListItem, ValueListProvider, JSONModel, MultiInput /*ExpressionAdvanced,*/ /*DecisionTableCellExpressionAdvanced*/) {
 	"use strict";
 
 	/**
@@ -42,7 +43,7 @@ sap.ui.define([
 		// First close the dialog, since when used in an aggregation - some model updates (setting IN/OUT params to ODataModel) destroy this
 		// instance/control!
 		this._onCancel();
-		if (this.oControl instanceof sap.m.MultiInput) {
+		if (this.oControl instanceof MultiInput) {
 			// Clearing typed text if value is not selected from suggestion list but rather from ValueHelpDialog
 			this.oControl.setValue("");
 			this.oControl.setTokens(aTokens);
@@ -74,7 +75,7 @@ sap.ui.define([
 					aRowData.push(oRowData);
 				}
 			}
-            if (this.oControl instanceof sap.rules.ui.ExpressionAdvanced) {
+            if (this.oControl /*instanceof ExpressionAdvanced TODO:Change by Harsh*/) {
                 this.oControl.setTextOnCursor(sKey, this._cursorPosition, this._bReplaceWord, this._businessDataType, this._bAddSpace);
                 // Manually trigger the change event on sapUI5 control since it doesn't do this internally on setValue!
                 this.oControl.fireChange({
@@ -93,7 +94,7 @@ sap.ui.define([
 		ValueListProvider.prototype._onInitialise.apply(this, [oControlEvent]);
 		var oExpressionAdvanced = this.oControl;
         var oPopOver = oExpressionAdvanced.getParent();
-		if (oExpressionAdvanced instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced) {
+		if (oExpressionAdvanced /*instanceof DecisionTableCellExpressionAdvanced TODO:Change by Harsh*/) {
 			oExpressionAdvanced.setBusy(true);
 			oPopOver.setModal(true);
 		} else if (this._popover) {
@@ -105,7 +106,7 @@ sap.ui.define([
 		this.oValueHelpDialog.close();
 		var oExpressionAdvanced = this.oControl;
         var oPopOver = oExpressionAdvanced.getParent();
-		if (oExpressionAdvanced instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced) {
+		if (oExpressionAdvanced /*instanceof DecisionTableCellExpressionAdvanced TODO:Change by Harsh*/) {
 			oPopOver.setModal(false);
 			oExpressionAdvanced.setBusy(false);
 		} else if (this._popover) {

package/src/sap/rules/ui/services/AstExpressionLanguage.js

@@ -6,12 +6,12 @@
  */
 
 // Provides element sap.rules.ui.services.AstExpressionLanguage
-sap.ui.define(['jquery.sap.global',
+sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/rules/ui/library",
 	"sap/rules/ui/ast/parser/bundlelibrary",
 	"sap/rules/ui/ast/model/Token",
-	"sap/rules/ui/parser/infrastructure/util/utilsBase",
+	"sap/rules/ui/ast/util/utilsBase",
 	"sap/rules/ui/ast/autoComplete/AutoComplete",
 	'sap/rules/ui/ast/builder/TermsBuilder',
 	"sap/rules/ui/ast/provider/TermsProvider",
@@ -19,9 +19,11 @@ sap.ui.define(['jquery.sap.global',
 	'sap/rules/ui/ast/builder/FunctionBuilder',
 	"sap/rules/ui/ast/constants/Constants",
 	"sap/ui/core/LocaleData",
-	"sap/ui/core/format/DateFormat"
-], function (jQuery, Element, library, astBundleLibrary, Token,
-	utilsBase, AutoComplete, TermsBuilder, TermsProvider, OperatorBuilder, FunctionBuilder, Constants, LocaleData, DateFormat) {
+	"sap/ui/core/format/DateFormat",
+	"sap/base/i18n/Formatting",
+	"sap/ui/core/Lib"
+], function (Element, library, astBundleLibrary, Token,
+	utilsBase, AutoComplete, TermsBuilder, TermsProvider, OperatorBuilder, FunctionBuilder, Constants, LocaleData, DateFormat, Formatting, coreLib) {
 
 	"use strict";
 	/**
@@ -70,10 +72,10 @@ sap.ui.define(['jquery.sap.global',
 		this._astUtil = this._astBunldeInstance.ASTUtil;
 		this._termsBuilder = this._astBunldeInstance.TermsBuilder;
 		this._termsProvider = this._astBunldeInstance.TermsProvider;
-		this._infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+		this._infraUtils = new utilsBase.utilsBaseLib();
 		this._autoComplete = new AutoComplete();
 		this.attachModelContextChange(this._setDataFromModel.bind(this));
-		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 	};
 
 	/*
@@ -3002,14 +3004,14 @@ sap.ui.define(['jquery.sap.global',
 	};
 
 	AstExpressionLanguage.prototype._getLocaleData = function () {
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		var oLocale = Formatting.getLanguageTag();
 		return LocaleData.getInstance(oLocale);
 	};
 
 	AstExpressionLanguage.prototype._getDateFormatter = function () {
 		var oLocaleData = this._getLocaleData();
 		var datePattern = oLocaleData.getDatePattern('medium');
-		var dateFormatter = sap.ui.core.format.DateFormat.getDateInstance({
+		var dateFormatter = DateFormat.getDateInstance({
 			pattern: datePattern
 		});
 		return dateFormatter;
@@ -3019,7 +3021,7 @@ sap.ui.define(['jquery.sap.global',
 		var oLocaleData = this._getLocaleData();
 		var datePattern = oLocaleData.getDatePattern('medium');
 		var timePattern = oLocaleData.getTimePattern('medium');
-		var dateTimeFormatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+		var dateTimeFormatter = DateFormat.getDateTimeInstance({
 			pattern: datePattern + " " + timePattern
 		});
 		return dateTimeFormatter;

package/src/sap/rules/ui/services/ExpressionLanguage.js

@@ -6,7 +6,7 @@
  */
 
 // Provides element sap.rules.ui.services.ExpressionLanguage
-sap.ui.define(["jquery.sap.global",
+sap.ui.define(["sap/ui/thirdparty/jquery",
 		"sap/ui/core/Element",
 		"sap/rules/ui/parser/businessLanguage/lib/parsingBackendMediator",
 		"sap/rules/ui/parser/ruleBody/lib/ruleServices",
@@ -17,8 +17,14 @@ sap.ui.define(["jquery.sap.global",
 		"sap/ui/core/LocaleData",
 		"sap/rules/ui/parser/resources/vocabulary/lib/constants",
 		"sap/rules/ui/library",
+		"sap/ui/comp/odata/MetadataAnalyser",
+		"sap/base/i18n/Formatting",
+		"sap/ui/model/odata/v2/ODataModel",
+		"sap/ui/model/Filter",
+		"sap/ui/core/Lib",
+
 	],
-	function(jQuery, Element, ParsingBackendMediator, RuleServices, resourcesConvertor, RtsInitiator, responseCollector, Locale, LocaleData, vocabularyConstants) {
+	function(jQuery, Element, ParsingBackendMediator, RuleServices, resourcesConvertor, RtsInitiator, responseCollector, Locale, LocaleData, vocabularyConstants, library, MetadataAnalyser, Formatting, ODataModel, Filter, coreLib) {
 		"use strict";
 		/**
 		 * Constructor for a new ExpressionLanguage element.
@@ -71,7 +77,7 @@ sap.ui.define(["jquery.sap.global",
 
 		ExpressionLanguage.prototype._initLocale = function() {
 
-			var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 
 			var dateFormatted = oLocaleData.getDatePattern('short');
@@ -360,7 +366,7 @@ sap.ui.define(["jquery.sap.global",
 						this._raiseError({}, "value help model is not provided");
 						bOdataModels = false;
 						break;
-					} else if (!(valueHelpInfo[i].model instanceof sap.ui.model.odata.v2.ODataModel)) {
+					} else if (!(valueHelpInfo[i].model instanceof ODataModel)) {
 						// technical value help errors are raised only at validate expression level
 						this._raiseError({}, "value help model is not an oData V2 model");
 						bOdataModels = false;
@@ -397,7 +403,7 @@ sap.ui.define(["jquery.sap.global",
 		ExpressionLanguage.prototype._validateExpression = function(sExpression, eType, bCollection, bToken, flags) {
 			this._initResponseCollector("Parsing");
 
-			var parserResult = this._backendParser.parseExpression(sExpression, sap.rules.ui.BackendParserRequest.Validate, this._runtimeService,
+			var parserResult = this._backendParser.parseExpression(sExpression, library.BackendParserRequest.Validate, this._runtimeService,
 				null, eType, this._vocabularyName, flags);
 
 			var result = {};
@@ -423,7 +429,7 @@ sap.ui.define(["jquery.sap.global",
 		ExpressionLanguage.prototype._raiseError = function(result, errorDescription) {
 			result.status = "Error";
 			result.cursorPosition = -1;
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			var oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 			result.errorDetails = oBundle.getText("valueHelpTechnicalError");
 			window.console.log(errorDescription);
 		};
@@ -463,7 +469,7 @@ sap.ui.define(["jquery.sap.global",
 							this._raiseError(validationResult, "value help model is not provided");
 							bOdataModels = false;
 							break;
-						} else if (!(valueHelpInfo[i].model instanceof sap.ui.model.odata.v2.ODataModel)) {
+						} else if (!(valueHelpInfo[i].model instanceof ODataModel)) {
 							this._raiseError(validationResult, "value help model is not an oData V2 model");
 							bOdataModels = false;
 							break;
@@ -559,14 +565,14 @@ sap.ui.define(["jquery.sap.global",
 
 			var flags = this._buildFlagsObject(null, bCollection, bToken);
 
-			var parserResult = this._backendParser.parseExpression(sExpression, sap.rules.ui.BackendParserRequest.Suggests, this._runtimeService,
+			var parserResult = this._backendParser.parseExpression(sExpression, library.BackendParserRequest.Suggests, this._runtimeService,
 				null, eType, this._vocabularyName, flags, valueListAttribute);
 
 			var VALUE_HELP_TOKEN_TYPE = "valueList";
 
 			for (var i = 0; i < parserResult.suggs.length; i++) {
 				if (parserResult.suggs[i].tokenType === VALUE_HELP_TOKEN_TYPE) {
-					var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+					var oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 					parserResult.suggs[i].text = oBundle.getText("valueHelp");
 				}
 			}
@@ -626,7 +632,7 @@ sap.ui.define(["jquery.sap.global",
 		 **/
 		ExpressionLanguage.prototype.getSuggestionsByCategories = function(sExpression, oFilter) {
 			sExpression = sExpression ? sExpression : "";
-			var suggs = this.getSuggestions(sExpression, sap.rules.ui.ExpressionType.BooleanEnhanced, false).suggs;
+			var suggs = this.getSuggestions(sExpression, library.ExpressionType.BooleanEnhanced, false).suggs;
 			suggs = suggs ? suggs : [];
 
 			if (!oFilter) {
@@ -677,7 +683,7 @@ sap.ui.define(["jquery.sap.global",
 
 			this._initResponseCollector("Parsing");
 
-			var parserResult = this._backendParser.parseExpression(sExpression, sap.rules.ui.BackendParserRequest.GetMetadata, this._runtimeService,
+			var parserResult = this._backendParser.parseExpression(sExpression, library.BackendParserRequest.GetMetadata, this._runtimeService,
 				null, null, this._vocabularyName, null);
 
 			var result = {};
@@ -875,47 +881,47 @@ sap.ui.define(["jquery.sap.global",
 
 			this.filterByTypeMap = {
 				"vocabulary,undefined": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.vocabulary
+					tokenType: library.ExpressionTokenType.vocabulary
 				}],
 				"reservedword,comparisonOp": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.comparisonOp
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.comparisonOp
 				}],
 				"reservedword,comparisonBetweenOp": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.comparisonBetweenOp
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.comparisonBetweenOp
 				}],
 				"reservedword,comparisonExistOp": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.comparisonExistOp
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.comparisonExistOp
 				}],
 				"reservedword,UOM": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.UOM
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.UOM
 				}],
 				"reservedword,function": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.func
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.func
 				}],
 				"reservedword,conjunctionOp": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.conjunctionOp
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.conjunctionOp
 				}],
 				"reservedword,value": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.value
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.value
 				}],
 				"reservedword,null": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
+					tokenType: library.ExpressionTokenType.reservedWord,
 					tokenCategory: null
 				}],
 				"constant.dynamic": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.constant,
-					tokenCategory: sap.rules.ui.ExpressionCategory.dynamic
+					tokenType: library.ExpressionTokenType.constant,
+					tokenCategory: library.ExpressionCategory.dynamic
 				}],
 				"constant.fixed": [{
-					tokenType: sap.rules.ui.ExpressionTokenType.constant,
-					tokenCategory: sap.rules.ui.ExpressionCategory.fixed
+					tokenType: library.ExpressionTokenType.constant,
+					tokenCategory: library.ExpressionCategory.fixed
 				}]
 			};
 		};
@@ -1036,13 +1042,13 @@ sap.ui.define(["jquery.sap.global",
 
 			for (var i = 0; i < aTokens.length; i++) {
 				var token = aTokens[i];
-				if (token.tokenType === sap.rules.ui.ExpressionTokenType.whitespace) {
+				if (token.tokenType === library.ExpressionTokenType.whitespace) {
 					continue;
-				} else if (token.tokenType !== sap.rules.ui.ExpressionTokenType.vocabulary) {
+				} else if (token.tokenType !== library.ExpressionTokenType.vocabulary) {
 					tokenGroups.push(token);
 					previousType = token.tokenType;
 				} else {
-					if (previousType !== sap.rules.ui.ExpressionTokenType.vocabulary) {
+					if (previousType !== library.ExpressionTokenType.vocabulary) {
 						tokenGroups.push(token);
 					} else {
 						tokenGroups[tokenGroups.length - 1].token += " " + token.token;
@@ -1068,8 +1074,8 @@ sap.ui.define(["jquery.sap.global",
 			for (i = aTokens.tokens.length - 1; i >= 0; i--) {
 				if (aTokens.tokens[i].info) {
 					var oTokenInfo = aTokens.tokens[i].info;
-					if (oTokenInfo.category === sap.rules.ui.ExpressionCategory.comparisonOp || oTokenInfo.category === sap.rules.ui.ExpressionCategory.comparisonBetweenOp ||
-						oTokenInfo.category === sap.rules.ui.ExpressionCategory.comparisonExistOp) {
+					if (oTokenInfo.category === library.ExpressionCategory.comparisonOp || oTokenInfo.category === library.ExpressionCategory.comparisonBetweenOp ||
+						oTokenInfo.category === library.ExpressionCategory.comparisonExistOp) {
 						compToken = aTokens.tokens[i];
 						break;
 					}
@@ -1130,7 +1136,7 @@ sap.ui.define(["jquery.sap.global",
 
 		ExpressionLanguage.prototype._getBasicSuggestions = function(expression, ePart) {
 			if (!ePart) {
-				ePart = sap.rules.ui.SuggestionsPart.all;
+				ePart = library.SuggestionsPart.all;
 			}
 			var oTokens = this.validateExpression(expression); //get tokens for getting sub expression
 
@@ -1139,7 +1145,7 @@ sap.ui.define(["jquery.sap.global",
 			var aExpression = this._getSubExpressions(oTokens); // get the sub expression
 
 			var sLeftExpression = (aExpression[0] && aExpression[0].exp) ? aExpression[0].exp : "";
-			if (ePart === sap.rules.ui.SuggestionsPart.all) { // pus the left suggestions
+			if (ePart === library.SuggestionsPart.all) { // pus the left suggestions
 				oSuggestions.push(this._getLeftSuggestions("", sLeftExpression)); // push the left suggestion
 
 				if (sLeftExpression === "") { //if we have only left side
@@ -1149,7 +1155,7 @@ sap.ui.define(["jquery.sap.global",
 
 			var sCompExpression = (aExpression[1] && aExpression[1].exp) ? aExpression[1].exp : "";
 			var sCompType = "" || (aExpression[1] && aExpression[1].type);
-			if (ePart === sap.rules.ui.SuggestionsPart.all || ePart === sap.rules.ui.SuggestionsPart.compPart) {
+			if (ePart === library.SuggestionsPart.all || ePart === library.SuggestionsPart.compPart) {
 				oSuggestions.push(this._getCompSuggestions(sLeftExpression, sCompExpression, sCompType)); // push the comp suggestion
 
 				if (aExpression.length === 1) { //if we have only left side and comp
@@ -1157,9 +1163,9 @@ sap.ui.define(["jquery.sap.global",
 				}
 			}
 
-			if (ePart === sap.rules.ui.SuggestionsPart.all || ePart === sap.rules.ui.SuggestionsPart.rightPart) {
+			if (ePart === library.SuggestionsPart.all || ePart === library.SuggestionsPart.rightPart) {
 				var sRightExpression = (aExpression[2] && aExpression[2].exp) ? aExpression[2].exp : "";
-				sCompType = (ePart === sap.rules.ui.SuggestionsPart.all) ? oSuggestions[1].type : null;
+				sCompType = (ePart === library.SuggestionsPart.all) ? oSuggestions[1].type : null;
 				var oRightSuggestions = this._getRightSuggestions(sLeftExpression, sCompExpression, sRightExpression, sCompType, oTokens); // get the right suggestionS
 
 				oSuggestions.push.apply(oSuggestions, oRightSuggestions);
@@ -1172,7 +1178,7 @@ sap.ui.define(["jquery.sap.global",
 			var oSuggestion = this._createEmptySuggestion(1)[0]; //the return suggestion
 
 			var oFilters = [{
-				tokenType: sap.rules.ui.ExpressionTokenType.vocabulary
+				tokenType: library.ExpressionTokenType.vocabulary
 			}]; //the filter for getSuggestionsByCategories
 
 			var oSuggestions = this.getSuggestionsByCategories(sEmptyString, oFilters);
@@ -1183,7 +1189,7 @@ sap.ui.define(["jquery.sap.global",
 
 			oSuggestion.currentValue = currentValue; //put current value
 
-			oSuggestion.tokenCategory = sap.rules.ui.ExpressionTokenType.vocabulary;
+			oSuggestion.tokenCategory = library.ExpressionTokenType.vocabulary;
 
 			return oSuggestion;
 		};
@@ -1193,11 +1199,11 @@ sap.ui.define(["jquery.sap.global",
 			var oSuggestion = this._createEmptySuggestion(1)[0]; //the return suggestion
 
 			var oFilters = [{
-				tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-				tokenCategory: sap.rules.ui.ExpressionCategory.comparisonOp
+				tokenType: library.ExpressionTokenType.reservedWord,
+				tokenCategory: library.ExpressionCategory.comparisonOp
 			}, {
-				tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-				tokenCategory: sap.rules.ui.ExpressionCategory.comparisonBetweenOp
+				tokenType: library.ExpressionTokenType.reservedWord,
+				tokenCategory: library.ExpressionCategory.comparisonBetweenOp
 			}]; //the filter for getSuggestionsByCategories
 
 			var oSuggestions = this.getSuggestionsByCategories(sLeftSide, oFilters);
@@ -1225,13 +1231,13 @@ sap.ui.define(["jquery.sap.global",
 				sCompType = this._getCompType(sComp); //get comparison type (can't get expressionMetadata for empty string)
 			}
 			switch (sCompType) {
-				case sap.rules.ui.ExpressionCategory.comparisonOp: //in case simple comparison
+				case library.ExpressionCategory.comparisonOp: //in case simple comparison
 					aSuggestion = this._getRightForComparisonOp(sLeftBusinessDataType, sLefAndCompExprerssion, currentValue);
 					break;
-				case sap.rules.ui.ExpressionCategory.comparisonBetweenOp: //in case simple comparison
+				case library.ExpressionCategory.comparisonBetweenOp: //in case simple comparison
 					aSuggestion = this._geRightForBetweenOp(sLeftBusinessDataType, sLefAndCompExprerssion, currentValue);
 					break;
-				case sap.rules.ui.ExpressionCategory.comparisonExistOp: //in case exist comparison
+				case library.ExpressionCategory.comparisonExistOp: //in case exist comparison
 					//aSuggestion = this._geRightForExistOp(sLeftBusinessDataType, sLefAndCompExprerssion, currentValue, oTokens);
 					break;
 				default:
@@ -1250,7 +1256,7 @@ sap.ui.define(["jquery.sap.global",
 			var oFilters;
 			var i;
 			oFilters = [{
-				tokenType: sap.rules.ui.ExpressionTokenType.valueList
+				tokenType: library.ExpressionTokenType.valueList
 			}];
 			aSuggestions = this.getSuggestionsByCategories(sLefAndCompExprerssion + " ", oFilters);
 			//remove extra spaces before and after string [duplicate]
@@ -1266,11 +1272,11 @@ sap.ui.define(["jquery.sap.global",
 				return oSuggestion;
 			}
 
-			if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.TimeSpan) { // sLeftBusinessDataType = TimeSpan (duration)
+			if (sLeftBusinessDataType === library.ExpressionType.TimeSpan) { // sLeftBusinessDataType = TimeSpan (duration)
 				oSuggestion.push.apply(oSuggestion, this._createEmptySuggestion(1)); // add more suggestion {value}
 				oFilters = [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.UOM
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.UOM
 				}];
 
 				var filtered = this._splitStringBySeperator(currentValue, " "); // remove space for example "3 days" --> ["3", "days"]
@@ -1283,13 +1289,13 @@ sap.ui.define(["jquery.sap.global",
 					oSuggestion[1].sugg.push(aSuggestions[i].text);
 				}
 
-			} else if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.Date) { // sLeftBusinessDataType = Date (birthdate)
+			} else if (sLeftBusinessDataType === library.ExpressionType.Date) { // sLeftBusinessDataType = Date (birthdate)
 				oFilters = [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.value
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.value
 				}, {
-					tokenType: sap.rules.ui.ExpressionTokenType.constant,
-					tokenCategory: sap.rules.ui.ExpressionCategory.dynamic
+					tokenType: library.ExpressionTokenType.constant,
+					tokenCategory: library.ExpressionCategory.dynamic
 				}];
 
 				aSuggestions = this.getSuggestionsByCategories(sLefAndCompExprerssion + " ", oFilters);
@@ -1309,8 +1315,8 @@ sap.ui.define(["jquery.sap.global",
 				var aTokens = this.validateExpression(currentValue).tokens;
 				if (aTokens) {
 					for (var i = 0; i < aTokens.length; i++) {
-						if (aTokens[i].info && (aTokens[i].info.category === sap.rules.ui.ExpressionCategory.comparisonOp || aTokens[i].info.category ===
-								sap.rules.ui.ExpressionCategory.comparisonBetweenOp || aTokens[i].info.category === sap.rules.ui.ExpressionCategory.comparisonExistOp
+						if (aTokens[i].info && (aTokens[i].info.category === library.ExpressionCategory.comparisonOp || aTokens[i].info.category ===
+								library.ExpressionCategory.comparisonBetweenOp || aTokens[i].info.category === library.ExpressionCategory.comparisonExistOp
 							)) {
 							currentValue = "";
 							return;
@@ -1324,7 +1330,7 @@ sap.ui.define(["jquery.sap.global",
 			var filtered, oFilters, i;
 
 			oSuggestion[0].BDT = sLeftBusinessDataType;
-			if (sLeftBusinessDataType !== sap.rules.ui.ExpressionType.TimeSpan && sLeftBusinessDataType !== sap.rules.ui.ExpressionType.Date) {
+			if (sLeftBusinessDataType !== library.ExpressionType.TimeSpan && sLeftBusinessDataType !== library.ExpressionType.Date) {
 				filtered = this._getRightExpressionsForTimeStamp(currentValue); //get expression for non Timespan or Date right side
 			} else {
 				filtered = this._splitStringBySeperator(currentValue, " "); // remove space, for example "3 days to 10 years" --> ["3", "days", "to", "10", "years"]
@@ -1333,14 +1339,14 @@ sap.ui.define(["jquery.sap.global",
 				}*/
 			}
 
-			if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.TimeSpan) { // sLeftBusinessDataType = TimeSpan (for example duration)
+			if (sLeftBusinessDataType === library.ExpressionType.TimeSpan) { // sLeftBusinessDataType = TimeSpan (for example duration)
 
 				oSuggestion.push.apply(oSuggestion, this._createEmptySuggestion(4)); //create new suggestions = [{units} To {value units}]
 				oSuggestion[3].BDT = sLeftBusinessDataType;
 
 				oFilters = [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.UOM
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.UOM
 				}];
 
 				aSuggestions = this.getSuggestionsByCategories(sLefAndCompExprerssion + " 5", oFilters);
@@ -1349,16 +1355,16 @@ sap.ui.define(["jquery.sap.global",
 					oSuggestion[4].sugg.push(aSuggestions[i].text);
 				}
 
-			} else if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.Date) { // sLeftBusinessDataType = Date (for example birthdate)
+			} else if (sLeftBusinessDataType === library.ExpressionType.Date) { // sLeftBusinessDataType = Date (for example birthdate)
 				oSuggestion.push.apply(oSuggestion, this._createEmptySuggestion(2)); //create new suggestions = [To {date}]
 				oSuggestion[2].BDT = sLeftBusinessDataType;
 
 				oFilters = [{
-					tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-					tokenCategory: sap.rules.ui.ExpressionCategory.value
+					tokenType: library.ExpressionTokenType.reservedWord,
+					tokenCategory: library.ExpressionCategory.value
 				}, {
-					tokenType: sap.rules.ui.ExpressionTokenType.constant,
-					tokenCategory: sap.rules.ui.ExpressionCategory.dynamic
+					tokenType: library.ExpressionTokenType.constant,
+					tokenCategory: library.ExpressionCategory.dynamic
 				}];
 
 				aSuggestions = this.getSuggestionsByCategories(sLefAndCompExprerssion + " ", oFilters);
@@ -1371,7 +1377,7 @@ sap.ui.define(["jquery.sap.global",
 				oSuggestion.push.apply(oSuggestion, this._createEmptySuggestion(2)); //create new suggestions = [To {value}]
 				oSuggestion[2].BDT = sLeftBusinessDataType;
 				oFilters = [{
-					tokenType: sap.rules.ui.ExpressionTokenType.valueList
+					tokenType: library.ExpressionTokenType.valueList
 				}];
 				aSuggestions = this.getSuggestionsByCategories(sLefAndCompExprerssion + " ", oFilters);
 				//remove extra spaces before and after string [duplicate]
@@ -1387,14 +1393,14 @@ sap.ui.define(["jquery.sap.global",
 			}
 
 			for (i = 0; i < oSuggestion.length; i++) { //put value in suggestions and set the 'to' suggestion
-				if (filtered[i] === "to" || (i === 2 && sLeftBusinessDataType === sap.rules.ui.ExpressionType.TimeSpan) //logic for putting the 'to'\'and' at currentValue
-					|| (i === 1 && sLeftBusinessDataType === sap.rules.ui.ExpressionType.Date) || ((i === 1 && sLeftBusinessDataType !== sap.rules.ui.ExpressionType
-						.Date) && (i === 1 && sLeftBusinessDataType != sap.rules.ui.ExpressionType.TimeSpan))) {
+				if (filtered[i] === "to" || (i === 2 && sLeftBusinessDataType === library.ExpressionType.TimeSpan) //logic for putting the 'to'\'and' at currentValue
+					|| (i === 1 && sLeftBusinessDataType === library.ExpressionType.Date) || ((i === 1 && sLeftBusinessDataType !== library.ExpressionType
+						.Date) && (i === 1 && sLeftBusinessDataType != library.ExpressionType.TimeSpan))) {
 					oSuggestion[i].tokenCategory = "reservedword.undefined";
 					oSuggestion[i].currentValue = (filtered[i] === "to" || filtered[i] === "and") ? filtered[i] : "to";
-				} else if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.Date) {
+				} else if (sLeftBusinessDataType === library.ExpressionType.Date) {
 					oSuggestion[i].currentValue = jQuery.trim(filtered[i] || "''"); //remove extra spaces before and after string [duplicate]
-				} else if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.TimeSpan) {
+				} else if (sLeftBusinessDataType === library.ExpressionType.TimeSpan) {
 					oSuggestion[i].currentValue = jQuery.trim(filtered[i] || "''"); //remove extra spaces before and after string [duplicate]
 				} else {
 					oSuggestion[i].currentValue = jQuery.trim(filtered[i]); //remove extra spaces before and after string [duplicate]
@@ -1407,10 +1413,10 @@ sap.ui.define(["jquery.sap.global",
 			var oSuggestion = this._createEmptySuggestion(1); //the return right suggestions
 			oSuggestion[0].BDT = sLeftBusinessDataType;
 			var aResults;
-			if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.TimeSpan) {
+			if (sLeftBusinessDataType === library.ExpressionType.TimeSpan) {
 				aResults = aTokens.tokens.filter(function(obj) { //comp expression
 					if (obj.info) {
-						return obj.info.category === sap.rules.ui.ExpressionCategory.UOM || obj.tokenType === sap.rules.ui.ExpressionTokenType.constant;
+						return obj.info.category === library.ExpressionCategory.UOM || obj.tokenType === library.ExpressionTokenType.constant;
 					}
 
 					return null;
@@ -1418,10 +1424,10 @@ sap.ui.define(["jquery.sap.global",
 				aResults.forEach(function(value, i) {
 
 				});
-			} else if (sLeftBusinessDataType === sap.rules.ui.ExpressionType.Date) {
+			} else if (sLeftBusinessDataType === library.ExpressionType.Date) {
 				aResults = aTokens.tokens.filter(function(obj) { //comp expression
 					if (obj.info) {
-						return obj.info.category === sap.rules.ui.ExpressionCategory.value;
+						return obj.info.category === library.ExpressionCategory.value;
 					}
 
 					return null;
@@ -1598,7 +1604,7 @@ sap.ui.define(["jquery.sap.global",
 				var _oModel = _oValueHelpInfo.model;
 				var _sAnnotationPath = _oValueHelpInfo.metadata.propertyPath;
 
-				var oMetadataAnalyzer = new sap.ui.comp.odata.MetadataAnalyser(_oModel);
+				var oMetadataAnalyzer = new MetadataAnalyser(_oModel);
 				var oValueListAnnotation = oMetadataAnalyzer.getValueListAnnotation(_sAnnotationPath);
 				if (!oValueListAnnotation.primaryValueListAnnotation) {
 					_oValueHelpInfo.deferred.reject("Failed to read value help annotation");
@@ -1612,13 +1618,13 @@ sap.ui.define(["jquery.sap.global",
 				if (key.length > 1) {
 					for (var j = 0; j < key.length; j++) {
 						if (key[j] !== keyField) {
-							filters.push(new sap.ui.model.Filter(key[j], "EQ", null));
+							filters.push(new Filter(key[j], "EQ", null));
 						}
 					}
 				}
 
 				for (var i = 0; i < _oValueHelpInfo.values.length; i++) {
-					filters.push(new sap.ui.model.Filter(keyField, "EQ", _oValueHelpInfo.values[i]));
+					filters.push(new Filter(keyField, "EQ", _oValueHelpInfo.values[i]));
 				}
 				var valueHelpId = _oValueHelpInfo.id;
 				_oModel.read(collectionPath, {

package/src/sap/rules/ui/type/DecisionTableCell.js

@@ -6,10 +6,10 @@
  */
 
 // Provides control sap.rules.ui.
-sap.ui.define(["jquery.sap.global"], function(jQuery) {
+sap.ui.define(["sap/rules/ui/type/ExpressionAbs"], function(ExpressionAbs) {
 	"use strict";
 
-	var DecisionTableCell = sap.rules.ui.type.ExpressionAbs.extend("sap.rules.ui.type.DecisionTableCell", {
+	var DecisionTableCell = ExpressionAbs.extend("sap.rules.ui.type.DecisionTableCell", {
 
 		/**
 		 * format decision table cell value to display value

package/src/sap/rules/ui/type/DecisionTableHeader.js

@@ -6,12 +6,12 @@
  */
 
 // Provides control sap.rules.ui.
-sap.ui.define(["jquery.sap.global"
-], function(jQuery) {
+sap.ui.define(["sap/rules/ui/type/ExpressionAbs"
+], function(ExpressionAbs) {
 	"use strict";
 
 
-	var DecisionTableHeader = sap.rules.ui.type.ExpressionAbs.extend("sap.rules.ui.type.DecisionTableHeader", {
+	var DecisionTableHeader = ExpressionAbs.extend("sap.rules.ui.type.DecisionTableHeader", {
             /**
 			 * format decision table header value to display value and concatinate with fixed operator
 			 * @param {string[]} aHeader - Decision Table header information [Expression, FixedOperator]

package/src/sap/rules/ui/type/Expression.js

@@ -6,7 +6,7 @@
  */
 
 // Provides control sap.rules.ui.
-sap.ui.define(["jquery.sap.global", "sap/rules/ui/type/ExpressionAbs"], function(jQuery, ExpressionAbs) {
+sap.ui.define(["sap/rules/ui/type/ExpressionAbs", "sap/rules/ui/library",], function(ExpressionAbs,library) {
 	"use strict";
 
 	var ExpressionType = ExpressionAbs.extend(
@@ -18,7 +18,7 @@ sap.ui.define(["jquery.sap.global", "sap/rules/ui/type/ExpressionAbs"], function
 			 */
 			formatValue: function(sValues) {
 				var sExpression = sValues;
-				var sExpressionType = sap.rules.ui.ExpressionType.All;
+				var sExpressionType = library.ExpressionType.All;
 				if (!this.expressionLanguage) {
 					return sExpression;
 				}
@@ -38,7 +38,7 @@ sap.ui.define(["jquery.sap.global", "sap/rules/ui/type/ExpressionAbs"], function
 			 * @returns {string} converted expression to model value
 			 */
 			parseValue: function(sExpression) {
-				var sExpressionType = sap.rules.ui.ExpressionType.All;
+				var sExpressionType = library.ExpressionType.All;
 
 				if (!this.expressionLanguage) {
 					return sExpression;