@refinitiv-ui/efx-grid 6.0.91 → 6.0.92

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

@@ -6,7 +6,7 @@ import {RequestQueue} from "../RequestQueue.js";
 /** @constructor
 * @extends {EventDispatcher}
 */
-var TSISubscription = function() {
+let TSISubscription = function() {
 	this._refreshData = this._refreshData.bind(this);
 
 	// Old TSI service
@@ -209,18 +209,18 @@ TSISubscription.prototype.setTSISettings = function(sharedServiceUrl, taServiceU
 * @return {*} Return the value if there is existing. Return undefined when requesting the invalid field.
 */
 TSISubscription.prototype.addSymbolAndFieldToPeriod = function (symbol, field, period) {
-	var periodRIC = this._getPeriodRICData(period, symbol);
+	let periodRIC = this._getPeriodRICData(period, symbol);
 	if(periodRIC.dataCache[field] != null) { // Already have data
 		return periodRIC.dataCache[field];
 	}
 
-	var periodMap = this._getPeriodMap(period);
-	var isNewSymbol = periodMap.symbol[symbol] == null;
+	let periodMap = this._getPeriodMap(period);
+	let isNewSymbol = periodMap.symbol[symbol] == null;
 	if(isNewSymbol) {
 		periodMap.symbol[symbol] = true;
 	}
 
-	var isNewField = periodMap.field[field] == null;
+	let isNewField = periodMap.field[field] == null;
 	if(isNewField) {
 		periodMap.field[field] = true;
 	}
@@ -311,7 +311,7 @@ TSISubscription.prototype._stop = function() {
 * @private
 */
 TSISubscription.prototype._refreshData = function() {
-	for(var period in this._tsiPeriodMap) {
+	for(let period in this._tsiPeriodMap) {
 		// Request to old TSI service
 		this._oldTsiDataQ.add({ period: period }); // If it has error code, it will fallback to new service automatically.
 	}
@@ -337,7 +337,7 @@ TSISubscription.prototype._getPeriodMap = function(period) {
 * @return {Object} Object that related to period and RIC
 */
 TSISubscription.prototype._getPeriodRICData = function(period, symbol) {
-	var tsiPeriodMap = this._getPeriodMap(period);
+	let tsiPeriodMap = this._getPeriodMap(period);
 	if(!tsiPeriodMap[symbol]) {
 		tsiPeriodMap[symbol] = {
 			view: {}, // This property will used for new TSI service
@@ -379,11 +379,11 @@ TSISubscription.prototype._requestMetadata = function(symbol) {
 TSISubscription.prototype._manageMetadataQ = function() {
 	this._metadataTimer = 0; // Reset
 
-	var symbolMap = this._metadataMap;
+	let symbolMap = this._metadataMap;
 	this._metadataMap = {};
 
-	var symbols = [];
-	for(var key in symbolMap) {
+	let symbols = [];
+	for(let key in symbolMap) {
 		if(this._metadataPendingMap[key]) {
 			continue;
 		}
@@ -406,17 +406,17 @@ TSISubscription.prototype._manageMetadataQ = function() {
 * @return {Promise}
 */
 TSISubscription.prototype._onRequestMetadata = function(obj, q) {
-	var reqRics = obj.rics;
-	var len = reqRics.length;
+	let reqRics = obj.rics;
+	let len = reqRics.length;
 	if(len <= 0) {
 		return Promise.resolve("");
 	}
 
 	// Merge request
-	var qi = q.length;
-	var remaining = TSISubscription.MAX_CONCURRENT_OBJECT - len;
+	let qi = q.length;
+	let remaining = TSISubscription.MAX_CONCURRENT_OBJECT - len;
 	while(remaining > 0  && --qi >= 0) {
-		var qObj = q[qi];
+		let qObj = q[qi];
 		reqRics = reqRics.concat( qObj.rics.splice(0, remaining) );
 
 		len = reqRics.length; // Update length
@@ -426,12 +426,12 @@ TSISubscription.prototype._onRequestMetadata = function(obj, q) {
 		}
 	}
 
-	var payload = { "rics": reqRics };
-	var pendingMap = this._metadataPendingMap;
+	let payload = { "rics": reqRics };
+	let pendingMap = this._metadataPendingMap;
 	return Util.post(this._tsiTaServiceUrl + "/GetMetadata", payload)
 		.then(this._extractMetadata)
 		.catch(function(err) {
-			for(var i = len; --i >= 0;) {
+			for(let i = len; --i >= 0;) {
 				delete pendingMap[reqRics[i]]; // Remove key from pending list due to error
 			}
 		});
@@ -441,22 +441,22 @@ TSISubscription.prototype._onRequestMetadata = function(obj, q) {
 * @param {Object} serviceResponse
 */
 TSISubscription.prototype._extractMetadata = function(serviceResponse) {
-	var instruments = serviceResponse["instruments"];
+	let instruments = serviceResponse["instruments"];
 	if(instruments) { // Successful request
-		var aryLen = Object.keys(/** @type {!Object} */(TSISubscription.INTERVAL_INDEX)).length;
-		var ary = new Array(aryLen); // Reused array
-		for(var i = instruments.length; --i >= 0;) {
-			var instrument = instruments[i];
-
-			var data = null;
-			var viewList = instrument["viewList"] || [];
-			for(var j = viewList.length; --j >= 0;) {
-				var view = viewList[j];
-				var intervals = view["intervals"];
-				var k, interval, len;
+		let aryLen = Object.keys(/** @type {!Object} */(TSISubscription.INTERVAL_INDEX)).length;
+		let ary = new Array(aryLen); // Reused array
+		for(let i = instruments.length; --i >= 0;) {
+			let instrument = instruments[i];
+
+			let data = null;
+			let viewList = instrument["viewList"] || [];
+			for(let j = viewList.length; --j >= 0;) {
+				let view = viewList[j];
+				let intervals = view["intervals"];
+				let k, interval, len;
 				for(k = 0, len = intervals.length; k < len; k++) {
 					interval = intervals[k];
-					var idx = TSISubscription.INTERVAL_INDEX[ interval["name"] ];
+					let idx = TSISubscription.INTERVAL_INDEX[ interval["name"] ];
 					if(idx != null) {
 						if(ary[idx] == null || TSISubscription.INTERVAL_MAIN[ interval["name"] ]) { // Main interval has more priority than other interval in same category
 							ary[idx] = interval;
@@ -464,15 +464,15 @@ TSISubscription.prototype._extractMetadata = function(serviceResponse) {
 					}
 				}
 
-				var viewData = null;
-				var columns;
+				let viewData = null;
+				let columns;
 				for(k = 0; k < aryLen; k++) {
 					interval = ary[k];
 					ary[k] = null; // Clear array for reused
 					if(interval != null && viewData === null) {
 						columns = 0; // Reset
 
-						for(var l = interval["fields"].length; --l >= 0;) { // Column mask for view + interval
+						for(let l = interval["fields"].length; --l >= 0;) { // Column mask for view + interval
 							columns |= TSISubscription.COLUMN_MASK_ENUM[ interval["fields"][l] ]; // undefined will be same as 0
 						}
 
@@ -524,14 +524,14 @@ TSISubscription.prototype._getKey = function(symbol, view, period) {
 * @return {Object.<string, Array>}
 */
 TSISubscription.prototype._buildRequestInfo = function(reqPayload, dateMap) {
-	var ric = reqPayload.ric;
-	var view = reqPayload.view;
-	var viewData = this._tsiMetadata[ric] && this._tsiMetadata[ric][view];
+	let ric = reqPayload.ric;
+	let view = reqPayload.view;
+	let viewData = this._tsiMetadata[ric] && this._tsiMetadata[ric][view];
 	if(!viewData) {
 		return null;
 	}
 
-	var period = dateMap[reqPayload.period];
+	let period = dateMap[reqPayload.period];
 	if(period == null) {
 		period = TSISubscription._dateCalculation(reqPayload.period).getTime();
 		dateMap[reqPayload.period] = period;
@@ -560,7 +560,7 @@ TSISubscription.prototype._requestTSIData = function(symbol, view, period) {
 		return;
 	}
 
-	var key = this._getKey(symbol, view, period);
+	let key = this._getKey(symbol, view, period);
 	if(this._tsiDataPendingMap[key] || this._tsiDataMap[key]) { // Already in list
 		return;
 	}
@@ -580,12 +580,12 @@ TSISubscription.prototype._requestTSIData = function(symbol, view, period) {
 TSISubscription.prototype._manageTSIDataQ = function() {
 	this._tsiDataTimer = 0; // Reset
 
-	var listMap = this._tsiDataMap;
+	let listMap = this._tsiDataMap;
 	this._tsiDataMap = {};
 
-	var obj;
-	var listArr = [];
-	for(var key in listMap) {
+	let obj;
+	let listArr = [];
+	for(let key in listMap) {
 		obj = listMap[key];
 		if(this._hasMetadata(obj.ric)) {
 			if(this._tsiDataPendingMap[key]) {
@@ -615,17 +615,17 @@ TSISubscription.prototype._manageTSIDataQ = function() {
 * @return {!Promise}
 */
 TSISubscription.prototype._onRequestTSIData = function(obj, q) {
-	var reqPayloads = obj.list;
-	var len = reqPayloads.length;
+	let reqPayloads = obj.list;
+	let len = reqPayloads.length;
 	if(len <= 0) {
 		return Promise.resolve("");
 	}
 
 	// Merge request
-	var qi = q.length;
-	var remaining = TSISubscription.MAX_CONCURRENT_OBJECT - len;
+	let qi = q.length;
+	let remaining = TSISubscription.MAX_CONCURRENT_OBJECT - len;
 	while(remaining > 0  && --qi >= 0) {
-		var qObj = q[qi];
+		let qObj = q[qi];
 		reqPayloads = reqPayloads.concat( qObj.list.splice(0, remaining) );
 
 		len = reqPayloads.length; // Update length
@@ -635,10 +635,10 @@ TSISubscription.prototype._onRequestTSIData = function(obj, q) {
 		}
 	}
 
-	var dateMap = {};
-	var requestInfos = [];
-	var reqInfo;
-	for(var i = len; --i >= 0;) {
+	let dateMap = {};
+	let requestInfos = [];
+	let reqInfo;
+	for(let i = len; --i >= 0;) {
 		reqInfo = this._buildRequestInfo(reqPayloads[i], dateMap);
 		if(reqInfo) {
 			requestInfos.push( reqInfo ); // BEWARE: This is the reverse loop
@@ -649,14 +649,14 @@ TSISubscription.prototype._onRequestTSIData = function(obj, q) {
 			 * Complete the request so that it will not stay indefinitely as "pending"
 			 * TRGRID-2335
 			 */
-			var key = this._getKey(reqPayloads[i].ric, reqPayloads[i].view, reqPayloads[i].period);
+			let key = this._getKey(reqPayloads[i].ric, reqPayloads[i].view, reqPayloads[i].period);
 			delete this._tsiDataPendingMap[key]; // Remove from pending map
 
-			var periodRIC = this._getPeriodRICData(reqPayloads[i].period, reqPayloads[i].ric);
-			var periodMap = this._getPeriodMap(reqPayloads[i].period);
-			var fields = periodMap.field;
-			var rowData = {};
-			for(var field in fields) {
+			let periodRIC = this._getPeriodRICData(reqPayloads[i].period, reqPayloads[i].ric);
+			let periodMap = this._getPeriodMap(reqPayloads[i].period);
+			let fields = periodMap.field;
+			let rowData = {};
+			for(let field in fields) {
 				if(!fields[field]) continue;
 				periodRIC.dataCache[field] = null;
 				rowData[reqPayloads[i].period + "♠" + field] = periodRIC.dataCache[field];
@@ -670,8 +670,8 @@ TSISubscription.prototype._onRequestTSIData = function(obj, q) {
 		return Promise.resolve("");
 	}
 
-	var self = this; // TODO: This is bad
-	var payload = { "messages": requestInfos.reverse() }; // Reverse array back for normal order
+	let self = this; // TODO: This is bad
+	let payload = { "messages": requestInfos.reverse() }; // Reverse array back for normal order
 	return Util.requestText(this._tsiTaServiceUrl + "/CalculateAllData", payload)
 		.then(function(serviceResponse) {
 			return {
@@ -681,8 +681,8 @@ TSISubscription.prototype._onRequestTSIData = function(obj, q) {
 		})
 		.then(this._extractTSIData)
 		.catch(function(err) { // TODO: This is bad
-			for(var i = len; --i >= 0;) { // eslint-disable-line
-				var key = self._getKey(reqPayloads[i].ric, reqPayloads[i].view, reqPayloads[i].period); // eslint-disable-line
+			for(let i = len; --i >= 0;) { // eslint-disable-line
+				let key = self._getKey(reqPayloads[i].ric, reqPayloads[i].view, reqPayloads[i].period); // eslint-disable-line
 				delete self._tsiDataPendingMap[key]; // Remove from pending map
 			}
 		});
@@ -693,8 +693,8 @@ TSISubscription.prototype._onRequestTSIData = function(obj, q) {
 * @return {Object}
 */
 TSISubscription.prototype._extractTSIData = function(res) {
-	var response = res.response.replace(/\[NaN(,NaN)*\]/g, "[]"); // Handler for return the invalid JSON syntax due to no data
-	var json;
+	let response = res.response.replace(/\[NaN(,NaN)*\]/g, "[]"); // Handler for return the invalid JSON syntax due to no data
+	let json;
 	try {
 		json = /** @type {Object} */(JSON.parse(response));
 	} catch(ex) {
@@ -703,10 +703,10 @@ TSISubscription.prototype._extractTSIData = function(res) {
 	}
 
 	if(json) {
-		var payload = res.payload;
-		var len = payload.length;
-		var periodRIC, dataCache, view, symbol, period, rowData, field, periodMap;
-		for(var i = 0; i < len; i++) {
+		let payload = res.payload;
+		let len = payload.length;
+		let periodRIC, dataCache, view, symbol, period, rowData, field, periodMap;
+		for(let i = 0; i < len; i++) {
 			view = payload[i].view;
 			symbol = payload[i].ric;
 			period = payload[i].period;
@@ -715,14 +715,14 @@ TSISubscription.prototype._extractTSIData = function(res) {
 			periodRIC.view[view] = true; // Mark as already requested
 			dataCache = periodRIC.dataCache;
 
-			var data = json[i]["Columns"] || [];
+			let data = json[i]["Columns"] || [];
 			if(data.length === 0) {
 				continue;
 			}
 
 			rowData = {};
-			var val;
-			for(var j = 0, dataLen = data.length; j < dataLen; j++) {
+			let val;
+			for(let j = 0, dataLen = data.length; j < dataLen; j++) {
 				val = data[j]["Values"][0];
 				if(val == null || val !== val) {
 					/*
@@ -804,23 +804,23 @@ TSISubscription.prototype._extractTSIData = function(res) {
 * @return {Promise}
 */
 TSISubscription.prototype._requestTimeSeriesData = function(obj, q) {
-	var period = obj.period;
-	for(var i = q.length; --i >= 0;) {
-		var qObj = q[i];
+	let period = obj.period;
+	for(let i = q.length; --i >= 0;) {
+		let qObj = q[i];
 		if(!qObj.rics && qObj.period === period) {
 			q.splice(i, 1); // Remove any duplicate period that is being queued
 		}
 	}
 
-	var periodMap = this._getPeriodMap(period);
-	var fields = Object.keys(periodMap.field);
-	var symbols = obj.rics ? obj.rics : Object.keys(periodMap.symbol);
+	let periodMap = this._getPeriodMap(period);
+	let fields = Object.keys(periodMap.field);
+	let symbols = obj.rics ? obj.rics : Object.keys(periodMap.symbol);
 
 	if(fields.length === 0 || symbols.length === 0) {
 		return null;
 	}
 
-	var reqDate = TSISubscription._dateCalculation(period).toJSON();
+	let reqDate = TSISubscription._dateCalculation(period).toJSON();
 	if(reqDate === null) { // Invalid date/period parameter
 		return null;
 	} else {
@@ -833,7 +833,7 @@ TSISubscription.prototype._requestTimeSeriesData = function(obj, q) {
 		q.unshift(obj); // Push the request back at the front of the queue
 	}
 
-	var payload = {
+	let payload = {
 		"rics": symbols.join(" "),
 		"factList": fields.join(","),
 		"date": reqDate
@@ -855,21 +855,21 @@ TSISubscription.prototype._requestTimeSeriesData = function(obj, q) {
 * @param {Object} json JSON object of TSI response
 */
 TSISubscription.prototype._onTSIUpdate = function(json) {
-	var period = json["period"];
-	var result = json["result"];
-	var periodMap = this._getPeriodMap(period);
-	var fields = periodMap["field"];
+	let period = json["period"];
+	let result = json["result"];
+	let periodMap = this._getPeriodMap(period);
+	let fields = periodMap["field"];
 
-	var header = result[0];
+	let header = result[0];
 	if(!header) {
 		throw("Invalid response from TSI service");
 	}
 
-	var ricIdx = -1;
-	var returnStatusIdx = -1;
-	// var timestampIdx = -1;
-	var fieldIdxMap = {};
-	for(var i = header.length; --i >= 0;) {
+	let ricIdx = -1;
+	let returnStatusIdx = -1;
+	// let timestampIdx = -1;
+	let fieldIdxMap = {};
+	for(let i = header.length; --i >= 0;) {
 		if(header[i] === "RIC") {
 			ricIdx = i;
 		} else if(header[i] === "ReturnStatus") {
@@ -882,16 +882,16 @@ TSISubscription.prototype._onTSIUpdate = function(json) {
 	}
 	fields = Object.keys(fieldIdxMap); // Collect the fields of result
 
-	var rowLen = result.length;
-	var symbol, value, rowData, dataCache;
-	// var isCorrectDate;
+	let rowLen = result.length;
+	let symbol, value, rowData, dataCache;
+	// let isCorrectDate;
 	for(i = 1; i < rowLen; i++) {
 		symbol = result[i][ricIdx];
 
 		if(result[i][returnStatusIdx] !== "0") { // Have an error in response, then fallback to new TS data service
 			// Request to new service
-			for(var k = fields.length; --k >= 0;) {
-				var view = fields[k].substring(0, fields[k].lastIndexOf("."));
+			for(let k = fields.length; --k >= 0;) {
+				let view = fields[k].substring(0, fields[k].lastIndexOf("."));
 				if(!this._hasMetadata(symbol) || (this._tsiMetadata[symbol] && this._tsiMetadata[symbol][view])) { // No metadata || Ready to make a request
 					this._requestTSIData(symbol, view, period);
 				}
@@ -903,7 +903,7 @@ TSISubscription.prototype._onTSIUpdate = function(json) {
 		dataCache = this._getPeriodRICData(period, symbol).dataCache;
 		rowData = {};
 
-		for(var j = fields.length; --j >= 0;) {
+		for(let j = fields.length; --j >= 0;) {
 			// value = (isCorrectDate) ? (result[i][fieldIdxMap[fields[j]]] || null) : null; // If result is same as the requested timestamp then return the value. Otherwise return null.
 			value = result[i][fieldIdxMap[fields[j]]] || null; // If return empty string, it should be null
 			if(value !== null) {
@@ -939,7 +939,7 @@ TSISubscription._addDays = function(date, day) {
 */
 TSISubscription._addMonths = function(date, month) {
 	// Reference: http://stackoverflow.com/questions/7937233/how-do-i-calculate-the-date-in-javascript-three-months-prior-to-today
-	var expectedMonth = ((date.getMonth() + month) % 12 + 12) % 12;
+	let expectedMonth = ((date.getMonth() + month) % 12 + 12) % 12;
 	date.setMonth(date.getMonth() + month);
 	if (date.getMonth() !== expectedMonth) { // If it has an error of native date subtraction
 		date.setDate(0); // Backward to the last day of previous month
@@ -972,25 +972,25 @@ TSISubscription._addDate = function(date, num, dateUnit) {
 * @return {Date} Date object
 */
 TSISubscription._dateCalculation = function(period) {
-	var goBackPeriods = period.match(/\d+(D|W|M|Q|Y)/g);
+	let goBackPeriods = period.match(/\d+(D|W|M|Q|Y)/g);
 	if(goBackPeriods) { // Relative date pattern
-		var now = new Date();
-		for(var i = goBackPeriods.length; --i >= 0;){
-			var p = goBackPeriods[i];
-			var dateUnit = p.substr(p.length - 1);
-			var num = -(p.substr(0, p.length - 1));
+		let now = new Date();
+		for(let i = goBackPeriods.length; --i >= 0;){
+			let p = goBackPeriods[i];
+			let dateUnit = p.substr(p.length - 1);
+			let num = -(p.substr(0, p.length - 1));
 			now = TSISubscription._addDate(now, num, dateUnit);
 		}
 		return now;
 	}
 
 	// Specified date
-	var temp = new Date(period);
+	let temp = new Date(period);
 	if(temp.toJSON() === null) {
 		console.warn("Invalid period parameter: " + period);
 		return null;
 	}
-	var date = null;
+	let date = null;
 	if(period.match(/^\d{1,4}(-\d{2}(-\d{2})?)?$/)) { // If ISO format (YYYY-MM-DD)
 		date = temp;
 	} else { // If non ISO format

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

@@ -3,7 +3,7 @@
 * @param {string} str
 * @param {number=} index
 */
-var VariableToken = function(str, index) {
+let VariableToken = function(str, index) {
 	str = str.trim();
 
 	if(this._inputConverter[str]) {
@@ -21,8 +21,8 @@ var VariableToken = function(str, index) {
 		return;
 	}
 
-	var firstChar = str.charAt(0);
-	var lastChar = (str.length > 1) ? str.charAt(str.length - 1) : "";
+	let firstChar = str.charAt(0);
+	let lastChar = (str.length > 1) ? str.charAt(str.length - 1) : "";
 	if(firstChar === '"' && lastChar === '"') {
 		this._value = str.substring(1, str.length - 1);
 		this._type = "string";
@@ -42,19 +42,19 @@ var VariableToken = function(str, index) {
 		return;
 	}
 
-	var adc = str.match(/TR\.\w+\(/);
+	let adc = str.match(/TR\.\w+\(/);
 	if(adc) { // ADC field with parameters
 		this._type = "dynamic"; // ADC field with params always a dynamic token field
 		return;
 	}
 
-	var funcs = str.match(/[\w._]+\(/g);
+	let funcs = str.match(/[\w._]+\(/g);
 	if(funcs && funcs.length === 1) { // There must be only one method in the given str
 		this._resolveFunction(str, funcs[0]); // Function has undefined value (this._value == null)
 		return;
 	}
 
-	var words = str.match(/[\w._♦]+/g);
+	let words = str.match(/[\w._♦]+/g);
 	if(words && words.length > 1) { // A group of expression without parentheses
 		this._resolveVariableGroup(str);
 		return;
@@ -65,7 +65,7 @@ var VariableToken = function(str, index) {
 		return;
 	}
 
-	var num = Number(str);
+	let num = Number(str);
 	if(num === num) { // If not NaN
 		this._value = num;
 		this._type = "number";
@@ -187,12 +187,12 @@ VariableToken.prototype.getInputWithTokenField = function() {
  * @return {string}
  */
 VariableToken.prototype.getChildInputWithToken = function() {
-	var len = this._subVars ? this._subVars.length : 0;
+	let len = this._subVars ? this._subVars.length : 0;
 	if(len <= 0) {
 		return "";
 	}
-	var inputs = new Array(len);
-	for(var i = 0; i < len; ++i) {
+	let inputs = new Array(len);
+	for(let i = 0; i < len; ++i) {
 		inputs[i] = this._subVars[i].getInputWithTokenField();
 	}
 	return inputs.join(", ");
@@ -233,8 +233,8 @@ VariableToken.prototype.getFunctionName = function() { return this._funcName; };
 VariableToken.prototype.getFieldNames = function(opt_obj) {
 	if(this._subVars) {
 		if(opt_obj) {
-			var len = this._subVars.length;
-			for(var i = 0; i < len; ++i) {
+			let len = this._subVars.length;
+			for(let i = 0; i < len; ++i) {
 				this._subVars[i].getFieldNames(opt_obj);
 			}
 		}
@@ -254,14 +254,14 @@ VariableToken.prototype.getFieldNames = function(opt_obj) {
 * @returns {string}
 */
 VariableToken.prototype._resolveVariableGroup = function(str) {
-	var i = this._subVars ? this._subVars.length : 0;
+	let i = this._subVars ? this._subVars.length : 0;
 	this._type = "group";
 
 	this._value = str.replace(/[\w._♦]+/g, function(varStr) {
 		if(!this._subVars) {
 			this._subVars = [];
 		}
-		var varToken = new VariableToken(varStr, this._subVars.length);
+		let varToken = new VariableToken(varStr, this._subVars.length);
 		this._subVars.push(varToken);
 		return varToken.getExpression();
 	}.bind(this));
@@ -286,9 +286,9 @@ VariableToken.prototype._resolveFunction = function(str, matchedName) {
 	str = str.substr(0, str.length - 1); // Strip ")"
 	if(str) {
 		this._subVars = [];
-		var params = str.split(",");
-		var len = params.length;
-		for(var i = 0; i < len; ++i) {
+		let params = str.split(",");
+		let len = params.length;
+		for(let i = 0; i < len; ++i) {
 			this._subVars[i] = new VariableToken(params[i], i);
 		}
 	}
@@ -302,9 +302,9 @@ VariableToken.prototype._resolveArray = function(str) {
 	str = str.substr(1, str.length - 1); // Strip "[" and "]"
 	if(str) {
 		this._subVars = [];
-		var params = str.split(",");
-		var len = params.length;
-		for(var i = 0; i < len; ++i) {
+		let params = str.split(",");
+		let len = params.length;
+		for(let i = 0; i < len; ++i) {
 			this._subVars[i] = new VariableToken(params[i], i);
 		}
 	}

package/lib/tr-grid-util/es6/formula/functions/AdFin.js

@@ -12,7 +12,7 @@ import DateTime from "../../DateTime.js";
  * {lang=ru} AdFin data access function
  * {lang=de} AdFin-Daten Zugriffsfunktion
  */
-var AdFin = {};
+let AdFin = {};
 
 /**
  * @ignore
@@ -21,9 +21,9 @@ var AdFin = {};
  * @return {boolean} true if parameter is number of seconds since 01 JAN 1970 UTC (realtime date number), false otherwise
  */
 AdFin._dateIsSecondsSince1970 = function (seconds) {
-	var milliseconds = seconds * 1000;
+	let milliseconds = seconds * 1000;
 	if (('' + milliseconds).indexOf(".") !== -1) return false;
-	var jsDate = new Date(milliseconds);
+	let jsDate = new Date(milliseconds);
 	if (isNaN(jsDate.getTime())) return false;
 	if (jsDate.getFullYear() === 1970) return false;
 	return true;
@@ -50,7 +50,7 @@ AdFin._convertDaysSince1900UTCToJJMMMYYYY = function (value) {
  * @return {number|null} days number since 1 Jan, 1900 UTC
  */
 AdFin._convertSecondsSince1970ToDaysSince1900 = function (value) {
-	var jsDate = new Date(value * 1000);
+	let jsDate = new Date(value * 1000);
 	if (isNaN(jsDate.getTime())) return null;     // invalid date
 	if (jsDate.getFullYear() === 1970) return null;
 	return DateTime.toDateNumber(jsDate);     // days number since 1 Jan, 1900
@@ -63,7 +63,7 @@ AdFin._convertSecondsSince1970ToDaysSince1900 = function (value) {
  * @return {string|null} string date JJMMMYYYY
  */
 AdFin._convertSecondsSince1970UTCToJJMMMYYYY = function (value) {
-	var days = AdFin._convertSecondsSince1970ToDaysSince1900(value);
+	let days = AdFin._convertSecondsSince1970ToDaysSince1900(value);
 	if (days == null) return null;
 	return AdFin._convertDaysSince1900UTCToJJMMMYYYY(days);
 };
@@ -239,10 +239,10 @@ AdFin.Definitions = {
 */
 AdFin._genericFunction = function (name, args) {
 
-	/** @type {Array.<{name:string, type:string}>} */ var definitions = AdFin.Definitions[name];
-	/** @type {Array.<Array.<string|number|null>>} */ var parameters = [];
+	/** @type {Array.<{name:string, type:string}>} */ let definitions = AdFin.Definitions[name];
+	/** @type {Array.<Array.<string|number|null>>} */ let parameters = [];
 
-	for (var i = 0, length = args.length; i < length; ++i) {
+	for (let i = 0, length = args.length; i < length; ++i) {
 		if (args[i] != null) {
 			if ((definitions[i].type === "JJMMMYYYY") && (typeof (args[i]) === "number")) {
 				if (AdFin._dateIsSecondsSince1970(args[i])) {
@@ -262,7 +262,7 @@ AdFin._genericFunction = function (name, args) {
 		}
 	}
 
-	var adfinService = this.getIntervalService("AdFin");
+	let adfinService = this.getIntervalService("AdFin");
 	if (!adfinService) {
 		adfinService = AdFinService.create();
 		if (!adfinService) {
@@ -272,7 +272,7 @@ AdFin._genericFunction = function (name, args) {
 		this.setIntervalService("AdFin", adfinService);
 	}
 
-	var res = adfinService["call"](name, parameters);
+	let res = adfinService["call"](name, parameters);
 	if (res === "...") {
 		this.setDataError("Pending - no erase");      // Data update is pending - do not erase previous value
 	}

package/lib/tr-grid-util/es6/formula/functions/Excel.js

@@ -3,7 +3,7 @@
  * @namespace Excel
  * @ignore
  */
-var Excel = {};
+let Excel = {};
 
 Excel["BDSETTLE"] = function(/* ... args*/) {};
 Excel["CALTOTAL"] = function(/* ... args*/) {};