@infomaximum/widget-sdk 6.0.0-wefi344-2 → 6.0.2

package/dist/index.esm.js

@@ -132,6 +132,35 @@ function __rest(s, e) {
     return t;
 }
 
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
 function __makeTemplateObject(cooked, raw) {
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
@@ -183,9 +212,18 @@ var EFormulaFilterFieldKeys;
     EFormulaFilterFieldKeys["lastTimeUnit"] = "lastTimeUnit";
     EFormulaFilterFieldKeys["durationUnit"] = "durationUnit";
 })(EFormulaFilterFieldKeys || (EFormulaFilterFieldKeys = {}));
+var EDimensionProcessFilterTimeUnit;
+(function (EDimensionProcessFilterTimeUnit) {
+    EDimensionProcessFilterTimeUnit["YEARS"] = "YEARS";
+    EDimensionProcessFilterTimeUnit["MONTHS"] = "MONTHS";
+    EDimensionProcessFilterTimeUnit["HOURS"] = "HOURS";
+    EDimensionProcessFilterTimeUnit["DAYS"] = "DAYS";
+    EDimensionProcessFilterTimeUnit["MINUTES"] = "MINUTES";
+})(EDimensionProcessFilterTimeUnit || (EDimensionProcessFilterTimeUnit = {}));
 var isFormulaFilterValue = function (value) {
     return "filteringMethod" in value;
 };
+var isDimensionProcessFilter = function (filter) { return "value" in filter && "condition" in filter; };
 
 var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
 var compactMap = function (items, f) {
@@ -610,7 +648,7 @@ var formattingConfig = {
     },
 };
 
-var _a$4;
+var _a$5;
 var EDimensionTemplateNames;
 (function (EDimensionTemplateNames) {
     EDimensionTemplateNames["dateTime"] = "dateTime";
@@ -626,19 +664,19 @@ var EDimensionTemplateNames;
     EDimensionTemplateNames["hour"] = "hour";
 })(EDimensionTemplateNames || (EDimensionTemplateNames = {}));
 /** Стандартные шаблоны разреза */
-var dimensionTemplateFormulas = (_a$4 = {},
-    _a$4[EDimensionTemplateNames.dateTime] = "toDateTime({columnFormula})",
-    _a$4[EDimensionTemplateNames.date] = "toDate({columnFormula})",
-    _a$4[EDimensionTemplateNames.year] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYear({columnFormula}))",
-    _a$4[EDimensionTemplateNames.yearAndQuarter] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYear({columnFormula}) * 10 + toQuarter({columnFormula}))",
-    _a$4[EDimensionTemplateNames.quarter] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toQuarter({columnFormula}))",
-    _a$4[EDimensionTemplateNames.yearAndMonth] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYYYYMM({columnFormula}))",
-    _a$4[EDimensionTemplateNames.month] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toMonth({columnFormula}))",
-    _a$4[EDimensionTemplateNames.dayOfMonth] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toDayOfMonth({columnFormula}))",
-    _a$4[EDimensionTemplateNames.week] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toWeek({columnFormula}))",
-    _a$4[EDimensionTemplateNames.dayOfWeek] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toDayOfWeek({columnFormula}))",
-    _a$4[EDimensionTemplateNames.hour] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toHour({columnFormula}))",
-    _a$4);
+var dimensionTemplateFormulas = (_a$5 = {},
+    _a$5[EDimensionTemplateNames.dateTime] = "toDateTime({columnFormula})",
+    _a$5[EDimensionTemplateNames.date] = "toDate({columnFormula})",
+    _a$5[EDimensionTemplateNames.year] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYear({columnFormula}))",
+    _a$5[EDimensionTemplateNames.yearAndQuarter] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYear({columnFormula}) * 10 + toQuarter({columnFormula}))",
+    _a$5[EDimensionTemplateNames.quarter] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toQuarter({columnFormula}))",
+    _a$5[EDimensionTemplateNames.yearAndMonth] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toYYYYMM({columnFormula}))",
+    _a$5[EDimensionTemplateNames.month] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toMonth({columnFormula}))",
+    _a$5[EDimensionTemplateNames.dayOfMonth] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toDayOfMonth({columnFormula}))",
+    _a$5[EDimensionTemplateNames.week] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toWeek({columnFormula}))",
+    _a$5[EDimensionTemplateNames.dayOfWeek] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toDayOfWeek({columnFormula}))",
+    _a$5[EDimensionTemplateNames.hour] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toHour({columnFormula}))",
+    _a$5);
 
 var EWidgetIndicatorType;
 (function (EWidgetIndicatorType) {
@@ -748,14 +786,14 @@ var EEventAppearances;
 })(EEventAppearances || (EEventAppearances = {}));
 
 function createAggregationTemplate$1(functionName, options) {
-    return "process(".concat(functionName, "(").concat((options === null || options === void 0 ? void 0 : options.distinct) ? "distinct " : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})");
+    return "process(".concat(functionName, "(").concat((options === null || options === void 0 ? void 0 : options.distinct) ? "distinct " : "", "{columnFormula}, {eventNameFormula} ={eventName}{filters}), {caseCaseIdFormula})");
 }
 
