@refinitiv-ui/efx-grid 6.0.91 → 6.0.92

package/lib/tr-grid-util/es6/formula/Engine.js

@@ -13,7 +13,7 @@ import EventDispatcher from "../EventDispatcher.js";
 /** @constructor
 * @extends {EventDispatcher}
 */
-var Engine = function() {
+let Engine = function() {
 	this._context = {};
 	Engine._addContext(this._context, Engine.getContext()); // Clone context for supporting more than one Engine in App
 	this._context["_DATA"] = this._getData.bind(this);  // _DATA is an internal context used for getting cached data
@@ -62,7 +62,7 @@ Engine._context = null; // Static variable for all instances
 * @return {!Object.<string, *>}
 */
 Engine.getContext = function() {
-	var context = Engine._context;
+	let context = Engine._context;
 	if(!context) {
 		context = {};
 		Engine._context = context;
@@ -82,7 +82,7 @@ Engine.getContext = function() {
 * @param {Object.<string, Function>} funcs
 */
 Engine.addContext = function(funcs) {
-	var context = Engine.getContext();
+	let context = Engine.getContext();
 	Engine._addContext(context, funcs);
 };
 /** @private
@@ -90,7 +90,7 @@ Engine.addContext = function(funcs) {
 * @param {Object.<string, Function>} funcs
 */
 Engine._addContext = function(context, funcs) {
-	for(var key in funcs) {
+	for(let key in funcs) {
 		context[key] = funcs[key];
 	}
 };
@@ -121,7 +121,7 @@ Engine.prototype.setFormulaDataSetter = function(func) {
 */
 Engine.prototype._defaultFormulaDataSetter = function(formula, result, rowData, opt_changes) {
 	if(result !== "...") {			// Data update is pending - do not erase previous value
-		var alias = formula.getAlias();
+		let alias = formula.getAlias();
 		rowData[alias] = result;
 		if (opt_changes) {
 			opt_changes[alias] = result;
@@ -134,7 +134,7 @@ Engine.prototype._defaultFormulaDataSetter = function(formula, result, rowData,
 * @return {!Formula}
 */
 Engine.prototype.addFormula = function(userInput) {
-	var f;
+	let f;
 	if(userInput instanceof Formula){
 		f = userInput;
 	} else {
@@ -155,7 +155,7 @@ Engine.prototype.addFormula = function(userInput) {
 * @return {!Formula}
 */
 Engine.prototype.mockFormula = function(userInput) {
-	var f;
+	let f;
 	if(userInput instanceof Formula){
 		f = new Formula(userInput.getInput(), this._context);
 	} else {
@@ -173,7 +173,7 @@ Engine.prototype.removeFormula = function(ref) {
 		ref = this._formulas.indexOf(/** @type{Formula} */(ref));
 	}
 
-	var f;
+	let f;
 	if(typeof ref === "number") {
 		f = this._formulas[ref];
 		if(f) {
@@ -187,7 +187,7 @@ Engine.prototype.removeFormula = function(ref) {
 	} else if (typeof ref === "string") {
 		f = this._formulaMap[ref];
 		if(f) {
-			var at = this._formulas.indexOf(f);
+			let at = this._formulas.indexOf(f);
 			if(at >= 0) {
 				this._formulas.splice(at, 1);
 				delete this._formulaMap[ref];
@@ -202,8 +202,8 @@ Engine.prototype.removeFormula = function(ref) {
 /** @public
 */
 Engine.prototype.removeAllFormulas = function() {
-	var formulas = this._formulas;
-	for(var i = formulas.length; --i >= 0;) {
+	let formulas = this._formulas;
+	for(let i = formulas.length; --i >= 0;) {
 		delete this._referenceMap[formulas[i].getReference()];
 	}
 
@@ -216,7 +216,7 @@ Engine.prototype.removeAllFormulas = function() {
 * @return {Formula}
 */
 Engine.prototype.getFormula = function(opt_ref) {
-	var f;
+	let f;
 	if(typeof opt_ref === "number") {
 		f = this._formulas[opt_ref];
 	} else {
@@ -229,9 +229,9 @@ Engine.prototype.getFormula = function(opt_ref) {
 * @return {Formula}
 */
 Engine.prototype.getFormulaByExpression = function(exp) {
-	var len = this._formulas.length;
-	for(var i = 0; i < len; ++i) {
-		var f = this._formulas[i];
+	let len = this._formulas.length;
+	for(let i = 0; i < len; ++i) {
+		let f = this._formulas[i];
 		if(f.getInput() === exp) {
 			return f;
 		}
@@ -261,8 +261,8 @@ Engine.prototype.getFormulaCount = function() {
  * @return {string}
  */
 Engine.prototype._generateUniqueReference = function(ref) {
-	var uniRef = ref;
-	var index = 0;
+	let uniRef = ref;
+	let index = 0;
 	while(this._referenceMap[uniRef] != null) {
 		uniRef = ref + "_" + ++index;
 	}
@@ -278,9 +278,9 @@ Engine.prototype.addReference = function(src, ref) {
 		return "";
 	}
 	ref = this._generateUniqueReference(ref);
-	var colName = "";
+	let colName = "";
 	if (src instanceof Formula) {
-		var res = this._setFormulaReference(src, ref);
+		let res = this._setFormulaReference(src, ref);
 		if (!res) {
 			return "";
 		}
@@ -303,16 +303,16 @@ Engine.prototype.renameReference = function(oldRef, newRef) {
 	if (!oldRef || this._referenceMap[oldRef] == null || oldRef === newRef) {
 		return false;
 	}
-	var f = this._formulaMap[oldRef];
+	let f = this._formulaMap[oldRef];
 	if (f && !this.isValidReference(f, newRef)) {
 		return false;
 	}
 
 	// Change the reference being used in all formulas
-	for (var i = this._formulas.length; --i >= 0;) {
-		var formula = this._formulas[i];
+	for (let i = this._formulas.length; --i >= 0;) {
+		let formula = this._formulas[i];
 		if (formula.changeField(oldRef, newRef)) {
-			var ref = formula.getReference();
+			let ref = formula.getReference();
 			if (ref) {
 				this._referenceMap[ref] = formula.getAlias();
 			}
@@ -335,7 +335,7 @@ Engine.prototype.removeReference = function(ref) {
 	if (!ref || this._referenceMap[ref] == null) {
 		return false;
 	}
-	var f = this._formulaMap[ref];
+	let f = this._formulaMap[ref];
 	if (f != null) {
 		f._setReference("");
 		delete this._formulaMap[ref];
@@ -362,10 +362,10 @@ Engine.prototype._getData = function(refName, rowData) {
 	if (!this._rowData) {
 		return null;
 	}
-	var value = this._rowData[this.resolveReference(refName)];
+	let value = this._rowData[this.resolveReference(refName)];
 
 	if (value) {
-		var num = Number(value);
+		let num = Number(value);
 
 		if (num === num) { // Convert text to number for formula calculation
 			value = num;
@@ -384,7 +384,7 @@ Engine.prototype._setFormulaReference = function(formula, ref) {
 		console.warn("Duplicate formula reference detected.");
 		return false;
 	}
-	var prevRef = formula.getReference();
+	let prevRef = formula.getReference();
 	if(prevRef === ref) {
 		return false;
 	}
@@ -393,7 +393,7 @@ Engine.prototype._setFormulaReference = function(formula, ref) {
 		this._formulaMap[ref] = formula;
 	}
 	formula._setReference(ref);
-	var dependencies = this._sortDependencies(this._formulas, this._formulaMap);
+	let dependencies = this._sortDependencies(this._formulas, this._formulaMap);
 	if (!dependencies) { // Circular dependencies detected
 		formula._setReference(prevRef);
 		delete this._formulaMap[ref];
@@ -413,17 +413,17 @@ Engine.prototype._setFormulaReference = function(formula, ref) {
 Engine.prototype.calculate = function(rowData, opt_changes) {
 	this._rowData = rowData; // Cache for resolving reference
 
-	var len =  this._formulas.length;
-	for(var i = 0; i < len; ++i) { // This must be done in normal order
-		var f = this._formulas[i];
+	let len =  this._formulas.length;
+	for(let i = 0; i < len; ++i) { // This must be done in normal order
+		let f = this._formulas[i];
 		// if opt_changes is undefined then recalculate all function
 		// if opt_changes is exist then check formula need to recalculate
 		if (opt_changes) {
 			// Don't recalculate formula if fields are not changed and not update from realtime formula
-			var needRecalculate = (opt_changes[f.getAlias()] != null); // Update from realtime formula
+			let needRecalculate = (opt_changes[f.getAlias()] != null); // Update from realtime formula
 			if (!needRecalculate) {
-				var fields = f.getFieldNames();
-				for (var j = fields.length; --j >= 0;) {
+				let fields = f.getFieldNames();
+				for (let j = fields.length; --j >= 0;) {
 					if (opt_changes[this.resolveReference(fields[j])] != null) {
 						needRecalculate = true;
 						break;
@@ -435,7 +435,7 @@ Engine.prototype.calculate = function(rowData, opt_changes) {
 			}
 		}
 
-		var result = f.calculate(rowData);
+		let result = f.calculate(rowData);
 		this._setData(f, result, rowData, opt_changes);
 	}
 
@@ -456,15 +456,15 @@ Engine.prototype.isValidReference = function(formula, ref) {
 		return false; // duplicate reference detected.
 	}
 
-	var prevRef = formula.getReference();
-	var parentChildrenMap = this._createParentChildrenMap(this._formulas);
+	let prevRef = formula.getReference();
+	let parentChildrenMap = this._createParentChildrenMap(this._formulas);
 
 	// Replace the old reference with new reference
 	if (prevRef) {
 		delete parentChildrenMap[prevRef];
-		for (var parent in parentChildrenMap) {
-			var children = parentChildrenMap[parent];
-			var index = children.indexOf(prevRef);
+		for (let parent in parentChildrenMap) {
+			let children = parentChildrenMap[parent];
+			let index = children.indexOf(prevRef);
 			if (index !== -1) {
 				children = children.slice(0); // Clone. The orignal children is an array in formula object. We should not modify it.
 				children.splice(index, 1);
@@ -487,25 +487,25 @@ Engine.prototype.isValidReference = function(formula, ref) {
  * @return {Array.<Formula>}
  */
 Engine.prototype._sortDependencies = function(formulas, formulaMap) {
-	var formulaCount = formulas.length;
+	let formulaCount = formulas.length;
 	if (formulaCount === 1) {
 		return formulas;
 	}
 
-	var parentChildrenMap = this._createParentChildrenMap(formulas);
-	var sortedParents = this._sortParentChildrenMap(parentChildrenMap);
+	let parentChildrenMap = this._createParentChildrenMap(formulas);
+	let sortedParents = this._sortParentChildrenMap(parentChildrenMap);
 	if (!sortedParents) {
 		return null;
 	}
 
-	var noDepFormulas = formulas.filter(function(f) {
+	let noDepFormulas = formulas.filter(function(f) {
 		return (!f.getReference());
 	});
 
-	var results = [];
+	let results = [];
 	if (formulaMap) {
-		for(var i = sortedParents.length; --i >= 0;) {
-			var f = formulaMap[sortedParents[i]];
+		for(let i = sortedParents.length; --i >= 0;) {
+			let f = formulaMap[sortedParents[i]];
 			if(f) {
 				results.push(f); // The one in the back will be executed last
 			}
@@ -523,10 +523,10 @@ Engine.prototype._sortDependencies = function(formulas, formulaMap) {
  * @return {Object.<string, Array.<string>>}
  */
 Engine.prototype._createParentChildrenMap = function(formulas) {
-	var i, parentChildrenMap = {};
+	let i, parentChildrenMap = {};
 	for (i = formulas.length; --i >= 0;) {
-		var f = formulas[i];
-		var ref = f.getReference();
+		let f = formulas[i];
+		let ref = f.getReference();
 		if (ref) {
 			parentChildrenMap[ref] = f.getFieldNames();
 		}
@@ -540,20 +540,20 @@ Engine.prototype._createParentChildrenMap = function(formulas) {
  * @return {Array.<string>}
  */
 Engine.prototype._sortParentChildrenMap = function(ParentChildrenMap) {
-	var edges = {};
-	var i, child, children, childCount;
-	var parent;
+	let edges = {};
+	let i, child, children, childCount;
+	let parent;
 	for (parent in ParentChildrenMap) {
 		children = ParentChildrenMap[parent];
 		childCount = children.length;
-		for(var j = 0; j < childCount; ++j) {
+		for(let j = 0; j < childCount; ++j) {
 			child = children[j];
 			edges[child] = (edges[child] + 1) || 1;
 		}
 	}
 
 	// Collect nodes with no edge (root nodes)
-	var rootNodes = [];
+	let rootNodes = [];
 	for(parent in ParentChildrenMap) {
 		if(!edges[parent]) {
 			rootNodes.push(parent);
@@ -561,7 +561,7 @@ Engine.prototype._sortParentChildrenMap = function(ParentChildrenMap) {
 	}
 
 	// Navigate from root nodes down to all the leaf nodes
-	var sortedParents = [];
+	let sortedParents = [];
 	while(rootNodes.length > 0) {
 		parent = rootNodes.shift();
 		sortedParents.push(parent);

package/lib/tr-grid-util/es6/formula/Formula.js

@@ -11,7 +11,7 @@ import EventDispatcher from "../EventDispatcher.js";
 * @param {string=} expression
 * @param {Object=} context
 */
-var Formula = function(expression, context) {
+let Formula = function(expression, context) {
 	this._input = expression || "";
 	if(context != null) {
 		this._context = context;
@@ -172,7 +172,7 @@ Formula.prototype.dispose = function() {
 		this._rtService["dispose"]();
 		this._rtService = null;
 	}
-	for(var serviceName in this._intervalServices) {
+	for(let serviceName in this._intervalServices) {
 		// No need to dispose the static object
 		this._intervalServices[serviceName]["removeEventListener"]("dataChanged", this.dispatchDataChanged);
 	}
@@ -187,7 +187,7 @@ Formula.prototype.dispose = function() {
 Formula.prototype.calculate = function(rowData) {
 	if (this._main) {
 		this._dataLastError = ""; // Clear last realtime error message
-		var res = this._main(rowData);
+		let res = this._main(rowData);
 		switch(this._dataLastError) {
 		case "Pending data":		// Don't show data if realtime data is still pending
 			res = null;
@@ -276,9 +276,9 @@ Formula.prototype.subtractFormulaCount = function() {
 Formula.prototype.updateContext = function() {
 	if(!this._context) { return; }
 
-	var len = this._fnTokens.length;
-	for(var i = 0; i < len; ++i) {
-		var fname = this._fnTokens[i].getFunctionName();
+	let len = this._fnTokens.length;
+	for(let i = 0; i < len; ++i) {
+		let fname = this._fnTokens[i].getFunctionName();
 		this["__F"][i] = this._context[fname] || Formula._emptyFunction;
 		if (Formula._isBoundFormula[fname]) {
 			this["__F"][i] = this["__F"][i].bind(this);
@@ -302,17 +302,17 @@ Formula._emptyFunction = function() {};
 * @return {boolean}
 */
 Formula.prototype._detectCodeInjection = function(str) {
-	var injection = false;
+	let injection = false;
 
 	if(str.match(/\+\+|--/)) { // ++ and -- which modifies current variable is not allowed
 		injection = true;
 	}
 
 	if(!injection) {
-		var matches = str.match(/([^=]=+)/g) || [];
-		for (var i = matches.length; --i >= 0;) {
-			var m = matches[i];
-			var lastTwoChars = m.substring(m.length - 2);
+		let matches = str.match(/([^=]=+)/g) || [];
+		for (let i = matches.length; --i >= 0;) {
+			let m = matches[i];
+			let lastTwoChars = m.substring(m.length - 2);
 			if (Formula._invalidOps[lastTwoChars]) {
 				injection = true;
 				break;
@@ -336,8 +336,8 @@ Formula.toUpperCase = function(exp) {
 		return exp || "";
 	}
 
-	var tokens = [];
-	var calcHierarchy = [];
+	let tokens = [];
+	let calcHierarchy = [];
 
 	// Tokenize string constants first because they has enclosure (single quotes and double quotes)
 	exp = Formula.tokenizeQuotes(exp, tokens, calcHierarchy);
@@ -385,9 +385,9 @@ Formula.tokenizeQuotes = function(exp, tokens, calcHierarchy) {
 		calcHierarchy = [];
 	}
 
-	var index;
-	var matched = false;
-	var tokenIndices = [];
+	let index;
+	let matched = false;
+	let tokenIndices = [];
 	do {
 		matched = false;
 		exp = exp.replace(/(["'])(?:(?=(\\?))\2.)*?\1/g, function(str) { // eslint-disable-line
@@ -416,9 +416,9 @@ Formula.tokenizeAdcWithParams = function(exp, tokens, calcHierarchy) {
 		calcHierarchy = [];
 	}
 
-	var index;
-	var matched = false;
-	var tokenIndices = [];
+	let index;
+	let matched = false;
+	let tokenIndices = [];
 	do {
 		matched = false;
 		exp = exp.replace(/TR\.\w+\([^\)]*\)+/g, function(str) { // eslint-disable-line
@@ -490,18 +490,18 @@ Formula.prototype._tokenizeParentheses = function(exp, tokens, calcHierarchy) {
 		calcHierarchy = [];
 	}
 
-	var fnStrToIndex = {}; // To avoid duplicate function
+	let fnStrToIndex = {}; // To avoid duplicate function
 
 	/**
 	 * It is better to not duplicate content of regular expressions to avoid any possible typos
 	 * or discrepancies.
 	 * Therefore we copy existing regular expression and assign new flags to it instead.
 	 */
-	var firstMatchRE = /[\w._]*(?:=|=[\w]*)?\([^()]*\)/;
-	var globalRE = new RegExp(firstMatchRE.source, 'g');
+	let firstMatchRE = /[\w._]*(?:=|=[\w]*)?\([^()]*\)/;
+	let globalRE = new RegExp(firstMatchRE.source, 'g');
 
 	while (exp.match(firstMatchRE)) {
-		var tokenIndices = [];
+		let tokenIndices = [];
 
 		exp = exp.replace(globalRE, function (fnStr, group) { // eslint-disable-line
 			// Remove the first equal sign.
@@ -509,7 +509,7 @@ Formula.prototype._tokenizeParentheses = function(exp, tokens, calcHierarchy) {
 				fnStr = fnStr.substr(1, fnStr.length);
 			}
 
-			var index = fnStrToIndex[fnStr];
+			let index = fnStrToIndex[fnStr];
 
 			if (index == null) {
 				index = tokens.length;
@@ -541,12 +541,12 @@ Formula.prototype._tokenizeConstants = function(exp, tokens, calcHierarchy) {
 		calcHierarchy = [];
 	}
 
-	var tokenIndices = [];
+	let tokenIndices = [];
 	exp = exp.replace(/[\w._♦]+/g, function(varStr) {
 		if (varStr.charAt(0) === "♦") {
 			return varStr;
 		}
-		var index = tokens.length;
+		let index = tokens.length;
 		tokens.push(new VariableToken(varStr, index));
 		tokenIndices.push(index);
 		return "♦" + index + "♦";
@@ -561,12 +561,12 @@ Formula.prototype._tokenizeConstants = function(exp, tokens, calcHierarchy) {
 * @return {string}
 */
 Formula.resolveTokens = function(exp, tokens, calcHierarchy) {
-	for(var i = calcHierarchy.length; --i >= 0;) { // Must be done in reverse order
-		var indices = calcHierarchy[i];
-		var len = indices.length;
-		for(var j = 0; j < len; ++j) {
-			var index = indices[j];
-			var token = tokens[index];
+	for(let i = calcHierarchy.length; --i >= 0;) { // Must be done in reverse order
+		let indices = calcHierarchy[i];
+		let len = indices.length;
+		for(let j = 0; j < len; ++j) {
+			let index = indices[j];
+			let token = tokens[index];
 			exp = exp.replace(new RegExp("♦" + index + "♦", "g"), function() { // eslint-disable-line
 				return token.getExpression();
 			});
@@ -582,12 +582,12 @@ Formula.resolveTokens = function(exp, tokens, calcHierarchy) {
 * @return {string}
 */
 Formula._getInputWithTokenField = function(exp, tokens, calcHierarchy) {
-	for(var i = calcHierarchy.length; --i >= 0;) { // Must be done in reverse order
-		var indices = calcHierarchy[i];
-		var len = indices.length;
-		for(var j = 0; j < len; ++j) {
-			var index = indices[j];
-			var token = tokens[index];
+	for(let i = calcHierarchy.length; --i >= 0;) { // Must be done in reverse order
+		let indices = calcHierarchy[i];
+		let len = indices.length;
+		for(let j = 0; j < len; ++j) {
+			let index = indices[j];
+			let token = tokens[index];
 			exp = exp.replace(new RegExp("♦" + index + "♦", "g"), function() { // eslint-disable-line
 				return token.getInputWithTokenField();
 			});
@@ -620,8 +620,8 @@ Formula.prototype._parse = function(exp) {
 
 	if(!exp || this._detectCodeInjection(exp)) { return null; }
 
-	var tokens = [];
-	var calcHierarchy = [];
+	let tokens = [];
+	let calcHierarchy = [];
 
 	exp = Formula.tokenizeQuotes(exp, tokens, calcHierarchy); // Tokenize string constants first because they has enclosure (single quotes and double quotes)
 
@@ -640,12 +640,12 @@ Formula.prototype._parse = function(exp) {
 	exp = Formula.resolveTokens(exp, tokens, calcHierarchy);
 
 	// Re-organize function structure and index, and retrieve field data
-	var fields = {};
-	var len = tokens.length;
-	for(var i = 0; i < len; ++i) {
-		var token = tokens[i];
+	let fields = {};
+	let len = tokens.length;
+	for(let i = 0; i < len; ++i) {
+		let token = tokens[i];
 		if(token.getFunctionName()) {
-			var fIndex = this._fnTokens.length;
+			let fIndex = this._fnTokens.length;
 			exp = exp.replace(new RegExp("this\\.__F\\[" + i + "\\]", "g"), "this.__F[" + fIndex + "]");
 			token.setIndex(fIndex);
 			this._fnTokens.push(token);
@@ -671,7 +671,7 @@ Formula.prototype._parse = function(exp) {
 * @return {Function}
 */
 Formula.prototype._createFunction = function (expression) {
-	var func = null;
+	let func = null;
 	try {
 		func = new Function("__R", "return " + expression + ";");
 		func = func.bind(this);
@@ -718,7 +718,7 @@ Formula.prototype.addField = function(field, opt_src) {
 * @return {boolean}
 */
 Formula.prototype.changeField = function (oldName, newName) {
-	var index = this._fields.indexOf(oldName);
+	let index = this._fields.indexOf(oldName);
 	if (index < 0) {
 		return false;
 	}
@@ -726,9 +726,9 @@ Formula.prototype.changeField = function (oldName, newName) {
 	if (this._fields.indexOf(newName) < 0) {
 		this._fields.push(newName);
 	}
-	var oldInput = this._input;
-	var oldTokenField = "♠" + oldName + "♥";
-	var newTokenField = "♠" + newName + "♥";
+	let oldInput = this._input;
+	let oldTokenField = "♠" + oldName + "♥";
+	let newTokenField = "♠" + newName + "♥";
 	this._inputWithTokenField = this._inputWithTokenField.replace(new RegExp("♠[^♠]*♥", "g"), function(str) {
 		return (str === oldTokenField) ? newTokenField : str;
 	});
@@ -754,12 +754,12 @@ Formula.prototype.changeFields = function (oldNames, newNames) {
 		return false;
 	}
 
-	var oldInput = this._input;
-	for(var i = oldNames.length; --i >= 0;) {
-		var oldName = oldNames[i];
-		var newName = newNames[i];
+	let oldInput = this._input;
+	for(let i = oldNames.length; --i >= 0;) {
+		let oldName = oldNames[i];
+		let newName = newNames[i];
 
-		var index = this._fields.indexOf(oldName);
+		let index = this._fields.indexOf(oldName);
 		if (index < 0) {
 			continue;
 		}
@@ -769,8 +769,8 @@ Formula.prototype.changeFields = function (oldNames, newNames) {
 			this._fields.push(newName);
 		}
 
-		var oldTokenField = "♠" + oldName + "♥";
-		var newTokenField = "♠" + newName + "♥";
+		let oldTokenField = "♠" + oldName + "♥";
+		let newTokenField = "♠" + newName + "♥";
 
 		this._inputWithTokenField = this._inputWithTokenField.replace(new RegExp("♠[^♠]*♥", "g"), function(str) { // eslint-disable-line
 			return (str === oldTokenField) ? newTokenField : str;
@@ -824,7 +824,7 @@ Formula.prototype.setIntervalService = function(funcName, newService) {
 		return;
 	}
 
-	var service = this._intervalServices[funcName];
+	let service = this._intervalServices[funcName];
 	if (service) {
 		service["removeEventListener"]("dataChanged", this.dispatchDataChanged); // Service will stop only if no event listener anymore
 	}
@@ -870,11 +870,11 @@ Formula.prototype.dispatchDataChanged = function(e) {
 */
 Formula.prototype._onDataCacheChanged = function(e) {
 	// Cache data for real-time function since real-time function has its own RIC list. Then dispatch the event.
-	var symbol = e['ric'];
-	var values = /** @type{Object.<string, *>} */(e['values']);
-	var data = this._dataCache[symbol];
+	let symbol = e['ric'];
+	let values = /** @type{Object.<string, *>} */(e['values']);
+	let data = this._dataCache[symbol];
 	if (data) {
-		for (var field in values) {
+		for (let field in values) {
 			data[field] = values[field];
 		}
 	} else {

package/lib/tr-grid-util/es6/formula/IntervalSubscription.js

@@ -8,7 +8,7 @@ import {EventDispatcher} from "../EventDispatcher.js";
 * @param {Function=} func
 * @param {number=} time=3600000 Interval duration
 */
-var IntervalSubscription = function(funcName, func, time) {
+let IntervalSubscription = function(funcName, func, time) {
 	if(typeof func !== "function") {
 		console.warn("No function is provided");
 		return;
@@ -130,7 +130,7 @@ IntervalSubscription.prototype.removeAllEventListeners = function() {
 */
 IntervalSubscription.prototype._start = function() {
 	if(!this._intervalId) {
-		var calTime = this._intervalTime - (Date.now() % this._intervalTime);
+		let calTime = this._intervalTime - (Date.now() % this._intervalTime);
 		this._intervalId = setTimeout(this._onValueUpdate, calTime);
 	}
 };
@@ -149,7 +149,7 @@ IntervalSubscription.prototype._stop = function() {
 IntervalSubscription.prototype._onValueUpdate = function() {
 	this._value = this._func() || null;
 
-	var rowData = {};
+	let rowData = {};
 	rowData[this._funcName] = this._value;
 	this._dispatch("dataChanged", {
 		"function": this._funcName,