@isoftdata/utility-dashboard-backend 4.1.0-beta.2 → 4.1.0

package/dist/index.js

@@ -30,14 +30,15 @@ async function loadChartData(mysqlConnection, chart, parameterValues, customData
     if (!chartWrapper) {
         throw new Error('No chartWrapper found in chart!');
     }
-    cumulative = cumulative || (chartWrapper.chartType === 'AreaChart' && cumulative !== false);
+    cumulative =
+        cumulative || ('chartType' in chartWrapper && chartWrapper.chartType === 'AreaChart' && cumulative !== false);
     let dataTable = {}, processedFormatting = {};
     try {
         const dataTableAndProcessedFormatting = await loadDataTableAndProcessedFormatting(mysqlConnection, {
             query: parameterizeQuery(theRest.query ?? '', parameterValues),
             multiSeries,
             formatting,
-            chartType: chartWrapper.chartType ?? chart.supertype,
+            chartType: ('chartType' in chartWrapper ? chartWrapper.chartType : undefined) ?? chart.supertype,
             cumulative,
             table,
             customDataSource,
@@ -57,6 +58,7 @@ async function loadChartData(mysqlConnection, chart, parameterValues, customData
         return {
             ...theRest,
             chartWrapper,
+            supertype: 'table',
             table: { ...table, ...dataTable },
             formatting: processedFormatting,
         };
@@ -80,10 +82,11 @@ async function loadChartData(mysqlConnection, chart, parameterValues, customData
             },
         };
     }
-    else {
+    else if (theRest.supertype === 'google') {
         return {
             ...theRest,
             cumulative,
+            supertype: 'google',
             chartWrapper: {
                 ...chartWrapper,
                 dataTable: dataTable,
@@ -91,6 +94,7 @@ async function loadChartData(mysqlConnection, chart, parameterValues, customData
             formatting: processedFormatting,
         };
     }
+    throw new Error(`Invalid chart supertype ${theRest.supertype}`);
 }
 export async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource, }) {
     let results = [];
@@ -382,7 +386,7 @@ export async function formatChartDataForReport(mysqlConnection, { reportParamete
             siteIdColumn,
             siteNameColumn,
         });
-        if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {
+        if (reportChart?.jsonOverride?.chartWrapper && 'dataTable' in reportChart.jsonOverride.chartWrapper) {
             const { dataTable, ...chartWrapper } = reportChart.jsonOverride.chartWrapper;
             reportChart.jsonOverride.chartWrapper = chartWrapper;
         }
@@ -399,4 +403,4 @@ export async function formatChartDataForReport(mysqlConnection, { reportParamete
         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/types/chart.d.ts

@@ -1,4 +1,3 @@
-import type { MergeDeep } from 'type-fest';
 import type { NumberFormatOptions, MediumDateFormatOptions, LongDateFormatOptions } from '../formatting-templates.js';
 export type GoogleDataTableCell = {
     v?: unknown;
@@ -94,6 +93,9 @@ export type ChartWrapper = {
     dataTable?: GoogleDataTable;
     chartType: 'Table';
 };
+type ChartDimensions = {
+    options: WidthAndHeight;
+};
 export type MultiSeriesOptions = {
     value: string;
     series: string;
@@ -163,12 +165,7 @@ export interface ChartBase extends ChartJson {
 }
 export interface ChartJson {
     allowExport?: boolean;
-    chartWrapper: MergeDeep<ChartWrapper, {
-        options: {
-            width: number;
-            height: number;
-        };
-    }>;
+    chartWrapper: ChartWrapper | ChartDimensions;
     cumulative?: boolean;
     formatting?: Formatting;
     greedyHeight?: boolean;
@@ -186,17 +183,20 @@ export interface ChartJson {
 interface GoogleChart extends ChartBase {
     query: string;
     supertype: 'google';
+    chartWrapper: ChartWrapper;
 }
 interface TableChart extends ChartBase {
     query: string;
     supertype: 'table';
     table: NonNullable<ChartBase['table']>;
+    chartWrapper: ChartDimensions;
 }
 interface EmbedChart extends ChartBase {
     supertype: 'embed';
     url: NonNullable<ChartBase['url']>;
     formattedUrl?: string;
     query?: never;
+    chartWrapper: ChartDimensions;
 }
 interface MarkdownChart extends ChartBase {
     supertype: 'markdown';
@@ -205,6 +205,7 @@ interface MarkdownChart extends ChartBase {
         content: string;
         formattedContent?: string;
     };
+    chartWrapper: ChartDimensions;
 }
 export type Chart = GoogleChart | TableChart | EmbedChart | MarkdownChart;
 export {};

package/package.json

@@ -1,54 +1,55 @@
-{
-  "name": "@isoftdata/utility-dashboard-backend",
-  "version": "4.1.0-beta.2",
-  "description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
-  "main": "dist/index.js",
-  "type": "module",
-  "author": "Charles Kaup",
-  "license": "ISC",
-  "files": [
-    "dist/**/*.*"
-  ],
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./chart-helper": {
-      "import": "./dist/chart-helper.js",
-      "types": "./dist/chart-helper.d.ts"
-    }
-  },
-  "dependencies": {
-    "@isoftdata/utility-date-time": "^4.3.1",
-    "camelcase": "^6.3.0",
-    "date-fns": "^4.1.0",
-    "deepmerge": "^4.2.2",
-    "klona": "^2.0.6",
-    "mathjs": "^11.5.0",
-    "to-snake-case": "^1.0.0"
-  },
-  "devDependencies": {
-    "@isoftdata/eslint-config-typescript": "^3.1.4",
-    "@isoftdata/prettier-config-base": "^1.0.3",
-    "@types/google.visualization": "^0.0.68",
-    "@types/node": "^18.19.130",
-    "@types/to-snake-case": "^1.0.2",
-    "package-preview": "^4.0.0",
-    "prettier": "^3.7.4",
-    "type-fest": "^4.41.0",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "@isoftdata/utility-db": ">4.2.0"
-  },
-  "prettier": "@isoftdata/prettier-config-base",
-  "engines": {
-    "pnpm": "10.x"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc"
-  }
-}
+{
+	"name": "@isoftdata/utility-dashboard-backend",
+	"version": "4.1.0",
+	"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",
+		"prepublishOnly": "npm run build"
+	},
+	"author": "Charles Kaup",
+	"license": "ISC",
+	"files": [
+		"dist/**/*.*"
+	],
+	"types": "dist/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"types": "./dist/index.d.ts"
+		},
+		"./chart-helper": {
+			"import": "./dist/chart-helper.js",
+			"types": "./dist/chart-helper.d.ts"
+		}
+	},
+	"dependencies": {
+		"@isoftdata/utility-date-time": "^4.3.1",
+		"camelcase": "^6.3.0",
+		"date-fns": "^4.1.0",
+		"deepmerge": "^4.2.2",
+		"klona": "^2.0.6",
+		"mathjs": "^11.5.0",
+		"to-snake-case": "^1.0.0"
+	},
+	"devDependencies": {
+		"@isoftdata/eslint-config-typescript": "^3.1.4",
+		"@isoftdata/prettier-config-base": "^1.0.3",
+		"@types/google.visualization": "^0.0.68",
+		"@types/node": "^18.19.130",
+		"@types/to-snake-case": "^1.0.2",
+		"package-preview": "^4.0.0",
+		"prettier": "^3.7.4",
+		"type-fest": "^4.41.0",
+		"typescript": "^5.9.3"
+	},
+	"peerDependencies": {
+		"@isoftdata/utility-db": ">4.2.0"
+	},
+	"prettier": "@isoftdata/prettier-config-base",
+	"engines": {
+		"pnpm": "10.x"
+	}
+}