-var countReworksTemplate = "process(if(countIf({eventNameFormula} = '{eventName}'{filters}) > 0, countIf({eventNameFormula}  = '{eventName}'{filters}) - 1, 0), {caseCaseIdFormula})";
-var countExecutionsTemplate = "process(countIf({eventNameFormula} in '{eventName}'{filters}), {caseCaseIdFormula})";
-var lastValueTemplate = "process(argMaxIf({columnFormula}, {eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})";
-var firstValueTemplate = "process(argMinIf({columnFormula}, {eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})";
-var topTemplate = "process(topKIf(1)({columnFormula}, {eventNameFormula} = '{eventName}'{filters})[1], {caseCaseIdFormula})";
+var countReworksTemplate = "process(if(countIf({eventNameFormula} = {eventName}{filters}) > 0, countIf({eventNameFormula}  = {eventName}{filters}) - 1, 0), {caseCaseIdFormula})";
+var countExecutionsTemplate = "process(countIf({eventNameFormula} in {eventName}{filters}), {caseCaseIdFormula})";
+var lastValueTemplate = "process(argMaxIf({columnFormula}, {eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})";
+var firstValueTemplate = "process(argMinIf({columnFormula}, {eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})";
+var topTemplate = "process(topKIf(1)({columnFormula}, {eventNameFormula} = {eventName}{filters})[1], {caseCaseIdFormula})";
 var avgTemplate = createAggregationTemplate$1("avgIf");
 var medianTemplate = createAggregationTemplate$1("medianIf");
 var countTemplate = createAggregationTemplate$1("countIf");
@@ -764,8 +802,55 @@ var minTemplate = createAggregationTemplate$1("minIf");
 var maxTemplate = createAggregationTemplate$1("maxIf");
 var sumTemplate = createAggregationTemplate$1("sumIf");
 
