@isoftdata/utility-dashboard-backend 2.4.15 → 3.0.1

package/README.md

@@ -1,6 +1,14 @@
 # utility-dashboard-backend
  A backend utility for formatting and loading dashboard chart and report data to be usable by the [frontend dashboard component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard).
 
+## Installation
+
+```bash
+npm i @isoftdata/utility-dashboard-backend
+```
+
+> Breaking change in version 3: ESM style exports
+
 ## Prerequisites
 > Version 3.Y.Z of the frontend component is required for use with version 2.Y.Z of the backend component.
 * A MySQL database schema as outlined in [schema.md](schema.md)

package/dist/chart-helper.d.ts

@@ -1,5 +1,5 @@
 import { Connection, RowDataPacket } from 'mysql';
-import { Formatting, GoogleDataTable, MultiSeriesOptions, ProcessedFormatting, Table } from './types/chart';
+import type { Formatting, GoogleDataTable, MultiSeriesOptions, ProcessedFormatting, Table } from './types/chart';
 export type FieldType = 'string' | 'number' | 'datetime' | 'timeofday' | 'date';
 export type QueryFieldsObject = Record<string, FieldType>;
 export declare function queryWithFields(connection: Connection, query: {

package/dist/chart-helper.js

@@ -1,20 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryWithFields = queryWithFields;
-exports.getMultiSeriesData = getMultiSeriesData;
-exports.makeNegativeNumericValuesZero = makeNegativeNumericValuesZero;
-exports.coerceNullColumn = coerceNullColumn;
-exports.handleFormattingTemplates = handleFormattingTemplates;
-exports.getDataTableFormat = getDataTableFormat;
-exports.makeDataCumulative = makeDataCumulative;
-exports.getRactiveTableDataFormat = getRactiveTableDataFormat;
-const formatting_templates_1 = __importDefault(require("./formatting-templates"));
-const toSnakeCase = require('to-snake-case');
-const mysqlDataTypes = require('mysql/lib/protocol/constants/types');
-const style_templates_1 = __importDefault(require("./style-templates"));
+import formattingTemplates from './formatting-templates.js';
+import toSnakeCase from 'to-snake-case';
+import mysqlDataTypes from 'mysql/lib/protocol/constants/types.js';
+import styleTableRow from './style-templates.js';
 function mysqlToGoogleChartsDataTypeMap(mysqlDataType) {
     switch (mysqlDataType) {
         case 'VAR_STRING':
@@ -63,7 +50,7 @@ function resultsIsRowDataPacketArray(results) {
 function fieldsIsFieldPacketArray(fields) {
     return (Array.isArray(fields) && fields.length === 0) || (Array.isArray(fields) && fields.length > 0 && fields[0].constructor.name === 'FieldPacket');
 }
-function queryWithFields(connection, query) {
+export function queryWithFields(connection, query) {
     return new Promise((resolve, reject) => {
         connection.query(query, (err, results, fields) => {
             try {
@@ -95,7 +82,7 @@ function queryWithFields(connection, query) {
         });
     });
 }
-function getMultiSeriesData({ data: queryResult, seriesOptions, formatting, fields }) {
+export function getMultiSeriesData({ data: queryResult, seriesOptions, formatting, fields }) {
     const { groupXAxisBy, series, value, tooltip } = seriesOptions;
     const allOfTheKeysInTheSeries = new Set(queryResult.map(row => row[series]));
     const objectOfAllKeysWithNullValues = {};
@@ -142,7 +129,7 @@ function getMultiSeriesData({ data: queryResult, seriesOptions, formatting, fiel
         fields: seriesFields,
     };
 }
-function makeNegativeNumericValuesZero(resultSet) {
+export function makeNegativeNumericValuesZero(resultSet) {
     const numberCols = Object.keys(resultSet[0]).filter(key => typeof resultSet[0][key] === 'number');
     return resultSet.map(row => {
         numberCols.forEach(col => {
@@ -153,7 +140,7 @@ function makeNegativeNumericValuesZero(resultSet) {
         return row;
     });
 }
-function coerceNullColumn(columnProp, data, destinationType) {
+export function coerceNullColumn(columnProp, data, destinationType) {
     const hasNullValue = data.find(row => row[columnProp] === null);
     if (hasNullValue) {
         const rowWithValidValue = data.find(row => row[columnProp] !== null);
@@ -172,19 +159,19 @@ function coerceNullColumn(columnProp, data, destinationType) {
         return data;
     }
 }
-function handleFormattingTemplates(formatting) {
+export function handleFormattingTemplates(formatting) {
     const formattingOutput = {};
     if (formatting && typeof formatting === 'object') {
         for (const chartName in formatting) {
             formattingOutput[chartName] = { type: formatting[chartName].type, format: null };
-            if (typeof formatting[chartName].format === 'string' && formatting[chartName].format in formatting_templates_1.default) {
-                formattingOutput[chartName].format = formatting_templates_1.default[formatting[chartName].format];
+            if (typeof formatting[chartName].format === 'string' && formatting[chartName].format in formattingTemplates) {
+                formattingOutput[chartName].format = formattingTemplates[formatting[chartName].format];
             }
         }
     }
     return formattingOutput;
 }
-function getDataTableFormat(data, fields, multiSeries) {
+export function getDataTableFormat(data, fields, multiSeries) {
     let cols = [];
     if (multiSeries) {
         cols = [makeDataTableCol(multiSeries.groupXAxisBy, fields)];
@@ -210,7 +197,7 @@ function getDataTableFormat(data, fields, multiSeries) {
     });
     return { cols, rows };
 }
-function makeDataCumulative(dataTable, cumulative = true) {
+export function makeDataCumulative(dataTable, cumulative = true) {
     dataTable.rows.forEach((row, rowIndex) => {
         if (rowIndex > 0) {
             row.c.forEach((col, colIndex) => {
@@ -225,7 +212,7 @@ function makeDataCumulative(dataTable, cumulative = true) {
     });
     return dataTable;
 }
-function getRactiveTableDataFormat(rows, fields, formatting, styleTemplates = {}) {
+export function getRactiveTableDataFormat(rows, fields, formatting, styleTemplates = {}) {
     const columns = Object.keys(fields).map(field => {
         if (formatting?.[field]?.type === 'NumberFormat' && formatting?.[field]?.format?.prefix === '$') {
             return {
@@ -242,7 +229,7 @@ function getRactiveTableDataFormat(rows, fields, formatting, styleTemplates = {}
     });
     if (styleTemplates) {
         rows = rows.map(row => {
-            return (0, style_templates_1.default)(row, styleTemplates);
+            return styleTableRow(row, styleTemplates);
         });
     }
     return {
@@ -250,4 +237,4 @@ function getRactiveTableDataFormat(rows, fields, formatting, styleTemplates = {}
         rows,
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":";;;;;AA+DA,0CA6BC;AASD,gDAmEC;AACD,sEAYC;AAED,4CAoBC;AAED,8DAYC;AAED,gDAgCC;AAOD,gDAaC;AACD,8DAyBC;AAtSD,kFAAwD;AACxD,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC5C,MAAM,cAAc,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAA;AAEpE,wEAA6C;AAE7C,SAAS,8BAA8B,CAAC,aAAqB;IAC5D,QAAQ,aAAa,EAAE,CAAC;QACvB,KAAK,YAAY,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACb,OAAO,QAAQ,CAAA;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,YAAY,CAAC;QAClB,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,MAAM;YACV,OAAO,QAAQ,CAAA;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,UAAU,CAAC;QAChB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW;YACf,OAAO,UAAU,CAAA;QAClB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACb,OAAO,MAAM,CAAA;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACX,OAAO,WAAW,CAAA;QACnB;YACC,OAAO,QAAQ,CAAA;IACjB,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW,EAAE,MAAyB,EAAE,OAAsB,IAAI;IAC3F,OAAO;QACN,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;QAClC,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;QACjB,IAAI;KACJ,CAAA;AACF,CAAC;AAID,SAAS,2BAA2B,CAAC,OAAsF;IAC1H,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;AAC7J,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAiC;IAClE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;AACtJ,CAAC;AAED,SAAgB,eAAe,CAAC,UAAsB,EAAE,KAAyC;IAEhG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,IAAI,CAAC;gBACJ,IAAI,GAAG,EAAE,CAAC;oBACT,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAA;oBAC7D,MAAM,CAAC,GAAG,CAAC,CAAA;gBACZ,CAAC;qBAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,oGAAoG,CAAC,CAAC,CAAA;gBACxH,CAAC;qBAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC9C,MAAM,CAAC,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC,CAAA;gBAC7D,CAAC;qBAAM,CAAC;oBACP,OAAO,CAAC;wBACP,OAAO;wBACP,MAAM,EACL,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAqB,EAAE;4BAChD,OAAO;gCACN,GAAG,GAAG;gCACN,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,8BAA8B,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC;6BACtF,CAAA;wBACF,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE;qBACb,CAAC,CAAA;gBACH,CAAC;YACF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,GAAG,CAAC,CAAA;YACZ,CAAC;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC;AASD,SAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAA2B;IAKnH,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;IAE9D,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAS,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAEpF,MAAM,6BAA6B,GAA4B,EAAE,CAAA;IACjE,KAAK,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC3C,6BAA6B,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;QAEzC,IAAI,OAAO,EAAE,CAAC;YACb,6BAA6B,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,GAAG,IAAI,CAAA;QAC1D,CAAC;IACF,CAAC;IAED,MAAM,OAAO,GAAiE,EAAE,CAAA;IAGhF,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YAEjC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,6BAA6B,EAAE,CAAA;QAClE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;QAEpD,IAAI,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAA;QACvE,CAAC;IACF,CAAC;IAGD,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;IAC7D,MAAM,gBAAgB,GAAsC,EAAE,CAAA;IAC9D,KAAK,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAEjC,IAAI,OAAO,EAAE,CAAC;YACb,YAAY,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,UAAU,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;YACvC,gBAAgB,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;IACF,CAAC;IAGD,MAAM,eAAe,GAAG,EAAE,CAAA;IAC1B,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC3B,eAAe,CAAC,IAAI,CAAC;YACpB,CAAC,YAAY,CAAC,EAAE,GAAG;YACnB,GAAG,OAAO,CAAC,GAAG,CAAC;SACf,CAAC,CAAA;IACH,CAAC;IAED,OAAO;QACN,IAAI,EAAE,eAAkC;QACxC,UAAU,EAAE;YACX,GAAG,UAAU;YACb,GAAG,gBAAgB;SACL;QACf,MAAM,EAAE,YAAiC;KACzC,CAAA;AACF,CAAC;AACD,SAAgB,6BAA6B,CAAC,SAA0B;IACvE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAA;IAEjG,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC1B,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACxB,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;QACF,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACX,CAAC,CAAC,CAAA;AACH,CAAC;AAED,SAAgB,gBAAgB,CAAC,UAAkB,EAAE,IAAqB,EAAE,eAAyB;IACpG,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAA;IAE/D,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,eAAe,GAAW,EAAE,CAAA;QAEhC,IAAI,CAAC,eAAe,IAAI,eAAe,KAAK,QAAQ,CAAC,IAAI,CAAC,iBAAiB,IAAI,OAAO,iBAAiB,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YACnI,eAAe,GAAG,CAAC,CAAA;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACrB,OAAO;gBACN,GAAG,GAAG;gBACN,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,eAAe;aAChD,CAAA;QACF,CAAC,CAAC,CAAA;IACH,CAAC;SAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC;AAED,SAAgB,yBAAyB,CAAC,UAAuB;IAChE,MAAM,gBAAgB,GAAwB,EAAE,CAAA;IAChD,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAClD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;YAChF,IAAI,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,QAAQ,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,IAAI,8BAAmB,EAAE,CAAC;gBAC7G,gBAAgB,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,8BAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAA;YACvF,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,gBAAgB,CAAA;AACxB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAqB,EAAE,MAAyB,EAAE,WAAgC;IACpH,IAAI,IAAI,GAA4B,EAAE,CAAA;IAEtC,IAAI,WAAW,EAAE,CAAC;QACjB,IAAI,GAAG,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,IAAI,GAAG,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YACtD,IAAI,WAAW,EAAE,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;gBAE/D,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;YACpD,CAAC;iBAAM,CAAC;gBAEP,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;YACzC,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,EAAE,CAAA;QAEhB,KAAK,MAAM,MAAM,IAAI,GAAG,EAAE,CAAC;YAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC/B,CAAC;QAED,OAAO;YACN,CAAC,EAAE,KAAK;SACR,CAAA;IACF,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AACtB,CAAC;AAOD,SAAgB,kBAAkB,CAAC,SAA0B,EAAE,UAAU,GAAG,IAAI;IAC/E,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACxC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YAClB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBAC/B,IAAI,QAAQ,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC1F,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC3D,CAAC;qBAAM,IAAI,UAAU,IAAI,QAAQ,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC9F,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC3E,CAAC;YACF,CAAC,CAAC,CAAA;QACH,CAAC;IACF,CAAC,CAAC,CAAA;IACF,OAAO,SAAS,CAAA;AACjB,CAAC;AACD,SAAgB,yBAAyB,CAAC,IAAqB,EAAE,MAAiC,EAAE,UAA+B,EAAE,cAAc,GAAG,EAAE;IACvJ,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAE/C,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,cAAc,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YACjG,OAAO;gBACN,QAAQ,EAAE,GAAG,KAAK,SAAS;gBAC3B,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,yBAAyB;aAChC,CAAA;QACF,CAAC;QACD,OAAO;YACN,QAAQ,EAAE,GAAG,KAAK,SAAS;YAC3B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,cAAc;SACrB,CAAA;IACF,CAAC,CAAC,CAAA;IACF,IAAI,cAAc,EAAE,CAAC;QACpB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACrB,OAAO,IAAA,yBAAa,EAAC,GAAG,EAAE,cAAc,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;IACH,CAAC;IACD,OAAO;QACN,OAAO;QACP,IAAI;KACJ,CAAA;AACF,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":"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"}

package/dist/formatting-templates.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const formattingTemplates = {
     CURRENCY: {
         prefix: '$',
@@ -13,5 +11,5 @@ const formattingTemplates = {
         format: 'long',
     },
 };
-exports.default = formattingTemplates;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy10ZW1wbGF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZm9ybWF0dGluZy10ZW1wbGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFjQSxNQUFNLG1CQUFtQixHQUF3QjtJQUNoRCxRQUFRLEVBQUU7UUFDVCxNQUFNLEVBQUUsR0FBRztRQUNYLGNBQWMsRUFBRSxDQUFDO1FBQ2pCLGNBQWMsRUFBRSxHQUFHO0tBQ25CO0lBQ0QsVUFBVSxFQUFFO1FBQ1gsTUFBTSxFQUFFLFFBQVE7S0FDaEI7SUFDRCxRQUFRLEVBQUU7UUFDVCxNQUFNLEVBQUUsTUFBTTtLQUNkO0NBQ0QsQ0FBQTtBQUNELGtCQUFlLG1CQUFtQixDQUFBIn0=
+export default formattingTemplates;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy10ZW1wbGF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZm9ybWF0dGluZy10ZW1wbGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBY0EsTUFBTSxtQkFBbUIsR0FBd0I7SUFDaEQsUUFBUSxFQUFFO1FBQ1QsTUFBTSxFQUFFLEdBQUc7UUFDWCxjQUFjLEVBQUUsQ0FBQztRQUNqQixjQUFjLEVBQUUsR0FBRztLQUNuQjtJQUNELFVBQVUsRUFBRTtRQUNYLE1BQU0sRUFBRSxRQUFRO0tBQ2hCO0lBQ0QsUUFBUSxFQUFFO1FBQ1QsTUFBTSxFQUFFLE1BQU07S0FDZDtDQUNELENBQUE7QUFDRCxlQUFlLG1CQUFtQixDQUFBIn0=

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import type { Session, SiteType } from './types/session';
 import type { MultiSeriesOptions, Formatting, Chart, Table, GoogleDataTable, ProcessedFormatting } from './types/chart';
 import type { Connection, RowDataPacket } from 'mysql';
 import type { Report, ReportInput } from './types/report';
-export * as formatterTemplates from './formatting-templates';
+export * as formatterTemplates from './formatting-templates.js';
 export { handleFormattingTemplates } from './chart-helper.js';
 export type { ReportInput } from './types/report';
 export type CustomDataSourceFunction = (query: string, values?: unknown[]) => Promise<{

package/dist/index.js

@@ -1,63 +1,26 @@
-"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.parameterRegex = exports.handleFormattingTemplates = exports.formatterTemplates = void 0;
-exports.loadDataTableAndProcessedFormatting = loadDataTableAndProcessedFormatting;
-exports.loadDataTable = loadDataTable;
-exports.loadOutputParameterValues = loadOutputParameterValues;
-exports.parameterizeQuery = parameterizeQuery;
-exports.parameterizeUrl = parameterizeUrl;
-exports.formatReportMetadata = formatReportMetadata;
-exports.formatChartDataForReport = formatChartDataForReport;
-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 date_fns_1 = require("date-fns");
-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; } });
+import { query } from '@isoftdata/utility-db';
+import { getMultiSeriesData, makeNegativeNumericValuesZero, coerceNullColumn, handleFormattingTemplates, getDataTableFormat, queryWithFields, makeDataCumulative, getRactiveTableDataFormat, } from './chart-helper.js';
+import { datesFromRange } from '@isoftdata/utility-date-time';
+import { format as formatDate } from 'date-fns';
+import camelCase from 'camelcase';
+import mysql from 'mysql';
+import deepmerge from 'deepmerge';
+export * as formatterTemplates from './formatting-templates.js';
+export { handleFormattingTemplates } from './chart-helper.js';
 const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
     if (resultSet.length) {
         switch (chartType) {
             case 'PieChart':
-                resultSet = (0, chart_helper_js_1.makeNegativeNumericValuesZero)(resultSet);
+                resultSet = makeNegativeNumericValuesZero(resultSet);
                 break;
             case 'TreeMap':
-                resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[1], resultSet);
+                resultSet = 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);
+                resultSet = coerceNullColumn(Object.keys(resultSet[0])[0], resultSet);
         }
     }
     return resultSet;
@@ -117,7 +80,7 @@ async function loadChartData(mysqlConnection, chart, queryObject, customDataSour
         };
     }
 }
-async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource }) {
+export async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource }) {
     let results = [];
     let fields = {};
     if (typeof customDataSource === 'function') {
@@ -126,34 +89,34 @@ async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: que
     }
     else if (queryObject?.sql) {
         ;
-        ({ results, fields } = await (0, chart_helper_js_1.queryWithFields)(mysqlConnection, queryObject));
+        ({ results, fields } = await queryWithFields(mysqlConnection, queryObject));
     }
     let data = handleChartTypeSpecificQuirks(chartType, results);
     if (multiSeries) {
         ;
-        ({ data, formatting, fields } = (0, chart_helper_js_1.getMultiSeriesData)({
+        ({ data, formatting, fields } = getMultiSeriesData({
             data,
             seriesOptions: multiSeries,
             formatting,
             fields,
         }));
     }
-    const processedFormatting = (0, chart_helper_js_1.handleFormattingTemplates)(formatting);
+    const processedFormatting = handleFormattingTemplates(formatting);
     if (chartType?.toLowerCase() === 'table') {
-        return { dataTable: (0, chart_helper_js_1.getRactiveTableDataFormat)(data, fields, processedFormatting, table?.style), processedFormatting, fields };
+        return { dataTable: getRactiveTableDataFormat(data, fields, processedFormatting, table?.style), processedFormatting, fields };
     }
-    let dataTable = (0, chart_helper_js_1.getDataTableFormat)(data, fields, multiSeries);
+    let dataTable = getDataTableFormat(data, fields, multiSeries);
     if (cumulative || chartType === 'AreaChart') {
-        dataTable = (0, chart_helper_js_1.makeDataCumulative)(dataTable, cumulative);
+        dataTable = makeDataCumulative(dataTable, cumulative);
     }
     return { dataTable, processedFormatting, fields };
 }
-async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
+export async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
     const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType });
     return dataTable;
 }
 const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
-    const optionsFromQuery = (optionListQuery && (await db.query(mysqlConnection, optionListQuery))) || [];
+    const optionsFromQuery = (optionListQuery && (await query(mysqlConnection, optionListQuery))) || [];
     return [...optionList, ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true }))];
 };
 const isValidDateRangeValue = (value) => {
@@ -176,7 +139,7 @@ const isValidDateRangeValue = (value) => {
         'Custom',
     ].includes(value);
 };
-async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
+export async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
     if (!(definitionList instanceof Array) || !definitionList.length) {
         return [];
     }
@@ -188,15 +151,17 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
             title: definition.title || definition.name,
             queryValues: {},
         };
+        const value = matchingParameterSelection?.value ?? definition.default;
         if (typedParameter.type !== 'dateRange') {
-            typedParameter.value = matchingParameterSelection?.value ?? definition.default;
+            typedParameter.value = value;
         }
         if (typedParameter.type === 'dateRange') {
-            typedParameter.value = isValidDateRangeValue(typedParameter.value) ? typedParameter.value : 'Last 30 Days';
+            const validDateRangeValue = isValidDateRangeValue(value) ? value : 'Last 30 Days';
             typedParameter = {
                 ...typedParameter,
+                value: validDateRangeValue,
                 type: 'dateRange',
-                dates: matchingParameterSelection?.dates ?? (typedParameter.value !== 'Custom' ? (0, utility_date_time_1.datesFromRange)(typedParameter.value) : { from: '', to: '' }),
+                dates: matchingParameterSelection?.dates ?? (validDateRangeValue !== 'Custom' ? datesFromRange(validDateRangeValue) : { from: '', to: '' }),
             };
             if (!forClient) {
                 typedParameter.queryValues = {
@@ -235,13 +200,13 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
             siteNameColumn = siteNameColumn ? mysqlConnection.escapeId(siteNameColumn) : 'name';
             const siteTableName = mysqlConnection.escapeId(site);
             if (typedParameter.permission) {
-                typedParameter.optionList = await db.query(mysqlConnection, {
+                typedParameter.optionList = await 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, {
+                typedParameter.optionList = await query(mysqlConnection, {
                     sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_useraccount_has_site_access(?, ${siteIdColumn})`,
                     values: [session.userAccountId],
                 });
@@ -265,7 +230,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
             }
         }
         else if (typedParameter.type === 'date') {
-            typedParameter.value = typedParameter.value || (0, date_fns_1.format)(new Date(), 'yyyy-MM-dd');
+            typedParameter.value = typedParameter.value || formatDate(new Date(), 'yyyy-MM-dd');
             if (!forClient) {
                 typedParameter.queryValues = {
                     [typedParameter.name]: typedParameter.value,
@@ -273,7 +238,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
             }
         }
         else if (typedParameter.type === 'session') {
-            const parameterName = (0, camelcase_1.default)(definition.name);
+            const parameterName = camelCase(definition.name);
             typedParameter.value = (session[parameterName] ?? '').toString();
             if (!forClient) {
                 typedParameter.queryValues = {
@@ -288,8 +253,8 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
     }
     return parameterValues;
 }
-exports.parameterRegex = /\${([^}]+)}/g;
-function parameterizeQuery(queryString, parameterValues) {
+export const parameterRegex = /\${([^}]+)}/g;
+export function parameterizeQuery(queryString, parameterValues) {
     if (!queryString) {
         return {
             sql: '',
@@ -304,14 +269,14 @@ function parameterizeQuery(queryString, parameterValues) {
             }
             : acc;
     }, {});
-    const queryParameterKeys = [...queryString.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
+    const queryParameterKeys = [...queryString.matchAll(parameterRegex)].map(([, insideToken]) => insideToken.trim());
     const queryParameters = queryParameterKeys.map(key => queryParameterValues[key] || null);
     return {
-        sql: queryString.replace(exports.parameterRegex, '?'),
+        sql: queryString.replace(parameterRegex, '?'),
         values: queryParameters,
     };
 }
-function parameterizeUrl(url, parameterValues) {
+export function parameterizeUrl(url, parameterValues) {
     if (!url) {
         return '';
     }
@@ -323,13 +288,13 @@ function parameterizeUrl(url, parameterValues) {
             }
             : acc;
     }, {});
-    const queryParameterKeys = [...url.matchAll(exports.parameterRegex)].map(([, insideToken]) => insideToken.trim());
+    const queryParameterKeys = [...url.matchAll(parameterRegex)].map(([, insideToken]) => insideToken.trim());
     const formattedUrl = queryParameterKeys.reduce((acc, key) => {
         return acc.replace(`\${${key}}`, queryParameterValues[key] || '');
     }, url);
     return formattedUrl;
 }
-async function formatReportMetadata(mysqlConnection, { report, chartsInReport, session = {}, site, siteIdColumn, siteNameColumn }) {
+export 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 {
@@ -348,7 +313,7 @@ async function formatReportMetadata(mysqlConnection, { report, chartsInReport, s
         throw err;
     }
 }
-async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn, customDataSource }) {
+export 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) {
@@ -368,4 +333,4 @@ async function formatChartDataForReport(mysqlConnection, { reportParameters, cha
         throw err;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/style-templates.d.ts

@@ -1,4 +1,4 @@
-import { RowDataPacket } from 'mysql';
-import { TableStyleTemplateObject } from './types/chart';
+import type { RowDataPacket } from 'mysql';
+import type { TableStyleTemplateObject } from './types/chart';
 declare function styleRow(row: RowDataPacket, templates: TableStyleTemplateObject): RowDataPacket;
 export default styleRow;

package/dist/style-templates.js

@@ -1,12 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mathjs_1 = require("mathjs");
-const snakecase_keys_1 = __importDefault(require("snakecase-keys"));
-const klona_1 = require("klona");
-const math = (0, mathjs_1.create)(mathjs_1.all);
+import { create, all } from 'mathjs';
+import snakecaseKeys from 'snakecase-keys';
+import { klona } from 'klona';
+const math = create(all);
 math.import({
     locale: (value) => value.toLocaleString(),
     includes: (value, search) => value.includes(search),
@@ -14,7 +9,7 @@ math.import({
 function handleMathJsCellStyleTemplate(row, columnToStyle, templates) {
     const outCell = { value: row[columnToStyle] };
     if (columnToStyle in templates) {
-        const scope = (0, snakecase_keys_1.default)((0, klona_1.klona)({ ...row, value: outCell.value }), { deep: true });
+        const scope = snakecaseKeys(klona({ ...row, value: outCell.value }), { deep: true });
         for (const key in templates[columnToStyle]) {
             try {
                 const expression = templates[columnToStyle][key] ?? '';
@@ -34,5 +29,5 @@ function styleRow(row, templates) {
     }
     return outRow;
 }
-exports.default = styleRow;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGUtdGVtcGxhdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3N0eWxlLXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUlBLG1DQUFvQztBQUVwQyxvRUFBMEM7QUFDMUMsaUNBQTZCO0FBRTdCLE1BQU0sSUFBSSxHQUFHLElBQUEsZUFBTSxFQUFDLFlBQUcsQ0FBQyxDQUFBO0FBQ3hCLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDWCxNQUFNLEVBQUUsQ0FBQyxLQUFhLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUU7SUFDakQsUUFBUSxFQUFFLENBQUMsS0FBYSxFQUFFLE1BQWMsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7Q0FDbkUsQ0FBQyxDQUFBO0FBRUYsU0FBUyw2QkFBNkIsQ0FBQyxHQUFrQixFQUFFLGFBQXFCLEVBQUUsU0FBbUM7SUFDcEgsTUFBTSxPQUFPLEdBQUcsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLGFBQWEsQ0FBQyxFQUFxQyxDQUFBO0lBQ2hGLElBQUksYUFBYSxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBRWhDLE1BQU0sS0FBSyxHQUFHLElBQUEsd0JBQWEsRUFBQyxJQUFBLGFBQUssRUFBQyxFQUFFLEdBQUcsR0FBRyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQ3BGLEtBQUssTUFBTSxHQUFHLElBQUksU0FBUyxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7WUFDNUMsSUFBSSxDQUFDO2dCQUNKLE1BQU0sVUFBVSxHQUFHLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUE7Z0JBQ3RELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQTtZQUNoRCxDQUFDO1lBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztnQkFHZCxPQUFPLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUN4RixDQUFDO1FBQ0YsQ0FBQztJQUNGLENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQTtBQUNmLENBQUM7QUFFRCxTQUFTLFFBQVEsQ0FBQyxHQUFrQixFQUFFLFNBQW1DO0lBQ3hFLE1BQU0sTUFBTSxHQUFHLEVBQW1CLENBQUE7SUFDbEMsS0FBSyxNQUFNLFVBQVUsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUM5QixNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsNkJBQTZCLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUMvRSxDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUE7QUFDZCxDQUFDO0FBRUQsa0JBQWUsUUFBUSxDQUFBIn0=
+export default styleRow;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGUtdGVtcGxhdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3N0eWxlLXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUVwQyxPQUFPLGFBQWEsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sT0FBTyxDQUFBO0FBRTdCLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ1gsTUFBTSxFQUFFLENBQUMsS0FBYSxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsY0FBYyxFQUFFO0lBQ2pELFFBQVEsRUFBRSxDQUFDLEtBQWEsRUFBRSxNQUFjLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO0NBQ25FLENBQUMsQ0FBQTtBQUVGLFNBQVMsNkJBQTZCLENBQUMsR0FBa0IsRUFBRSxhQUFxQixFQUFFLFNBQW1DO0lBQ3BILE1BQU0sT0FBTyxHQUFHLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxhQUFhLENBQUMsRUFBcUMsQ0FBQTtJQUNoRixJQUFJLGFBQWEsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUVoQyxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxHQUFHLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7UUFDcEYsS0FBSyxNQUFNLEdBQUcsSUFBSSxTQUFTLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztZQUM1QyxJQUFJLENBQUM7Z0JBQ0osTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDdEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFBO1lBQ2hELENBQUM7WUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO2dCQUdkLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1lBQ3hGLENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztJQUNELE9BQU8sT0FBTyxDQUFBO0FBQ2YsQ0FBQztBQUVELFNBQVMsUUFBUSxDQUFDLEdBQWtCLEVBQUUsU0FBbUM7SUFDeEUsTUFBTSxNQUFNLEdBQUcsRUFBbUIsQ0FBQTtJQUNsQyxLQUFLLE1BQU0sVUFBVSxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzlCLE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyw2QkFBNkIsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQy9FLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQTtBQUNkLENBQUM7QUFFRCxlQUFlLFFBQVEsQ0FBQSJ9

package/dist/types/chart.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvY2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/types/parameter.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL3BhcmFtZXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dist/types/report.d.ts

@@ -1,5 +1,5 @@
-import { Chart } from './chart';
-import { DashboardReportParameter } from './parameter';
+import type { Chart } from './chart';
+import type { DashboardReportParameter } from './parameter';
 export interface Report {
     dashboardReportId: number;
     name: string;

package/dist/types/report.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL3JlcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dist/types/session.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9zZXNzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

package/package.json

@@ -1,8 +1,9 @@
 {
 	"name": "@isoftdata/utility-dashboard-backend",
-	"version": "2.4.15",
+	"version": "3.0.1",
 	"description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
 	"main": "dist/index.js",
+	"type": "module",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"build": "tsc",
@@ -26,7 +27,8 @@
 	},
 	"dependencies": {
 		"@isoftdata/utility-date-time": "^4.0.1",
-		"@isoftdata/utility-db": "^1.4.0",
+		"@isoftdata/utility-db": "^3.2.1",
+		"@types/to-snake-case": "^1.0.2",
 		"camelcase": "^6.3.0",
 		"date-fns": "^3.6.0",
 		"deepmerge": "^4.2.2",