@isoftdata/utility-dashboard-backend 2.4.0 → 2.4.1

package/dist/index.js

@@ -1,346 +1,346 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatChartDataForReport = exports.formatReportMetadata = exports.parameterizeUrl = exports.parameterizeQuery = exports.parameterRegex = exports.loadOutputParameterValues = exports.loadDataTable = exports.loadDataTableAndProcessedFormatting = exports.handleFormattingTemplates = exports.formatterTemplates = void 0;
-const db = require('@isoftdata/utility-db');
-const chart_helper_js_1 = require("./chart-helper.js");
-const utility_date_time_1 = require("@isoftdata/utility-date-time");
-const formatDate = require('date-fns/format');
-const camelcase_1 = __importDefault(require("camelcase"));
-const mysql = require('mysql');
-const deepmerge = require('deepmerge');
-exports.formatterTemplates = __importStar(require("./formatting-templates"));
-var chart_helper_js_2 = require("./chart-helper.js");
-Object.defineProperty(exports, "handleFormattingTemplates", { enumerable: true, get: function () { return chart_helper_js_2.handleFormattingTemplates; } });
-const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
-    if (resultSet.length) {
-        switch (chartType) {
-            case 'PieChart':
-                resultSet = (0, chart_helper_js_1.makeNegativeNumericValuesZero)(resultSet);
-                break;
-            case 'TreeMap':
-                resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[1], resultSet);
-                if (resultSet.length === 1) {
-                    resultSet[0].id = 'No Data';
-                }
-                break;
-            default:
-                resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[0], resultSet);
-        }
-    }
-    return resultSet;
-};
-async function loadChartData(mysqlConnection, chart, queryObject, customDataSource) {
-    let { formatting, chartWrapper, multiSeries, table, supertype, cumulative, ...theRest } = chart;
-    if (!chartWrapper) {
-        chartWrapper = {
-            chartType: supertype,
-            options: {
-                height: 450, width: 800,
-            },
-        };
-    }
-    cumulative = cumulative || (chartWrapper?.chartType === 'AreaChart' && cumulative !== false);
-    let dataTable = {}, processedFormatting = {};
-    try {
-        const dataTableAndProcessedFormatting = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType, cumulative, table, customDataSource });
-        dataTable = dataTableAndProcessedFormatting.dataTable;
-        processedFormatting = dataTableAndProcessedFormatting.processedFormatting;
-    }
-    catch (err) {
-        console.error('Error loading dataTable / processedFormatting');
-        throw err;
-    }
-    if (chartWrapper?.chartType === 'Table') {
-        return {
-            ...theRest,
-            supertype,
-            chartWrapper,
-            table: { ...table, ...dataTable },
-            formatting: processedFormatting,
-        };
-    }
-    return {
-        ...theRest,
-        cumulative,
-        supertype,
-        chartWrapper: {
-            ...chartWrapper,
-            dataTable: dataTable,
-        },
-        formatting: processedFormatting,
-    };
-}
-async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource }) {
-    let results = [];
-    let fields = {};
-    if (typeof customDataSource === 'function') {
-        ({ results, fields } = await customDataSource(queryObject.sql, queryObject.values));
-    }
-    else if (queryObject?.sql) {
-        ({ results, fields } = await (0, chart_helper_js_1.queryWithFields)(mysqlConnection, queryObject));
-    }
-    let data = handleChartTypeSpecificQuirks(chartType, results);
-    if (multiSeries) {
-        ({ data, formatting, fields } = (0, chart_helper_js_1.getMultiSeriesData)({
-            data,
-            seriesOptions: multiSeries,
-            formatting,
-            fields,
-        }));
-    }
-    const processedFormatting = (0, chart_helper_js_1.handleFormattingTemplates)(formatting);
-    if (chartType?.toLowerCase() === 'table') {
-        return { dataTable: (0, chart_helper_js_1.getRactiveTableDataFormat)(data, fields, processedFormatting, table?.style), processedFormatting, fields };
-    }
-    let dataTable = (0, chart_helper_js_1.getDataTableFormat)(data, fields, multiSeries);
-    if (cumulative || chartType === 'AreaChart') {
-        dataTable = (0, chart_helper_js_1.makeDataCumulative)(dataTable, cumulative);
-    }
-    return { dataTable, processedFormatting, fields };
-}
-exports.loadDataTableAndProcessedFormatting = loadDataTableAndProcessedFormatting;
-async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
-    const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType });
-    return dataTable;
-}
-exports.loadDataTable = loadDataTable;
-const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
-    const optionsFromQuery = (optionListQuery && await db.query(mysqlConnection, optionListQuery)) || [];
-    return [
-        ...optionList,
-        ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true })),
-    ];
-};
-async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
-    if (!(definitionList instanceof Array) || !definitionList.length) {
-        return [];
-    }
-    const parameterValues = [];
-    for (const definition of definitionList) {
-        const matchingParameterSelection = selectionList.find(param => param.name === definition.name);
-        let typedParameter;
-        const baseParameter = {
-            name: definition.name,
-            title: definition.title || definition.name,
-            default: definition.default,
-            value: (matchingParameterSelection?.value) ?? definition.default,
-            queryValues: {},
-        };
-        if (definition.type === 'dateRange') {
-            baseParameter.value = baseParameter.value || 'Last 30 Days';
-            typedParameter = {
-                ...baseParameter,
-                type: 'dateRange',
-                dates: matchingParameterSelection?.dates ?? (0, utility_date_time_1.datesFromRange)(baseParameter.value),
-            };
-            if (typedParameter.value !== 'Custom') {
-                typedParameter.dates = (0, utility_date_time_1.datesFromRange)(typedParameter.value);
-            }
-            if (!forClient) {
-                typedParameter.queryValues = {
-                    [`${typedParameter.name}_start_date`]: typedParameter.dates.from,
-                    [`${typedParameter.name}_end_date`]: typedParameter.dates.to,
-                };
-            }
-        }
-        else if (definition.type === 'selection') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'selection',
-                optionListQuery: definition?.optionListQuery,
-                optionList: definition?.optionList,
-            };
-            typedParameter.optionList = await loadOptionList(mysqlConnection, typedParameter.optionListQuery, typedParameter.optionList);
-            if (!typedParameter.optionList.some(option => option.id?.toString() === typedParameter.value?.toString())) {
-                typedParameter.value = typedParameter.optionList?.[0]?.id?.toString();
-            }
-            const option = typedParameter.optionList.find(option => option.id.toString() === typedParameter.value);
-            if (!forClient) {
-                typedParameter.queryValues = {
-                    [typedParameter.name]: option?.rawSql ? mysql.raw(typedParameter.value) : typedParameter.value,
-                };
-            }
-        }
-        else if (definition.type === 'siteSelection') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'siteSelection',
-                permission: definition?.permission,
-                optionList: [],
-            };
-            typedParameter.value = typedParameter.value ?? (session.siteId ?? session[`${site}Id`]);
-            siteIdColumn = siteIdColumn ? mysqlConnection.escapeId(siteIdColumn) : mysqlConnection.escapeId(`${site}id`);
-            siteNameColumn = siteNameColumn ? mysqlConnection.escapeId(siteNameColumn) : 'name';
-            const siteTableName = mysqlConnection.escapeId(site);
-            if (typedParameter.permission) {
-                typedParameter.optionList = await db.query(mysqlConnection, {
-                    sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_check_user_permission(?, ?, ${siteIdColumn})`,
-                    values: [session.userAccountId, definition.permission],
-                });
-            }
-            else {
-                typedParameter.optionList = await db.query(mysqlConnection, {
-                    sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_useraccount_has_site_access(?, ${siteIdColumn})`,
-                    values: [session.userAccountId],
-                });
-            }
-            if (typedParameter.optionList.length > 1) {
-                typedParameter.optionList = typedParameter.optionList.map(option => ({ ...option, fromQuery: true }));
-                typedParameter.optionList.unshift({ id: 0, name: 'All', fromQuery: true });
-            }
-            if (!typedParameter.optionList.some(option => option.id?.toString() === typedParameter.value?.toString())) {
-                typedParameter.value = typedParameter.optionList?.[0]?.id.toString();
-            }
-            if (!forClient && typedParameter.value?.toString() === '0') {
-                typedParameter.queryValues = {
-                    [typedParameter.name]: typedParameter.optionList
-                        .map(({ id }) => id?.toString())
-                        .filter(id => id !== '0'),
-                };
-            }
-            else if (!forClient) {
-                typedParameter.queryValues = {
-                    [typedParameter.name]: [typedParameter.value],
-                };
-            }
-        }
-        else if (definition.type === 'date') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'date',
-            };
-            typedParameter.value = typedParameter.value || formatDate(new Date(), 'yyyy-MM-dd');
-            if (!forClient) {
-                typedParameter.queryValues = {
-                    [typedParameter.name]: typedParameter.value,
-                };
-            }
-        }
-        else if (definition.type === 'session') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'session',
-            };
-            const parameterName = (0, camelcase_1.default)(definition.name);
-            typedParameter.value = (session[parameterName] ?? '').toString();
-            if (!forClient) {
-                typedParameter.queryValues = {
-                    [typedParameter.name]: typedParameter.value,
-                };
-            }
-        }
-        else {
-            throw new Error(`Parameter type mismatch for ${baseParameter.name}`);
-        }
-        parameterValues.push(typedParameter);
-    }
-    return parameterValues;
-}
-exports.loadOutputParameterValues = loadOutputParameterValues;
-exports.parameterRegex = /\${([^}]+)}/g;
-function parameterizeQuery(queryString, parameterValues) {
-    if (!queryString) {
-        return {
-            sql: '',
-            values: [],
-        };
-    }
-    const queryParameterValues = parameterValues.reduce((acc, val) => {
-        return val.queryValues ? {
-            ...acc,
-            ...val.queryValues,
-        } : acc;
-    }, {});
-    const queryParameterKeys = [...queryString.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
-    const queryParameters = queryParameterKeys.map(key => queryParameterValues[key] || null);
-    return {
-        sql: queryString.replace(exports.parameterRegex, '?'),
-        values: queryParameters,
-    };
-}
-exports.parameterizeQuery = parameterizeQuery;
-function parameterizeUrl(url, parameterValues) {
-    if (!url) {
-        return '';
-    }
-    const queryParameterValues = parameterValues.reduce((acc, val) => {
-        return val.queryValues ? {
-            ...acc,
-            ...val.queryValues,
-        } : acc;
-    }, {});
-    const queryParameterKeys = [...url.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
-    const formattedUrl = queryParameterKeys.reduce((acc, key) => {
-        return acc.replace(`\${${key}}`, queryParameterValues[key] || '');
-    }, url);
-    return formattedUrl;
-}
-exports.parameterizeUrl = parameterizeUrl;
-async function formatReportMetadata(mysqlConnection, { report, chartsInReport, session = {}, site, siteIdColumn, siteNameColumn }) {
-    try {
-        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true, session, site, siteIdColumn, siteNameColumn });
-        return {
-            dashboardReportId: report.dashboardReportId,
-            name: report.reportName,
-            title: report.reportTitle,
-            charts: chartsInReport,
-            parameterValues,
-            ownerId: report.ownerId,
-            autoRefreshInterval: report.autoRefreshInterval,
-            description: report.description ?? '',
-        };
-    }
-    catch (err) {
-        console.error(err);
-        throw err;
-    }
-}
-exports.formatReportMetadata = formatReportMetadata;
-async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn, customDataSource }) {
-    try {
-        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList, session, site, siteIdColumn, siteNameColumn });
-        if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {
-            const { dataTable, ...chartWrapper } = reportChart.jsonOverride.chartWrapper;
-            reportChart.jsonOverride.chartWrapper = chartWrapper;
-        }
-        const combinedChart = deepmerge(chart, reportChart.jsonOverride ?? {});
-        return await loadChartData(mysqlConnection, {
-            ...combinedChart,
-            rank: reportChart.rank,
-            reportChartId: reportChart.reportChartId,
-            description: combinedChart.description ?? '',
-        }, parameterizeQuery(chart.query, parameterValues), customDataSource);
-    }
-    catch (err) {
-        console.error(err);
-        throw err;
-    }
-}
-exports.formatChartDataForReport = formatChartDataForReport;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatChartDataForReport = exports.formatReportMetadata = exports.parameterizeUrl = exports.parameterizeQuery = exports.parameterRegex = exports.loadOutputParameterValues = exports.loadDataTable = exports.loadDataTableAndProcessedFormatting = exports.handleFormattingTemplates = exports.formatterTemplates = void 0;
+const db = require('@isoftdata/utility-db');
+const chart_helper_js_1 = require("./chart-helper.js");
+const utility_date_time_1 = require("@isoftdata/utility-date-time");
+const formatDate = require('date-fns/format');
+const camelcase_1 = __importDefault(require("camelcase"));
+const mysql = require('mysql');
+const deepmerge = require('deepmerge');
+exports.formatterTemplates = __importStar(require("./formatting-templates"));
+var chart_helper_js_2 = require("./chart-helper.js");
+Object.defineProperty(exports, "handleFormattingTemplates", { enumerable: true, get: function () { return chart_helper_js_2.handleFormattingTemplates; } });
+const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
+    if (resultSet.length) {
+        switch (chartType) {
+            case 'PieChart':
+                resultSet = (0, chart_helper_js_1.makeNegativeNumericValuesZero)(resultSet);
+                break;
+            case 'TreeMap':
+                resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[1], resultSet);
+                if (resultSet.length === 1) {
+                    resultSet[0].id = 'No Data';
+                }
+                break;
+            default:
+                resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[0], resultSet);
+        }
+    }
+    return resultSet;
+};
+async function loadChartData(mysqlConnection, chart, queryObject, customDataSource) {
+    let { formatting, chartWrapper, multiSeries, table, supertype, cumulative, ...theRest } = chart;
+    if (!chartWrapper) {
+        chartWrapper = {
+            chartType: supertype,
+            options: {
+                height: 450, width: 800,
+            },
+        };
+    }
+    cumulative = cumulative || (chartWrapper?.chartType === 'AreaChart' && cumulative !== false);
+    let dataTable = {}, processedFormatting = {};
+    try {
+        const dataTableAndProcessedFormatting = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType, cumulative, table, customDataSource });
+        dataTable = dataTableAndProcessedFormatting.dataTable;
+        processedFormatting = dataTableAndProcessedFormatting.processedFormatting;
+    }
+    catch (err) {
+        console.error('Error loading dataTable / processedFormatting');
+        throw err;
+    }
+    if (chartWrapper?.chartType === 'Table') {
+        return {
+            ...theRest,
+            supertype,
+            chartWrapper,
+            table: { ...table, ...dataTable },
+            formatting: processedFormatting,
+        };
+    }
+    return {
+        ...theRest,
+        cumulative,
+        supertype,
+        chartWrapper: {
+            ...chartWrapper,
+            dataTable: dataTable,
+        },
+        formatting: processedFormatting,
+    };
+}
+async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource }) {
+    let results = [];
+    let fields = {};
+    if (typeof customDataSource === 'function') {
+        ({ results, fields } = await customDataSource(queryObject.sql, queryObject.values));
+    }
+    else if (queryObject?.sql) {
+        ({ results, fields } = await (0, chart_helper_js_1.queryWithFields)(mysqlConnection, queryObject));
+    }
+    let data = handleChartTypeSpecificQuirks(chartType, results);
+    if (multiSeries) {
+        ({ data, formatting, fields } = (0, chart_helper_js_1.getMultiSeriesData)({
+            data,
+            seriesOptions: multiSeries,
+            formatting,
+            fields,
+        }));
+    }
+    const processedFormatting = (0, chart_helper_js_1.handleFormattingTemplates)(formatting);
+    if (chartType?.toLowerCase() === 'table') {
+        return { dataTable: (0, chart_helper_js_1.getRactiveTableDataFormat)(data, fields, processedFormatting, table?.style), processedFormatting, fields };
+    }
+    let dataTable = (0, chart_helper_js_1.getDataTableFormat)(data, fields, multiSeries);
+    if (cumulative || chartType === 'AreaChart') {
+        dataTable = (0, chart_helper_js_1.makeDataCumulative)(dataTable, cumulative);
+    }
+    return { dataTable, processedFormatting, fields };
+}
+exports.loadDataTableAndProcessedFormatting = loadDataTableAndProcessedFormatting;
+async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
+    const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType });
+    return dataTable;
+}
+exports.loadDataTable = loadDataTable;
+const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
+    const optionsFromQuery = (optionListQuery && await db.query(mysqlConnection, optionListQuery)) || [];
+    return [
+        ...optionList,
+        ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true })),
+    ];
+};
+async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
+    if (!(definitionList instanceof Array) || !definitionList.length) {
+        return [];
+    }
+    const parameterValues = [];
+    for (const definition of definitionList) {
+        const matchingParameterSelection = selectionList.find(param => param.name === definition.name);
+        let typedParameter;
+        const baseParameter = {
+            name: definition.name,
+            title: definition.title || definition.name,
+            default: definition.default,
+            value: (matchingParameterSelection?.value) ?? definition.default,
+            queryValues: {},
+        };
+        if (definition.type === 'dateRange') {
+            baseParameter.value = baseParameter.value || 'Last 30 Days';
+            typedParameter = {
+                ...baseParameter,
+                type: 'dateRange',
+                dates: matchingParameterSelection?.dates ?? (0, utility_date_time_1.datesFromRange)(baseParameter.value),
+            };
+            if (typedParameter.value !== 'Custom') {
+                typedParameter.dates = (0, utility_date_time_1.datesFromRange)(typedParameter.value);
+            }
+            if (!forClient) {
+                typedParameter.queryValues = {
+                    [`${typedParameter.name}_start_date`]: typedParameter.dates.from,
+                    [`${typedParameter.name}_end_date`]: typedParameter.dates.to,
+                };
+            }
+        }
+        else if (definition.type === 'selection') {
+            typedParameter = {
+                ...baseParameter,
+                type: 'selection',
+                optionListQuery: definition?.optionListQuery,
+                optionList: definition?.optionList,
+            };
+            typedParameter.optionList = await loadOptionList(mysqlConnection, typedParameter.optionListQuery, typedParameter.optionList);
+            if (!typedParameter.optionList.some(option => option.id?.toString() === typedParameter.value?.toString())) {
+                typedParameter.value = typedParameter.optionList?.[0]?.id?.toString();
+            }
+            const option = typedParameter.optionList.find(option => option.id.toString() === typedParameter.value);
+            if (!forClient) {
+                typedParameter.queryValues = {
+                    [typedParameter.name]: option?.rawSql ? mysql.raw(typedParameter.value) : typedParameter.value,
+                };
+            }
+        }
+        else if (definition.type === 'siteSelection') {
+            typedParameter = {
+                ...baseParameter,
+                type: 'siteSelection',
+                permission: definition?.permission,
+                optionList: [],
+            };
+            typedParameter.value = typedParameter.value ?? (session.siteId ?? session[`${site}Id`]);
+            siteIdColumn = siteIdColumn ? mysqlConnection.escapeId(siteIdColumn) : mysqlConnection.escapeId(`${site}id`);
+            siteNameColumn = siteNameColumn ? mysqlConnection.escapeId(siteNameColumn) : 'name';
+            const siteTableName = mysqlConnection.escapeId(site);
+            if (typedParameter.permission) {
+                typedParameter.optionList = await db.query(mysqlConnection, {
+                    sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_check_user_permission(?, ?, ${siteIdColumn})`,
+                    values: [session.userAccountId, definition.permission],
+                });
+            }
+            else {
+                typedParameter.optionList = await db.query(mysqlConnection, {
+                    sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_useraccount_has_site_access(?, ${siteIdColumn})`,
+                    values: [session.userAccountId],
+                });
+            }
+            if (typedParameter.optionList.length > 1) {
+                typedParameter.optionList = typedParameter.optionList.map(option => ({ ...option, fromQuery: true }));
+                typedParameter.optionList.unshift({ id: 0, name: 'All', fromQuery: true });
+            }
+            if (!typedParameter.optionList.some(option => option.id?.toString() === typedParameter.value?.toString())) {
+                typedParameter.value = typedParameter.optionList?.[0]?.id.toString();
+            }
+            if (!forClient && typedParameter.value?.toString() === '0') {
+                typedParameter.queryValues = {
+                    [typedParameter.name]: typedParameter.optionList
+                        .map(({ id }) => id?.toString())
+                        .filter(id => id !== '0'),
+                };
+            }
+            else if (!forClient) {
+                typedParameter.queryValues = {
+                    [typedParameter.name]: [typedParameter.value],
+                };
+            }
+        }
+        else if (definition.type === 'date') {
+            typedParameter = {
+                ...baseParameter,
+                type: 'date',
+            };
+            typedParameter.value = typedParameter.value || formatDate(new Date(), 'yyyy-MM-dd');
+            if (!forClient) {
+                typedParameter.queryValues = {
+                    [typedParameter.name]: typedParameter.value,
+                };
+            }
+        }
+        else if (definition.type === 'session') {
+            typedParameter = {
+                ...baseParameter,
+                type: 'session',
+            };
+            const parameterName = (0, camelcase_1.default)(definition.name);
+            typedParameter.value = (session[parameterName] ?? '').toString();
+            if (!forClient) {
+                typedParameter.queryValues = {
+                    [typedParameter.name]: typedParameter.value,
+                };
+            }
+        }
+        else {
+            throw new Error(`Parameter type mismatch for ${baseParameter.name}`);
+        }
+        parameterValues.push(typedParameter);
+    }
+    return parameterValues;
+}
+exports.loadOutputParameterValues = loadOutputParameterValues;
+exports.parameterRegex = /\${([^}]+)}/g;
+function parameterizeQuery(queryString, parameterValues) {
+    if (!queryString) {
+        return {
+            sql: '',
+            values: [],
+        };
+    }
+    const queryParameterValues = parameterValues.reduce((acc, val) => {
+        return val.queryValues ? {
+            ...acc,
+            ...val.queryValues,
+        } : acc;
+    }, {});
+    const queryParameterKeys = [...queryString.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
+    const queryParameters = queryParameterKeys.map(key => queryParameterValues[key] || null);
+    return {
+        sql: queryString.replace(exports.parameterRegex, '?'),
+        values: queryParameters,
+    };
+}
+exports.parameterizeQuery = parameterizeQuery;
+function parameterizeUrl(url, parameterValues) {
+    if (!url) {
+        return '';
+    }
+    const queryParameterValues = parameterValues.reduce((acc, val) => {
+        return val.queryValues ? {
+            ...acc,
+            ...val.queryValues,
+        } : acc;
+    }, {});
+    const queryParameterKeys = [...url.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
+    const formattedUrl = queryParameterKeys.reduce((acc, key) => {
+        return acc.replace(`\${${key}}`, queryParameterValues[key] || '');
+    }, url);
+    return formattedUrl;
+}
+exports.parameterizeUrl = parameterizeUrl;
+async function formatReportMetadata(mysqlConnection, { report, chartsInReport, session = {}, site, siteIdColumn, siteNameColumn }) {
+    try {
+        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true, session, site, siteIdColumn, siteNameColumn });
+        return {
+            dashboardReportId: report.dashboardReportId,
+            name: report.reportName,
+            title: report.reportTitle,
+            charts: chartsInReport,
+            parameterValues,
+            ownerId: report.ownerId,
+            autoRefreshInterval: report.autoRefreshInterval,
+            description: report.description ?? '',
+        };
+    }
+    catch (err) {
+        console.error(err);
+        throw err;
+    }
+}
+exports.formatReportMetadata = formatReportMetadata;
+async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn, customDataSource }) {
+    try {
+        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList, session, site, siteIdColumn, siteNameColumn });
+        if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {
+            const { dataTable, ...chartWrapper } = reportChart.jsonOverride.chartWrapper;
+            reportChart.jsonOverride.chartWrapper = chartWrapper;
+        }
+        const combinedChart = deepmerge(chart, reportChart.jsonOverride ?? {});
+        return await loadChartData(mysqlConnection, {
+            ...combinedChart,
+            rank: reportChart.rank,
+            reportChartId: reportChart.reportChartId,
+            description: combinedChart.description ?? '',
+        }, parameterizeQuery(chart.query, parameterValues), customDataSource);
+    }
+    catch (err) {
+        console.error(err);
+        throw err;
+    }
+}
+exports.formatChartDataForReport = formatChartDataForReport;
 //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}