+function hasPossibleSingleLineComment(str) {
+    return str.indexOf("--") >= 0;
+}
+function sanitizeSingleLineComment(formula, wrapInBrackets) {
+    if (!hasPossibleSingleLineComment(formula)) {
+        return formula;
+    }
+    var lines = formula.split("\n");
+    var lastLine = lines[lines.length - 1];
+    // Кейс, когда хотим избежать повторного добавления переноса строки:
+    // уже есть переносы и после последнего переноса нет комментария
+    if (lines.length > 1 && lastLine && !hasPossibleSingleLineComment(lastLine)) {
+        return formula;
+    }
+    return wrapInBrackets ? "(".concat(formula, "\n)") : "".concat(formula, "\n");
+}
+
+/** @deprecated - следует использовать fillTemplateSql */
 function fillTemplateString(templateString, params) {
-    return templateString.replace(/\{(.*?)\}/g, function (_, key) { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ""; });
+    return templateString.replace(/\{(.*?)\}/g, function (_, key) {
+        var _a;
+        return (_a = params[key]) !== null && _a !== void 0 ? _a : "";
+    });
+}
+/** Функция для безопасного заполнения SQL шаблонов с защитой от однострочных SQL комментариев в подставляемых значениях. */
+function fillTemplateSql(templateString, params) {
+    var e_1, _a;
+    var newParams = {};
+    if (templateString.indexOf("'{") >= 0) {
+        throw new Error("\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0439 \u0448\u0430\u0431\u043B\u043E\u043D: \u043F\u043B\u0435\u0439\u0441\u0445\u043E\u043B\u0434\u0435\u0440\u044B \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u044B \u0437\u0430\u043A\u043B\u044E\u0447\u0430\u0442\u044C\u0441\u044F \u0432 \u043E\u0434\u0438\u043D\u0430\u0440\u043D\u044B\u0435 \u043A\u0430\u0432\u044B\u0447\u043A\u0438.\n       \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 {placeholder} \u0432\u043C\u0435\u0441\u0442\u043E '{placeholder}'.\n       \u041A\u0430\u0432\u044B\u0447\u043A\u0438 \u0434\u043E\u043B\u0436\u043D\u044B \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C\u0441\u044F \u0434\u043B\u044F \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u044B\u0445 \u043F\u043E\u043B\u0435\u0439 \u043F\u0440\u0438 \u0444\u043E\u0440\u043C\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0438 \u043E\u0431\u044A\u0435\u043A\u0442\u0430 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432.");
+    }
+    try {
+        for (var _b = __values(Object.entries(params)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
+            if (String(value).indexOf("--") >= 0) {
+                newParams[key] = "".concat(value, "\n");
+                continue;
+            }
+            newParams[key] = sanitizeSingleLineComment(String(value));
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return fillTemplateString(templateString, newParams);
 }
 
 /** Создать функцию экранирования переданных `specialChars` внутри `str` */
@@ -839,7 +924,7 @@ var escapeSingularQuotes = function (formula) {
 };
 
 var prepareFormulaForSql = function (formula, simpleType) {
-    formula = clearSingleLineComments(clearMultiLineComments(formula)).trim();
+    formula = sanitizeSingleLineComment(formula, true);
     return simpleType === ESimpleDataType.OTHER ? "toString(".concat(formula, ")") : formula;
 };
 var clearSingleLineComments = function (formula) {
@@ -921,7 +1006,7 @@ var convertFiltersToFormula = function (filters) {
     return filters.length > 0 ? " AND ".concat(convertToFormulasChain(filters)) : "";
 };
 
-var _a$3;
+var _a$4;
 var EDimensionAggregationTemplateName;
 (function (EDimensionAggregationTemplateName) {
     EDimensionAggregationTemplateName["avg"] = "avg";
@@ -938,20 +1023,20 @@ var EDimensionAggregationTemplateName;
     EDimensionAggregationTemplateName["countReworks"] = "countReworks";
 })(EDimensionAggregationTemplateName || (EDimensionAggregationTemplateName = {}));
 /** Шаблоны процессных метрик разреза с режимом AGGREGATION */
-var dimensionAggregationTemplates = (_a$3 = {},
-    _a$3[EDimensionAggregationTemplateName.avg] = avgTemplate,
-    _a$3[EDimensionAggregationTemplateName.median] = medianTemplate,
-    _a$3[EDimensionAggregationTemplateName.count] = countTemplate,
-    _a$3[EDimensionAggregationTemplateName.countDistinct] = countDistinctTemplate,
-    _a$3[EDimensionAggregationTemplateName.min] = minTemplate,
-    _a$3[EDimensionAggregationTemplateName.max] = maxTemplate,
-    _a$3[EDimensionAggregationTemplateName.sum] = sumTemplate,
-    _a$3[EDimensionAggregationTemplateName.top] = topTemplate,
-    _a$3[EDimensionAggregationTemplateName.firstValue] = firstValueTemplate,
-    _a$3[EDimensionAggregationTemplateName.lastValue] = lastValueTemplate,
-    _a$3[EDimensionAggregationTemplateName.countExecutions] = countExecutionsTemplate,
-    _a$3[EDimensionAggregationTemplateName.countReworks] = countReworksTemplate,
-    _a$3);
+var dimensionAggregationTemplates = (_a$4 = {},
+    _a$4[EDimensionAggregationTemplateName.avg] = avgTemplate,
+    _a$4[EDimensionAggregationTemplateName.median] = medianTemplate,
+    _a$4[EDimensionAggregationTemplateName.count] = countTemplate,
+    _a$4[EDimensionAggregationTemplateName.countDistinct] = countDistinctTemplate,
+    _a$4[EDimensionAggregationTemplateName.min] = minTemplate,
+    _a$4[EDimensionAggregationTemplateName.max] = maxTemplate,
+    _a$4[EDimensionAggregationTemplateName.sum] = sumTemplate,
+    _a$4[EDimensionAggregationTemplateName.top] = topTemplate,
+    _a$4[EDimensionAggregationTemplateName.firstValue] = firstValueTemplate,
+    _a$4[EDimensionAggregationTemplateName.lastValue] = lastValueTemplate,
+    _a$4[EDimensionAggregationTemplateName.countExecutions] = countExecutionsTemplate,
+    _a$4[EDimensionAggregationTemplateName.countReworks] = countReworksTemplate,
+    _a$4);
 /** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
 var prepareDimensionAggregationParams = function (value) {
     if (!value.eventName ||
@@ -964,8 +1049,7 @@ var prepareDimensionAggregationParams = function (value) {
     var commonParams = {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: value.eventName,
-        objectFilters: "1",
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -994,13 +1078,13 @@ var timeTemplates = (function () {
     var generateTemplates = function (innerTemplate) {
         var templates = {};
         for (var key in dimensionTemplateFormulas) {
-            templates[key] = fillTemplateString(dimensionTemplateFormulas[key], { columnFormula: innerTemplate });
+            templates[key] = fillTemplateSql(dimensionTemplateFormulas[key], { columnFormula: innerTemplate });
         }
         return templates;
     };
     return _a = {},
-        _a[EWidgetIndicatorValueModes.START_TIME] = generateTemplates("process(minIf({eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})"),
-        _a[EWidgetIndicatorValueModes.END_TIME] = generateTemplates("process(maxIf({eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})"),
+        _a[EWidgetIndicatorValueModes.START_TIME] = generateTemplates("process(minIf({eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})"),
+        _a[EWidgetIndicatorValueModes.END_TIME] = generateTemplates("process(maxIf({eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})"),
         _a;
 })();
 /** На основе значения режимов START_TIME/END_TIME подготовить параметры для подстановки в шаблонную формулу */
@@ -1018,12 +1102,12 @@ var prepareTimeParams = function (value) {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
         filters: convertFiltersToFormula(value.filters),
-        eventName: value.eventName,
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
     };
 };
 
 function getDimensionFormula(_a) {
-    var _b;
+    var _b, _c;
     var value = _a.value;
     if (!value) {
         return "";
@@ -1037,10 +1121,13 @@ function getDimensionFormula(_a) {
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
+        return fillTemplateSql(templateFormula, {
             columnFormula: generateColumnFormula(tableName, columnName),
         });
     }
+    return (_c = getProcessDimensionValueFormula(value)) !== null && _c !== void 0 ? _c : "";
+}
+function getProcessDimensionValueFormula(value) {
     if (value.mode === EWidgetIndicatorValueModes.AGGREGATION) {
         var preparedParams = prepareDimensionAggregationParams(value);
         if (!preparedParams) {
@@ -1050,10 +1137,10 @@ function getDimensionFormula(_a) {
             ? dimensionTemplateFormulas[value.innerTemplateName]
             : null;
         var columnFormula = innerTemplate
-            ? fillTemplateString(innerTemplate, { columnFormula: preparedParams.columnFormula })
+            ? fillTemplateSql(innerTemplate, { columnFormula: preparedParams.columnFormula })
             : preparedParams.columnFormula;
         var dimensionAggregationTemplate = dimensionAggregationTemplates[value.templateName];
-        return fillTemplateString(dimensionAggregationTemplate, __assign(__assign({}, preparedParams), { columnFormula: columnFormula }));
+        return fillTemplateSql(dimensionAggregationTemplate, __assign(__assign({}, preparedParams), { columnFormula: columnFormula }));
     }
     if (value.mode === EWidgetIndicatorValueModes.START_TIME ||
         value.mode === EWidgetIndicatorValueModes.END_TIME) {
@@ -1062,9 +1149,8 @@ function getDimensionFormula(_a) {
             return "";
         }
         var templateFormula = timeTemplates[value.mode][value.templateName];
-        return fillTemplateString(templateFormula, preparedParams);
+        return fillTemplateSql(templateFormula, preparedParams);
     }
-    return "";
 }
 
 var EMeasureAggregationTemplateName;
@@ -1096,8 +1182,7 @@ var prepareMeasureAggregationParams = function (value) {
         outerAggregation: value.outerAggregation,
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: value.eventName,
-        objectFilters: "1",
+        eventName: value.eventName ? "'".concat(escapeSingularQuotes(value.eventName), "'") : "",
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -1118,7 +1203,7 @@ var prepareMeasureAggregationParams = function (value) {
     return columnParams;
 };
 
-var _a$2;
+var _a$3, _b;
 var EMeasureTemplateNames;
 (function (EMeasureTemplateNames) {
     EMeasureTemplateNames["avg"] = "avg";
@@ -1129,19 +1214,28 @@ var EMeasureTemplateNames;
     EMeasureTemplateNames["max"] = "max";
     EMeasureTemplateNames["sum"] = "sum";
 })(EMeasureTemplateNames || (EMeasureTemplateNames = {}));
+var EMeasureInnerTemplateNames;
+(function (EMeasureInnerTemplateNames) {
+    EMeasureInnerTemplateNames["begin"] = "begin";
+    EMeasureInnerTemplateNames["end"] = "end";
+})(EMeasureInnerTemplateNames || (EMeasureInnerTemplateNames = {}));
 /** Стандартные шаблоны меры */
-var measureTemplateFormulas = (_a$2 = {},
-    _a$2[EMeasureTemplateNames.avg] = "avg({columnFormula})",
-    _a$2[EMeasureTemplateNames.count] = "count({columnFormula})",
-    _a$2[EMeasureTemplateNames.countDistinct] = "count(distinct {columnFormula})",
-    _a$2[EMeasureTemplateNames.median] = "medianExact({columnFormula})",
-    _a$2[EMeasureTemplateNames.min] = "min({columnFormula})",
-    _a$2[EMeasureTemplateNames.max] = "max({columnFormula})",
-    _a$2[EMeasureTemplateNames.sum] = "sum({columnFormula})",
-    _a$2);
+var measureTemplateFormulas = (_a$3 = {},
+    _a$3[EMeasureTemplateNames.avg] = "avg({columnFormula})",
+    _a$3[EMeasureTemplateNames.count] = "count({columnFormula})",
+    _a$3[EMeasureTemplateNames.countDistinct] = "count(distinct {columnFormula})",
+    _a$3[EMeasureTemplateNames.median] = "medianExact({columnFormula})",
+    _a$3[EMeasureTemplateNames.min] = "min({columnFormula})",
+    _a$3[EMeasureTemplateNames.max] = "max({columnFormula})",
+    _a$3[EMeasureTemplateNames.sum] = "sum({columnFormula})",
+    _a$3);
+var measureInnerTemplateFormulas = (_b = {},
+    _b[EMeasureInnerTemplateNames.begin] = "begin({columnFormula})",
+    _b[EMeasureInnerTemplateNames.end] = "end({columnFormula})",
+    _b);
 
 /** Шаблон процессной метрики меры с режимом CONVERSION */
-var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
+var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = {endEventName}{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
 /** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
 var prepareConversionParams = function (value) {
     if (!value.startEventName ||
@@ -1156,15 +1250,14 @@ var prepareConversionParams = function (value) {
         return null;
     }
     return {
-        objectFilters: "1",
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: value.startEventName,
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: value.endEventName,
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
     };
 };
@@ -1172,7 +1265,7 @@ var prepareConversionParams = function (value) {
 /** Шаблоны процессных метрик меры с режимом DURATION */
 var durationTemplates = (function () {
     var _a;
-    var innerTemplate = "\n    timeDiff(\n        process(\n            {startEventAggregationName}(\n                {startEventTimeFormula}, \n                {startEventNameFormula} = '{startEventName}'{startEventFilters}\n            ), \n            {endCaseCaseIdFormula}\n        ), \n        process(\n            {endEventAggregationName}(\n                {endEventTimeFormula}, \n                {endEventNameFormula} = '{endEventName}'{endEventFilters}\n            ), \n            {endCaseCaseIdFormula}\n        )\n    ), \n    process(\n        {startEventAggregationName}(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        {endEventAggregationName}(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n  ";
+    var innerTemplate = "\n    timeDiff(\n        process(\n            {startEventAggregationName}(\n                {startEventTimeFormula}, \n                {startEventNameFormula} = {startEventName}{startEventFilters}\n            ), \n            {endCaseCaseIdFormula}\n        ), \n        process(\n            {endEventAggregationName}(\n                {endEventTimeFormula}, \n                {endEventNameFormula} = {endEventName}{endEventFilters}\n            ), \n            {endCaseCaseIdFormula}\n        )\n    ), \n    process(\n        {startEventAggregationName}(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        {endEventAggregationName}(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = {endEventName}{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n  ";
     return _a = {},
         _a[EDurationTemplateName.avg] = "avgIf(".concat(innerTemplate, ")"),
         _a[EDurationTemplateName.median] = "medianIf(".concat(innerTemplate, ")"),
@@ -1195,32 +1288,31 @@ var prepareDurationParams = function (value) {
         return appearance === EEventAppearances.FIRST ? "minIf" : "maxIf";
     };
     return {
-        objectFilters: "1",
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: value.startEventName,
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         startEventAggregationName: getAggregationNameByAppearances(value.startEventAppearances),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: value.endEventName,
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
         endEventAggregationName: getAggregationNameByAppearances(value.endEventAppearances),
     };
 };
 
 function createAnyEventTemplate(aggregatePart) {
-    return "{outerAggregation}If(process(".concat(aggregatePart, ", {caseCaseIdFormula}), {objectFilters})");
+    return "{outerAggregation}(process(".concat(aggregatePart, ", {caseCaseIdFormula}))");
 }
 function createSpecificEventTemplate(fn, additionalFn) {
-    return "{outerAggregation}If(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})");
+    return "{outerAggregation}(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula}))");
 }
 function createTopLikeTemplate(template) {
     return function (outerAggregation) {
         return outerAggregation === EOuterAggregation.top
-            ? "{outerAggregation}KIf(1)(".concat(template, ", {objectFilters})[1]")
-            : "{outerAggregation}If(".concat(template, ", {objectFilters})");
+            ? "{outerAggregation}K(1)(".concat(template, ")[1]")
+            : "{outerAggregation}(".concat(template, ")");
     };
 }
 function createAggregationTemplate(templateName, _a) {
@@ -1267,9 +1359,9 @@ function createAggregationTemplate(templateName, _a) {
                 ? createAnyEventTemplate("argMax({columnFormula}, {eventTimeFormula})")
                 : createTopLikeTemplate(lastValueTemplate)(outerAggregation);
         case EMeasureAggregationTemplateName.countExecutions:
-            return "{outerAggregation}If(".concat(countExecutionsTemplate, ", {objectFilters})");
+            return "{outerAggregation}(".concat(countExecutionsTemplate, ")");
         case EMeasureAggregationTemplateName.countReworks:
-            return "{outerAggregation}If(".concat(countReworksTemplate, ", {objectFilters})");
+            return "{outerAggregation}(".concat(countReworksTemplate, ")");
     }
 }
 
@@ -1283,19 +1375,24 @@ function getMeasureFormula(_a) {
         return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
-        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
+        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName, innerTemplateName = value.innerTemplateName;
         var templateFormula = measureTemplateFormulas[templateName];
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
-            columnFormula: generateColumnFormula(tableName, columnName),
+        var columnFormula = innerTemplateName
+            ? fillTemplateSql(measureInnerTemplateFormulas[innerTemplateName], {
+                columnFormula: generateColumnFormula(tableName, columnName),
+            })
+            : generateColumnFormula(tableName, columnName);
+        return fillTemplateSql(templateFormula, {
+            columnFormula: columnFormula,
         });
     }
     if (value.mode === EWidgetIndicatorValueModes.AGGREGATION) {
         var preparedParams = prepareMeasureAggregationParams(value);
         return preparedParams
-            ? fillTemplateString(createAggregationTemplate(value.templateName, {
+            ? fillTemplateSql(createAggregationTemplate(value.templateName, {
                 outerAggregation: preparedParams.outerAggregation,
                 anyEvent: value.anyEvent,
             }), preparedParams)
@@ -1306,28 +1403,28 @@ function getMeasureFormula(_a) {
         if (!preparedParams) {
             return "";
         }
-        return fillTemplateString(conversionTemplate, preparedParams);
+        return fillTemplateSql(conversionTemplate, preparedParams);
     }
     if (value.mode === EWidgetIndicatorValueModes.DURATION) {
         var preparedParams = prepareDurationParams(value);
         if (!preparedParams) {
             return "";
         }
-        return fillTemplateString(durationTemplates[value.templateName], preparedParams);
+        return fillTemplateSql(durationTemplates[value.templateName], preparedParams);
     }
     return "";
 }
 
-var _a$1;
+var _a$2;
 var EEventMeasureTemplateNames;
 (function (EEventMeasureTemplateNames) {
     EEventMeasureTemplateNames["eventsCount"] = "eventsCount";
     EEventMeasureTemplateNames["reworksCount"] = "reworksCount";
 })(EEventMeasureTemplateNames || (EEventMeasureTemplateNames = {}));
-var eventMeasureTemplateFormulas = (_a$1 = {},
-    _a$1[EEventMeasureTemplateNames.eventsCount] = "count()",
-    _a$1[EEventMeasureTemplateNames.reworksCount] = "count() - uniqExact({caseCaseIdFormula})",
-    _a$1);
+var eventMeasureTemplateFormulas = (_a$2 = {},
+    _a$2[EEventMeasureTemplateNames.eventsCount] = "count()",
+    _a$2[EEventMeasureTemplateNames.reworksCount] = "count() - uniqExact({caseCaseIdFormula})",
+    _a$2);
 
 function getEventMeasureFormula(_a, process) {
     var value = _a.value;
@@ -1339,21 +1436,21 @@ function getEventMeasureFormula(_a, process) {
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
         var templateFormula = eventMeasureTemplateFormulas[value.templateName];
-        return templateFormula && fillTemplateString(templateFormula, process);
+        return templateFormula && fillTemplateSql(templateFormula, process);
     }
     return "";
 }
 
-var _a;
+var _a$1;
 var ETransitionMeasureTemplateNames;
 (function (ETransitionMeasureTemplateNames) {
     ETransitionMeasureTemplateNames["transitionsCount"] = "transitionsCount";
     ETransitionMeasureTemplateNames["medianTime"] = "medianTime";
 })(ETransitionMeasureTemplateNames || (ETransitionMeasureTemplateNames = {}));
-var transitionMeasureTemplateFormulas = (_a = {},
-    _a[ETransitionMeasureTemplateNames.transitionsCount] = "count()",
-    _a[ETransitionMeasureTemplateNames.medianTime] = "medianExact(date_diff(second, begin({eventTimeFormula}), end({eventTimeFormula})))",
-    _a);
+var transitionMeasureTemplateFormulas = (_a$1 = {},
+    _a$1[ETransitionMeasureTemplateNames.transitionsCount] = "count()",
+    _a$1[ETransitionMeasureTemplateNames.medianTime] = "medianExact(date_diff(second, begin({eventTimeFormula}), end({eventTimeFormula})))",
+    _a$1);
 
 function getTransitionMeasureFormula(_a, process) {
     var value = _a.value;
@@ -1365,7 +1462,7 @@ function getTransitionMeasureFormula(_a, process) {
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
         var templateFormula = transitionMeasureTemplateFormulas[value.templateName];
-        return templateFormula && fillTemplateString(templateFormula, process);
+        return templateFormula && fillTemplateSql(templateFormula, process);
     }
     return "";
 }
@@ -1549,7 +1646,9 @@ var getFormulaFilterValues = function (filterValue) {
     }
     return [];
 };
-var applyIndexToArrayFormula = function (formula, index) { return "".concat(formula, "[").concat(index, "]"); };
+var applyIndexToArrayFormula = function (formula, index) {
+    return "(".concat(formula, ")[").concat(index, "]");
+};
 var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!filterValue) {
         return null;
@@ -1557,7 +1656,7 @@ var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!isFormulaFilterValue(filterValue)) {
         return {
             dbDataType: EClickHouseBaseTypes.Bool,
-            formula: fillTemplateString(displayConditionTemplate, {
+            formula: fillTemplateSql(displayConditionTemplate, {
                 formula: prepareFormulaForSql(filterValue.formula),
             }),
             values: ["true"],
@@ -1592,6 +1691,46 @@ var mapFormulaFiltersToInputs = function (filters) {
     return compactMap(filters, mapFormulaFilterToCalculatorInput);
 };
 
+var _a;
+var intervalByUnit = (_a = {},
+    _a[EDimensionProcessFilterTimeUnit.YEARS] = "year",
+    _a[EDimensionProcessFilterTimeUnit.MONTHS] = "month",
+    _a[EDimensionProcessFilterTimeUnit.DAYS] = "day",
+    _a[EDimensionProcessFilterTimeUnit.HOURS] = "hour",
+    _a[EDimensionProcessFilterTimeUnit.MINUTES] = "minute",
+    _a);
+function mapDimensionProcessFilterToCalculatorInput(filter) {
+    var formula = filter.value.mode === EWidgetIndicatorValueModes.FORMULA
+        ? filter.value.formula
+        : getProcessDimensionValueFormula(filter.value);
+    if (formula === undefined) {
+        throw new Error("Formula generation error");
+    }
+    var _a = filter.condition, timeUnit = _a.timeUnit, filteringMethod = _a.filteringMethod, values = _a.values;
+    if (filteringMethod === "LAST_TIME") {
+        if (!timeUnit) {
+            throw new Error("Missing time unit");
+        }
+        return {
+            dbDataType: EClickHouseBaseTypes.Bool,
+            formula: "date_diff('".concat(intervalByUnit[timeUnit], "', ").concat(formula, ", now())"),
+            values: values,
+            filteringMethod: formulaFilterMethods.LESS_THAN_OR_EQUAL_TO,
+        };
+    }
+    return { formula: formula, filteringMethod: filteringMethod, values: values, dbDataType: filter.dbDataType };
+}
+
+var mapSettingsFilterToCalculatorInput = function (filter) {
+    if (isDimensionProcessFilter(filter)) {
+        return mapDimensionProcessFilterToCalculatorInput(filter);
+    }
+    return mapFormulaFilterToCalculatorInput(filter);
+};
+var mapSettingsFiltersToInputs = function (filters) {
+    return compactMap(filters, mapSettingsFilterToCalculatorInput);
+};
+
 function mapMeasureToInput(measure, variables, addFormulas) {
     if (addFormulas === void 0) { addFormulas = function () { return new Map(); }; }
     var mainFormula = getMeasureFormula(measure);
@@ -2086,4 +2225,4 @@ var getColorByIndex = function (index) {
     return color;
 };
 
-export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, OuterAggregation, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getRuleColor, getTransitionMeasureFormula, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureInnerTemplateNames, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, OuterAggregation, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateSql, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureInnerTemplateFormulas, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };