@infomaximum/widget-sdk 6.0.0-2508.4 → 6.0.0-2509.0

package/CHANGELOG.md

@@ -2,149 +2,150 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [6.0.0-2508.4](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.3...v6.0.0-2508.4) (2025-10-01)
+## [6.0.0-2509.0](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-13...v6.0.0-2509.0) (2026-05-15)
 
 
 ### Bug Fixes
 
-* исправлено отсутствие экранирования спец символов в процессных метриках ([79a3535](https://github.com/Infomaximum/widget-sdk/commit/79a35354d16224590af4d9bb1d7aad762c719929))
+* исправлен пропуск NULL-строк в фильтре по формуле [BI-16341] ([9e5da85](https://github.com/Infomaximum/widget-sdk/commit/9e5da85249aba553337988207c2cfd904301ef3d))
 
-## [6.0.0-2508.3](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.2...v6.0.0-2508.3) (2025-09-30)
+## [6.0.0-13](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-12...v6.0.0-13) (2025-10-01)
 
-## [6.0.0-2508.2](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.1...v6.0.0-2508.2) (2025-09-23)
 
+### Bug Fixes
 
-### Features
+* исправлены шаблоны формул и функции подготовки параметров наполнения шаблонов. Отказ от удаления однострочных и многострочных комментариев ([97332be](https://github.com/Infomaximum/widget-sdk/commit/97332be7bddd6942f3670ff806470b9c1a59c122))
 
-* удален флаг isBordered для IInputControl [BI-15461] ([aabacfe](https://github.com/Infomaximum/widget-sdk/commit/aabacfe1ed8083f8ac891b619f26ec612dbf59fa))
+## [6.0.0-12](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-11...v6.0.0-12) (2025-09-29)
 
-## [6.0.0-2508.1](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.0...v6.0.0-2508.1) (2025-09-12)
 
+### Features
 
-### ⚠ BREAKING CHANGES
+* для параметров действий образа добавлен id ([4b92d35](https://github.com/Infomaximum/widget-sdk/commit/4b92d3547a6048b8326db94ec360515d99e17b1a))
+
+## [6.0.0-11](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-10...v6.0.0-11) (2025-09-23)
 
-* в виджетах требуется обработать получение нового типа фильтра
 
 ### Features
 
-* в настройки виджетов и образов добавлен новый тип фильтра - по процессному разрезу ([e5811d1](https://github.com/Infomaximum/widget-sdk/commit/e5811d1c2f5beb31374aa845b256ccae9044baad))
+* удален флаг isBordered для IInputControl [BI-15461] ([d60c32d](https://github.com/Infomaximum/widget-sdk/commit/d60c32d02134c10b1aa799dc5a45e2656fe5aefd))
+
+## [6.0.0-10](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.1...v6.0.0-10) (2025-09-12)
+
+## [6.0.0-9](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-8...v6.0.0-9) (2025-09-12)
 
 
 ### Bug Fixes
 
-* исправлена типизация полей интерфейса TWidgetIndicatorTimeValue ([9beb5d9](https://github.com/Infomaximum/widget-sdk/commit/9beb5d97ec62c774f894a389067058494186dfc7))
-* поле timeUnit сделано необязательным в фильтре по процессному разрезу ([3c97c94](https://github.com/Infomaximum/widget-sdk/commit/3c97c94a1fb7e7112dd9c4737346d50ca746c84d))
+* исправлен баг с подстановкой значений в template строки ([12166b5](https://github.com/Infomaximum/widget-sdk/commit/12166b587b74e0ff912822b0d065463b8f23121e))
 
-## [6.0.0-2508.0](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-7...v6.0.0-2508.0) (2025-09-11)
+## [6.0.0-8](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2508.0...v6.0.0-8) (2025-09-11)
 
-## [6.0.0-7](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-6...v6.0.0-7) (2025-09-10)
+## [6.0.0-9](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-8...v6.0.0-9) (2025-09-12)
 
+### Bug Fixes
+
+- исправлен баг с подстановкой значений в template строки ([12166b5](https://github.com/Infomaximum/widget-sdk/commit/12166b587b74e0ff912822b0d065463b8f23121e))
+
+## [6.0.0-8](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-7...v6.0.0-8) (2025-09-11)
+
+## [6.0.0-7](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-6...v6.0.0-7) (2025-09-10)
 
 ### Bug Fixes
 
-* исправлена проблема с подстановкой sql-комментариев в формулы. ([a07cbbe](https://github.com/Infomaximum/widget-sdk/commit/a07cbbe3d1597d9eb22bdeb0ee4621abecbd5740))
+- исправлена проблема с подстановкой sql-комментариев в формулы. ([a07cbbe](https://github.com/Infomaximum/widget-sdk/commit/a07cbbe3d1597d9eb22bdeb0ee4621abecbd5740))
 
 ## [6.0.0-6](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-5...v6.0.0-6) (2025-09-02)
 
-
 ### ⚠ BREAKING CHANGES
 
-* Удален formattingTemplate. Изменены поля формат и форматирование
+- Удален formattingTemplate. Изменены поля формат и форматирование
 
 ### Features
 
-* изменены формат и форматирование. Удален formattingTemplate. Добавлен новый контрол inputTemplated. ([7c3d230](https://github.com/Infomaximum/widget-sdk/commit/7c3d230c443f897d20be4ec4a23f6fe6b914a213))
+- изменены формат и форматирование. Удален formattingTemplate. Добавлен новый контрол inputTemplated. ([7c3d230](https://github.com/Infomaximum/widget-sdk/commit/7c3d230c443f897d20be4ec4a23f6fe6b914a213))
 
 ## [6.0.0-5](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-4...v6.0.0-5) (2025-09-01)
 
-
 ### Features
 
-* добавлена поддержка фильтрации шаблонов мер и агригатных разрезов [WD-1197] ([af49cc3](https://github.com/Infomaximum/widget-sdk/commit/af49cc3ff7840f0d7762c6c40eb1bf183a32d4b7))
-* добавлена фильтрация шаблонов для процессных разрезов времяни [WD-1197] ([564cd57](https://github.com/Infomaximum/widget-sdk/commit/564cd5782276c4ec74c8d26de109f0d2e9deec50))
+- добавлена поддержка фильтрации шаблонов мер и агригатных разрезов [WD-1197] ([af49cc3](https://github.com/Infomaximum/widget-sdk/commit/af49cc3ff7840f0d7762c6c40eb1bf183a32d4b7))
+- добавлена фильтрация шаблонов для процессных разрезов времяни [WD-1197] ([564cd57](https://github.com/Infomaximum/widget-sdk/commit/564cd5782276c4ec74c8d26de109f0d2e9deec50))
 
 ## [6.0.0-4](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-3...v6.0.0-4) (2025-08-29)
 
-
 ### ⚠ BREAKING CHANGES
 
-* если виджеты использовали типы данных процесса, то теперь должны запрашивать их сами через type_calculator
-* требуется поддержка в виджетах
+- если виджеты использовали типы данных процесса, то теперь должны запрашивать их сами через type_calculator
+- требуется поддержка в виджетах
 
 ### Features
 
-* удален deprecated код в связи с переходом на widget-sdk 6 ([c1ce6cb](https://github.com/Infomaximum/widget-sdk/commit/c1ce6cb5f3838a4bfea3003ee2de0cb494477e8c))
-* удалены типы данных из интерфейса процесса ([3b17150](https://github.com/Infomaximum/widget-sdk/commit/3b17150ef67facaf50e489ec308a69fad1d6db82))
+- удален deprecated код в связи с переходом на widget-sdk 6 ([c1ce6cb](https://github.com/Infomaximum/widget-sdk/commit/c1ce6cb5f3838a4bfea3003ee2de0cb494477e8c))
+- удалены типы данных из интерфейса процесса ([3b17150](https://github.com/Infomaximum/widget-sdk/commit/3b17150ef67facaf50e489ec308a69fad1d6db82))
 
 ## [6.0.0-3](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-2...v6.0.0-3) (2025-08-28)
 
-
 ### Features
 
-* виджета дана возможность фильтровать таблицы в дропдаунах кнопок добавления индикаторов и фильтрации по процессам ([cb9fd22](https://github.com/Infomaximum/widget-sdk/commit/cb9fd22cbf6ebf12f0261949ab9d467edcaf0a36))
+- виджета дана возможность фильтровать таблицы в дропдаунах кнопок добавления индикаторов и фильтрации по процессам ([cb9fd22](https://github.com/Infomaximum/widget-sdk/commit/cb9fd22cbf6ebf12f0261949ab9d467edcaf0a36))
 
 ## [6.0.0-2](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-1...v6.0.0-2) (2025-08-26)
 
-
 ### ⚠ BREAKING CHANGES
 
-* - Виджеты, использующие импорты, связанные со старым синтаксисом ссылок, будут работать некорректно в новой версии системы (dashboardLinkRegExp, workspaceLinkRegExp, parseIndicatorLink, getRuleColor, isValidColor).
-- Функция escapeSpecialCharacters заменена на escapeDoubleQuoteLinkName.
-- Константа linkNameRegExp удалена - вместо нее используется curlyBracketsContentPattern.
+- - Виджеты, использующие импорты, связанные со старым синтаксисом ссылок, будут работать некорректно в новой версии системы (dashboardLinkRegExp, workspaceLinkRegExp, parseIndicatorLink, getRuleColor, isValidColor).
+
+* Функция escapeSpecialCharacters заменена на escapeDoubleQuoteLinkName.
+* Константа linkNameRegExp удалена - вместо нее используется curlyBracketsContentPattern.
 
 ### Features
 
-* добавлена поддержка нового синтаксиса ссылок на показатели ([7449482](https://github.com/Infomaximum/widget-sdk/commit/74494820ae4ca9e05f5d225ad243a57ca0a6d6aa))
+- добавлена поддержка нового синтаксиса ссылок на показатели ([7449482](https://github.com/Infomaximum/widget-sdk/commit/74494820ae4ca9e05f5d225ad243a57ca0a6d6aa))
 
 ## [6.0.0-1](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-0...v6.0.0-1) (2025-08-26)
 
-
 ### ⚠ BREAKING CHANGES
 
-* если виджет использовал guid, то требуется поддержка
+- если виджет использовал guid, то требуется поддержка
 
 ### Features
 
-* удален guid из интерфейсов. ([f50d978](https://github.com/Infomaximum/widget-sdk/commit/f50d9781ab2fc41ed1deb3fafee262e4c4057db1))
+- удален guid из интерфейсов. ([f50d978](https://github.com/Infomaximum/widget-sdk/commit/f50d9781ab2fc41ed1deb3fafee262e4c4057db1))
 
 ## [6.0.0-0](https://github.com/Infomaximum/widget-sdk/compare/v5.33.1...v6.0.0-0) (2025-08-20)
 
-
 ### ⚠ BREAKING CHANGES
 
-* получение ф-ии шаблона процессной агрегации для меры через константу "measureAggregationTemplates" заменено на получение через ф-ию "createAggregationFormulaByTemplateName"
-* поле actions удалено из настроек виджетов
+- получение ф-ии шаблона процессной агрегации для меры через константу "measureAggregationTemplates" заменено на получение через ф-ию "createAggregationFormulaByTemplateName"
+- поле actions удалено из настроек виджетов
 
 ### Features
 
-* отказ от поля actions в пользу actionButtons в настройках виджетов ([2ee361a](https://github.com/Infomaximum/widget-sdk/commit/2ee361a5ab1478e1b0ad90feae2256cf90d46058))
-* расширен IInputControl полями hint и hintPlacement. Для запуска скрипта из действий по клику добавлена подсказка ([63d02d6](https://github.com/Infomaximum/widget-sdk/commit/63d02d68bc38bb6d6b1bb2dfd1898d4b948ee6fc))
-
+- отказ от поля actions в пользу actionButtons в настройках виджетов ([2ee361a](https://github.com/Infomaximum/widget-sdk/commit/2ee361a5ab1478e1b0ad90feae2256cf90d46058))
+- расширен IInputControl полями hint и hintPlacement. Для запуска скрипта из действий по клику добавлена подсказка ([63d02d6](https://github.com/Infomaximum/widget-sdk/commit/63d02d68bc38bb6d6b1bb2dfd1898d4b948ee6fc))
 
-* From BI-15231 into master (#92) ([8257237](https://github.com/Infomaximum/widget-sdk/commit/8257237e12b42ee403378408d0bb5007853c379d)), closes [#92](https://github.com/Infomaximum/widget-sdk/issues/92)
+- From BI-15231 into master (#92) ([8257237](https://github.com/Infomaximum/widget-sdk/commit/8257237e12b42ee403378408d0bb5007853c379d)), closes [#92](https://github.com/Infomaximum/widget-sdk/issues/92)
 
 ### [5.33.1](https://github.com/Infomaximum/widget-sdk/compare/v5.33.0...v5.33.1) (2025-08-15)
 
 ## [5.33.0](https://github.com/Infomaximum/widget-sdk/compare/v5.32.1...v5.33.0) (2025-08-06)
 
-
 ### Features
 
-* расширены шаблоны процессных агрегаций ([f2bfbaf](https://github.com/Infomaximum/widget-sdk/commit/f2bfbafb557ba72ae605d906ae1341109adf3894))
+- расширены шаблоны процессных агрегаций ([f2bfbaf](https://github.com/Infomaximum/widget-sdk/commit/f2bfbafb557ba72ae605d906ae1341109adf3894))
 
 ### [5.32.1](https://github.com/Infomaximum/widget-sdk/compare/v5.32.0...v5.32.1) (2025-08-05)
 
-
 ### Bug Fixes
 
-* исправлена типизация ответов вычислителей ([0453793](https://github.com/Infomaximum/widget-sdk/commit/04537930ba1916d300b279e658a7e9b8da191af4))
+- исправлена типизация ответов вычислителей ([0453793](https://github.com/Infomaximum/widget-sdk/commit/04537930ba1916d300b279e658a7e9b8da191af4))
 
 ## [5.32.0](https://github.com/Infomaximum/widget-sdk/compare/v5.31.0...v5.32.0) (2025-07-31)
 
-
 ### Features
 
-* добавлена возможность управления якорем для сохранения положения виджета ([3bd5610](https://github.com/Infomaximum/widget-sdk/commit/3bd561058e48055ec10f99c53f88f2fcddf18d94))
+- добавлена возможность управления якорем для сохранения положения виджета ([3bd5610](https://github.com/Infomaximum/widget-sdk/commit/3bd561058e48055ec10f99c53f88f2fcddf18d94))
 
 ## [5.31.0](https://github.com/Infomaximum/widget-sdk/compare/v5.30.0...v5.31.0) (2025-07-17)
 
@@ -152,15 +153,13 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [5.29.0-0](https://github.com/Infomaximum/widget-sdk/compare/v5.28.0...v5.29.0-0) (2025-07-10)
 
-
 ### Features
 
-* отказ от имени процесса ([4fa01d5](https://github.com/Infomaximum/widget-sdk/commit/4fa01d5c2602211810277d0b6aef6b4d5f62e19c))
-
+- отказ от имени процесса ([4fa01d5](https://github.com/Infomaximum/widget-sdk/commit/4fa01d5c2602211810277d0b6aef6b4d5f62e19c))
 
 ### Bug Fixes
 
-* deprecated поле processName для интерфейса IProcessGraphCalculatorInput сделано необзятельным ([859f959](https://github.com/Infomaximum/widget-sdk/commit/859f959ea963ea2ed9214ccc4a4dc43a8b49142c))
+- deprecated поле processName для интерфейса IProcessGraphCalculatorInput сделано необзятельным ([859f959](https://github.com/Infomaximum/widget-sdk/commit/859f959ea963ea2ed9214ccc4a4dc43a8b49142c))
 
 ## [5.30.0](https://github.com/Infomaximum/widget-sdk/compare/v5.29.0...v5.30.0) (2025-07-15)
 

package/dist/index.d.ts

@@ -1142,7 +1142,7 @@ interface IActionButton extends IAutoIdentifiedArrayItem {
     color: TColor;
     hint?: string;
 }
-type TViewActionParameter = (IParameterFromAggregation | IParameterFromVariable) & {
+type TViewActionParameter = (IParameterFromAggregation | IParameterFromVariable) & IAutoIdentifiedArrayItem & {
     name: string;
 };
 interface IViewAction {
@@ -1777,20 +1777,25 @@ declare function checkDisplayCondition(displayCondition: TNullable<TDisplayCondi
 declare function getDisplayConditionFormula(displayCondition: TNullable<TDisplayCondition>): TNullable<string>;
 declare const replaceDisplayCondition: <I extends IWidgetColumnIndicator>(dimension: I, displayCondition: TNullable<TDisplayCondition>) => TNullable<I>;
 /**
- * Шаблон формулы для проверки условия отображения.
+ * Шаблон формулы для приведения произвольного выражения к Boolean.
+ * Используется и для display-condition виджетов/вкладок/инпутов,
+ * и для фильтров по формуле.
  *
+ * NULL отсекается явной проверкой isNotNull (трактуется как false).
+ * Остальные непреобразуемые к Boolean значения подпадают под дефолт true.
+ *
+ * - null -> false (явная проверка isNotNull)
  * - 0 -> false
  * - 1 -> true
  * - 15 -> true
- * - '0' ->	false
+ * - '0' -> false
  * - '1' -> true
- * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - '15' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  * - 'false' -> false
  * - 'true' -> true
  * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
- * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  */
-declare const displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
+declare const displayConditionTemplate = "isNotNull({formula}) AND accurateCastOrDefault({formula}, 'Boolean', true)";
 
 /** Конвертировать меры виджета во входы для вычислителя */
 declare function mapMeasuresToInputs<T extends IWidgetMeasure>(measures: T[], variables: Map<string, TWidgetVariable>, addFormulas?: (measure: T) => Map<string, string>): ICalculatorMeasureInput[];
@@ -2020,14 +2025,14 @@ declare const prepareMeasureAggregationParams: (value: Extract<IWidgetMeasure["v
     outerAggregation: EOuterAggregation;
     eventNameFormula: string;
     caseCaseIdFormula: string;
-    eventName: string | null;
+    eventName: string;
     filters: string;
     eventTimeFormula: string;
     columnFormula: string;
 } | null;
 
 /** Шаблон процессной метрики меры с режимом CONVERSION */
-declare const 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)";
+declare const 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 подготовить параметры для подстановки в шаблонную формулу */
 declare const prepareConversionParams: (value: TWidgetIndicatorConversionValue) => {
     startEventTimeFormula: string;
@@ -2062,7 +2067,7 @@ declare const prepareDurationParams: (value: TWidgetIndicatorDurationValue) => {
     endEventAggregationName: string;
 } | null;
 
-declare function getEventMeasureFormula({ value }: IProcessIndicator, process: IWidgetProcess): string;
+declare function getEventMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
 
 declare enum EEventMeasureTemplateNames {
     eventsCount = "eventsCount",
@@ -2073,7 +2078,7 @@ declare const eventMeasureTemplateFormulas: {
     readonly reworksCount: "count() - uniqExact({caseCaseIdFormula})";
 };
 
-declare function getTransitionMeasureFormula({ value }: IProcessIndicator, process: IWidgetProcess): string;
+declare function getTransitionMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
 
 declare enum ETransitionMeasureTemplateNames {
     transitionsCount = "transitionsCount",
@@ -2084,9 +2089,12 @@ declare const transitionMeasureTemplateFormulas: {
     readonly medianTime: "medianExact(date_diff(second, begin({eventTimeFormula}), end({eventTimeFormula})))";
 };
 
-declare const countExecutionsTemplate = "process(countIf({eventNameFormula} in '{eventName}'{filters}), {caseCaseIdFormula})";
+declare const countExecutionsTemplate = "process(countIf({eventNameFormula} in {eventName}{filters}), {caseCaseIdFormula})";
 
+/** @deprecated - следует использовать fillTemplateSql */
 declare function fillTemplateString(templateString: string, params: Record<string, any>): string;
+/** Функция для безопасного заполнения SQL шаблонов с защитой от однострочных SQL комментариев в подставляемых значениях. */
+declare function fillTemplateSql(templateString: string, params: Record<string, string>): string;
 
 declare function generateColumnFormula(tableName: string, columnName: string): string;
 
@@ -2749,4 +2757,4 @@ declare global {
     }
 }
 
-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, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionButton, type IActionGoToUrl, type IActionOnClickControl, type IActionRunScript, type IActionScript, type IActionUpdateVariable, type IAddButtonSelectOption, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IAutoIdentifiedArrayItem, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorOptions, type ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionProcessFilter, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayConditionControl, type IDisplayPredicate, type IDisplayRule, type IDivePanelDescription, type IDividerRecord, type IEdge, type IEventsColorControl, type IEventsPickerControl, type IExportColumnOrder, type IFillSettings, type IFilterControl, type IFormattingControl, type IFormattingTemplateControl, type IFormulaControl, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGlobalContext, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type IIndicatorLink, type IInitialSettings, type IInputControl, type IInputMarkdownControl, type IInputNumberControl, type IInputRangeControl, type IInputTemplatedControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IParameterColumnList, type IParameterFromAggregation, type IParameterFromColumn, type IParameterFromDynamicList, type IParameterFromEndEvent, type IParameterFromEvent, type IParameterFromFormula, type IParameterFromManualInput, type IParameterFromStartEvent, type IParameterFromStaticList, type IParameterFromVariable, type IParameterTableList, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessFilterPreviewParams, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRadioIconGroupControl, type IRange, type ISelectBranchOption, type ISelectControl, type ISelectDividerOption, type ISelectGroupOption, type ISelectLeafOption, type ISelectNode, type ISelectOption, type ISelectSystemOption, type ISettingsMigratorParams, type ISizeControl, type ISortOrder, type ISortingAddButtonProps, type IStagesFilterValue, type IStaticListLabeledOption, type ISwitchControl, type ITagSetControl, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type ITypeCalculatorOutputItem, type ITypedFormulaControl, type IVertex, type IViewAction, type IViewContext, type IWidget, type IWidgetAction, type IWidgetColumnIndicator, type IWidgetColumnListVariable, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetDynamicListVariable, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetIndicator, type IWidgetIndicatorAddButtonProps, type IWidgetManifest, type IWidgetMeasure, type IWidgetMigrator, type IWidgetPersistValue, type IWidgetPlaceholderController, type IWidgetPlaceholderValues, type IWidgetPresetSettings, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetStaticListVariable, type IWidgetStaticVariable, type IWidgetStruct, type IWidgetTable, type IWidgetTableColumn, OuterAggregation, type TAction, type TActionOnClickParameter, type TActionOpenView, type TActionValidator, type TActionsOnClick, type TAddButton, type TBoundedContentWithIndicator, type TColor, type TColorBase, type TColorRule, type TColumnIndicatorValue, type TContextMenu, type TContextMenuButton, type TContextMenuButtonActions, type TContextMenuButtonApply, type TContextMenuButtonClose, type TContextMenuButtonCustom, type TContextMenuButtonGroup, type TContextMenuButtonOptions, type TContextMenuList, type TContextMenuPositionUnit, type TContextMenuRow, type TControlUnion, type TCustomAddButtonSelectOption, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TExtendedFormulaFilterValue, type TFiltrationAccessibility, type TGroupLevelRecord, type THintPlacement, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMigrateProcessor, type TMigrationStruct, type TParameterFromDataModel, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSettingsFilter, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TViewActionParameter, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorDurationValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetMeasureData, type TWidgetSortingValue, type TWidgetVariable, 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, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, 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, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionButton, type IActionGoToUrl, type IActionOnClickControl, type IActionRunScript, type IActionScript, type IActionUpdateVariable, type IAddButtonSelectOption, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IAutoIdentifiedArrayItem, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorOptions, type ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionProcessFilter, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayConditionControl, type IDisplayPredicate, type IDisplayRule, type IDivePanelDescription, type IDividerRecord, type IEdge, type IEventsColorControl, type IEventsPickerControl, type IExportColumnOrder, type IFillSettings, type IFilterControl, type IFormattingControl, type IFormattingTemplateControl, type IFormulaControl, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGlobalContext, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type IIndicatorLink, type IInitialSettings, type IInputControl, type IInputMarkdownControl, type IInputNumberControl, type IInputRangeControl, type IInputTemplatedControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IParameterColumnList, type IParameterFromAggregation, type IParameterFromColumn, type IParameterFromDynamicList, type IParameterFromEndEvent, type IParameterFromEvent, type IParameterFromFormula, type IParameterFromManualInput, type IParameterFromStartEvent, type IParameterFromStaticList, type IParameterFromVariable, type IParameterTableList, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessFilterPreviewParams, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRadioIconGroupControl, type IRange, type ISelectBranchOption, type ISelectControl, type ISelectDividerOption, type ISelectGroupOption, type ISelectLeafOption, type ISelectNode, type ISelectOption, type ISelectSystemOption, type ISettingsMigratorParams, type ISizeControl, type ISortOrder, type ISortingAddButtonProps, type IStagesFilterValue, type IStaticListLabeledOption, type ISwitchControl, type ITagSetControl, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type ITypeCalculatorOutputItem, type ITypedFormulaControl, type IVertex, type IViewAction, type IViewContext, type IWidget, type IWidgetAction, type IWidgetColumnIndicator, type IWidgetColumnListVariable, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetDynamicListVariable, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetIndicator, type IWidgetIndicatorAddButtonProps, type IWidgetManifest, type IWidgetMeasure, type IWidgetMigrator, type IWidgetPersistValue, type IWidgetPlaceholderController, type IWidgetPlaceholderValues, type IWidgetPresetSettings, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetStaticListVariable, type IWidgetStaticVariable, type IWidgetStruct, type IWidgetTable, type IWidgetTableColumn, OuterAggregation, type TAction, type TActionOnClickParameter, type TActionOpenView, type TActionValidator, type TActionsOnClick, type TAddButton, type TBoundedContentWithIndicator, type TColor, type TColorBase, type TColorRule, type TColumnIndicatorValue, type TContextMenu, type TContextMenuButton, type TContextMenuButtonActions, type TContextMenuButtonApply, type TContextMenuButtonClose, type TContextMenuButtonCustom, type TContextMenuButtonGroup, type TContextMenuButtonOptions, type TContextMenuList, type TContextMenuPositionUnit, type TContextMenuRow, type TControlUnion, type TCustomAddButtonSelectOption, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TExtendedFormulaFilterValue, type TFiltrationAccessibility, type TGroupLevelRecord, type THintPlacement, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMigrateProcessor, type TMigrationStruct, type TParameterFromDataModel, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSettingsFilter, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TViewActionParameter, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorDurationValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetMeasureData, type TWidgetSortingValue, type TWidgetVariable, 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, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

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;
@@ -757,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");
@@ -773,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` */
@@ -848,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) {
@@ -973,7 +1049,7 @@ var prepareDimensionAggregationParams = function (value) {
     var commonParams = {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: escapeSingularQuotes(value.eventName),
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -1002,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 подготовить параметры для подстановки в шаблонную формулу */
@@ -1026,7 +1102,7 @@ var prepareTimeParams = function (value) {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
         filters: convertFiltersToFormula(value.filters),
-        eventName: escapeSingularQuotes(value.eventName),
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
     };
 };
 
@@ -1045,7 +1121,7 @@ function getDimensionFormula(_a) {
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
+        return fillTemplateSql(templateFormula, {
             columnFormula: generateColumnFormula(tableName, columnName),
         });
     }
@@ -1061,10 +1137,10 @@ function getProcessDimensionValueFormula(value) {
             ? 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) {
@@ -1073,7 +1149,7 @@ function getProcessDimensionValueFormula(value) {
             return "";
         }
         var templateFormula = timeTemplates[value.mode][value.templateName];
-        return fillTemplateString(templateFormula, preparedParams);
+        return fillTemplateSql(templateFormula, preparedParams);
     }
 }
 
@@ -1106,7 +1182,7 @@ var prepareMeasureAggregationParams = function (value) {
         outerAggregation: value.outerAggregation,
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: value.eventName ? escapeSingularQuotes(value.eventName) : value.eventName,
+        eventName: value.eventName ? "'".concat(escapeSingularQuotes(value.eventName), "'") : "",
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -1150,7 +1226,7 @@ var measureTemplateFormulas = (_a$3 = {},
     _a$3);
 
 /** Шаблон процессной метрики меры с режимом 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 ||
@@ -1168,11 +1244,11 @@ var prepareConversionParams = function (value) {
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: escapeSingularQuotes(value.startEventName),
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: escapeSingularQuotes(value.endEventName),
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
     };
 };
@@ -1180,7 +1256,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, ")"),
@@ -1206,12 +1282,12 @@ var prepareDurationParams = function (value) {
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: escapeSingularQuotes(value.startEventName),
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         startEventAggregationName: getAggregationNameByAppearances(value.startEventAppearances),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: escapeSingularQuotes(value.endEventName),
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
         endEventAggregationName: getAggregationNameByAppearances(value.endEventAppearances),
     };
@@ -1221,7 +1297,7 @@ function createAnyEventTemplate(aggregatePart) {
     return "{outerAggregation}(process(".concat(aggregatePart, ", {caseCaseIdFormula}))");
 }
 function createSpecificEventTemplate(fn, additionalFn) {
-    return "{outerAggregation}(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}))");
+    return "{outerAggregation}(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula}))");
 }
 function createTopLikeTemplate(template) {
     return function (outerAggregation) {
@@ -1295,14 +1371,14 @@ function getMeasureFormula(_a) {
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
+        return fillTemplateSql(templateFormula, {
             columnFormula: generateColumnFormula(tableName, columnName),
         });
     }
     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)
@@ -1313,14 +1389,14 @@ 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 "";
 }
@@ -1346,7 +1422,7 @@ 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 "";
 }
@@ -1372,7 +1448,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 "";
 }
@@ -1424,20 +1500,25 @@ var replaceDisplayCondition = function (dimension, displayCondition) {
     return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 /**
- * Шаблон формулы для проверки условия отображения.
+ * Шаблон формулы для приведения произвольного выражения к Boolean.
+ * Используется и для display-condition виджетов/вкладок/инпутов,
+ * и для фильтров по формуле.
+ *
+ * NULL отсекается явной проверкой isNotNull (трактуется как false).
+ * Остальные непреобразуемые к Boolean значения подпадают под дефолт true.
  *
+ * - null -> false (явная проверка isNotNull)
  * - 0 -> false
  * - 1 -> true
  * - 15 -> true
- * - '0' ->	false
+ * - '0' -> false
  * - '1' -> true
- * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - '15' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  * - 'false' -> false
  * - 'true' -> true
  * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
- * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  */
-var displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
+var displayConditionTemplate = "isNotNull({formula}) AND accurateCastOrDefault({formula}, 'Boolean', true)";
 
 var ELastTimeUnit;
 (function (ELastTimeUnit) {
@@ -1564,7 +1645,7 @@ var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!isFormulaFilterValue(filterValue)) {
         return {
             dbDataType: EClickHouseBaseTypes.Bool,
-            formula: fillTemplateString(displayConditionTemplate, {
+            formula: fillTemplateSql(displayConditionTemplate, {
                 formula: prepareFormulaForSql(filterValue.formula),
             }),
             values: ["true"],
@@ -2133,4 +2214,4 @@ var getColorByIndex = function (index) {
     return color;
 };
 
-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, 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, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, 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, 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, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.js

@@ -133,6 +133,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;
@@ -758,14 +787,14 @@ exports.EEventAppearances = void 0;
 })(exports.EEventAppearances || (exports.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");
@@ -774,8 +803,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` */
@@ -849,7 +925,7 @@ var escapeSingularQuotes = function (formula) {
 };
 
 var prepareFormulaForSql = function (formula, simpleType) {
-    formula = clearSingleLineComments(clearMultiLineComments(formula)).trim();
+    formula = sanitizeSingleLineComment(formula, true);
     return simpleType === exports.ESimpleDataType.OTHER ? "toString(".concat(formula, ")") : formula;
 };
 var clearSingleLineComments = function (formula) {
@@ -974,7 +1050,7 @@ var prepareDimensionAggregationParams = function (value) {
     var commonParams = {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: escapeSingularQuotes(value.eventName),
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -1003,13 +1079,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[exports.EWidgetIndicatorValueModes.START_TIME] = generateTemplates("process(minIf({eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})"),
-        _a[exports.EWidgetIndicatorValueModes.END_TIME] = generateTemplates("process(maxIf({eventTimeFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula})"),
+        _a[exports.EWidgetIndicatorValueModes.START_TIME] = generateTemplates("process(minIf({eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})"),
+        _a[exports.EWidgetIndicatorValueModes.END_TIME] = generateTemplates("process(maxIf({eventTimeFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula})"),
         _a;
 })();
 /** На основе значения режимов START_TIME/END_TIME подготовить параметры для подстановки в шаблонную формулу */
@@ -1027,7 +1103,7 @@ var prepareTimeParams = function (value) {
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
         filters: convertFiltersToFormula(value.filters),
-        eventName: escapeSingularQuotes(value.eventName),
+        eventName: "'".concat(escapeSingularQuotes(value.eventName), "'"),
     };
 };
 
@@ -1046,7 +1122,7 @@ function getDimensionFormula(_a) {
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
+        return fillTemplateSql(templateFormula, {
             columnFormula: generateColumnFormula(tableName, columnName),
         });
     }
@@ -1062,10 +1138,10 @@ function getProcessDimensionValueFormula(value) {
             ? 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 === exports.EWidgetIndicatorValueModes.START_TIME ||
         value.mode === exports.EWidgetIndicatorValueModes.END_TIME) {
@@ -1074,7 +1150,7 @@ function getProcessDimensionValueFormula(value) {
             return "";
         }
         var templateFormula = timeTemplates[value.mode][value.templateName];
-        return fillTemplateString(templateFormula, preparedParams);
+        return fillTemplateSql(templateFormula, preparedParams);
     }
 }
 
@@ -1107,7 +1183,7 @@ var prepareMeasureAggregationParams = function (value) {
         outerAggregation: value.outerAggregation,
         eventNameFormula: value.eventNameFormula,
         caseCaseIdFormula: value.caseCaseIdFormula,
-        eventName: value.eventName ? escapeSingularQuotes(value.eventName) : value.eventName,
+        eventName: value.eventName ? "'".concat(escapeSingularQuotes(value.eventName), "'") : "",
         filters: convertFiltersToFormula(value.filters),
         eventTimeFormula: "",
         columnFormula: "",
@@ -1151,7 +1227,7 @@ var measureTemplateFormulas = (_a$3 = {},
     _a$3);
 
 /** Шаблон процессной метрики меры с режимом 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 ||
@@ -1169,11 +1245,11 @@ var prepareConversionParams = function (value) {
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: escapeSingularQuotes(value.startEventName),
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: escapeSingularQuotes(value.endEventName),
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
     };
 };
@@ -1181,7 +1257,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[exports.EDurationTemplateName.avg] = "avgIf(".concat(innerTemplate, ")"),
         _a[exports.EDurationTemplateName.median] = "medianIf(".concat(innerTemplate, ")"),
@@ -1207,12 +1283,12 @@ var prepareDurationParams = function (value) {
         startEventTimeFormula: value.startEventTimeFormula,
         startEventNameFormula: value.startEventNameFormula,
         startEventFilters: convertFiltersToFormula(value.startEventFilters),
-        startEventName: escapeSingularQuotes(value.startEventName),
+        startEventName: "'".concat(escapeSingularQuotes(value.startEventName), "'"),
         startEventAggregationName: getAggregationNameByAppearances(value.startEventAppearances),
         endEventTimeFormula: value.endEventTimeFormula,
         endCaseCaseIdFormula: value.endCaseCaseIdFormula,
         endEventNameFormula: value.endEventNameFormula,
-        endEventName: escapeSingularQuotes(value.endEventName),
+        endEventName: "'".concat(escapeSingularQuotes(value.endEventName), "'"),
         endEventFilters: convertFiltersToFormula(value.endEventFilters),
         endEventAggregationName: getAggregationNameByAppearances(value.endEventAppearances),
     };
@@ -1222,7 +1298,7 @@ function createAnyEventTemplate(aggregatePart) {
     return "{outerAggregation}(process(".concat(aggregatePart, ", {caseCaseIdFormula}))");
 }
 function createSpecificEventTemplate(fn, additionalFn) {
-    return "{outerAggregation}(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}))");
+    return "{outerAggregation}(process(".concat(fn, "(").concat(additionalFn ? "".concat(additionalFn, " ") : "", "{columnFormula}, {eventNameFormula} = {eventName}{filters}), {caseCaseIdFormula}))");
 }
 function createTopLikeTemplate(template) {
     return function (outerAggregation) {
@@ -1296,14 +1372,14 @@ function getMeasureFormula(_a) {
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
-        return fillTemplateString(templateFormula, {
+        return fillTemplateSql(templateFormula, {
             columnFormula: generateColumnFormula(tableName, columnName),
         });
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.AGGREGATION) {
         var preparedParams = prepareMeasureAggregationParams(value);
         return preparedParams
-            ? fillTemplateString(createAggregationTemplate(value.templateName, {
+            ? fillTemplateSql(createAggregationTemplate(value.templateName, {
                 outerAggregation: preparedParams.outerAggregation,
                 anyEvent: value.anyEvent,
             }), preparedParams)
@@ -1314,14 +1390,14 @@ function getMeasureFormula(_a) {
         if (!preparedParams) {
             return "";
         }
-        return fillTemplateString(conversionTemplate, preparedParams);
+        return fillTemplateSql(conversionTemplate, preparedParams);
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.DURATION) {
         var preparedParams = prepareDurationParams(value);
         if (!preparedParams) {
             return "";
         }
-        return fillTemplateString(durationTemplates[value.templateName], preparedParams);
+        return fillTemplateSql(durationTemplates[value.templateName], preparedParams);
     }
     return "";
 }
@@ -1347,7 +1423,7 @@ function getEventMeasureFormula(_a, process) {
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.TEMPLATE) {
         var templateFormula = eventMeasureTemplateFormulas[value.templateName];
-        return templateFormula && fillTemplateString(templateFormula, process);
+        return templateFormula && fillTemplateSql(templateFormula, process);
     }
     return "";
 }
@@ -1373,7 +1449,7 @@ function getTransitionMeasureFormula(_a, process) {
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.TEMPLATE) {
         var templateFormula = transitionMeasureTemplateFormulas[value.templateName];
-        return templateFormula && fillTemplateString(templateFormula, process);
+        return templateFormula && fillTemplateSql(templateFormula, process);
     }
     return "";
 }
@@ -1425,20 +1501,25 @@ var replaceDisplayCondition = function (dimension, displayCondition) {
     return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 /**
- * Шаблон формулы для проверки условия отображения.
+ * Шаблон формулы для приведения произвольного выражения к Boolean.
+ * Используется и для display-condition виджетов/вкладок/инпутов,
+ * и для фильтров по формуле.
+ *
+ * NULL отсекается явной проверкой isNotNull (трактуется как false).
+ * Остальные непреобразуемые к Boolean значения подпадают под дефолт true.
  *
+ * - null -> false (явная проверка isNotNull)
  * - 0 -> false
  * - 1 -> true
  * - 15 -> true
- * - '0' ->	false
+ * - '0' -> false
  * - '1' -> true
- * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - '15' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  * - 'false' -> false
  * - 'true' -> true
  * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
- * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
  */
-var displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
+var displayConditionTemplate = "isNotNull({formula}) AND accurateCastOrDefault({formula}, 'Boolean', true)";
 
 exports.ELastTimeUnit = void 0;
 (function (ELastTimeUnit) {
@@ -1565,7 +1646,7 @@ var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!isFormulaFilterValue(filterValue)) {
         return {
             dbDataType: exports.EClickHouseBaseTypes.Bool,
-            formula: fillTemplateString(displayConditionTemplate, {
+            formula: fillTemplateSql(displayConditionTemplate, {
                 formula: prepareFormulaForSql(filterValue.formula),
             }),
             values: ["true"],
@@ -2165,6 +2246,7 @@ exports.durationTemplates = durationTemplates;
 exports.escapeCurlyBracketLinkName = escapeCurlyBracketLinkName;
 exports.escapeDoubleQuoteLinkName = escapeDoubleQuoteLinkName;
 exports.eventMeasureTemplateFormulas = eventMeasureTemplateFormulas;
+exports.fillTemplateSql = fillTemplateSql;
 exports.fillTemplateString = fillTemplateString;
 exports.formattingConfig = formattingConfig;
 exports.formulaFilterMethods = formulaFilterMethods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/widget-sdk",
-  "version": "6.0.0-2508.4",
+  "version": "6.0.0-2509.0",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",