visualifyjs 2.5.3-2.dev → 2.5.3-9-dev

package/src/core/parser/echart.types.js

@@ -1,76 +1,76 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2024-01-21 19:18:05
- * @FilePath     : /visualifyjs/src/core/parser/echart.types.js
- * @Description  :
- * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-export function handle_alltypes_chart(type, Options) {
-	if (type === 'pie') return handle_pie_chart(Options);
-	if (type === 'radar') return handle_radar_chart(Options);
-	if (type === 'funnel') return handle_funnel_chart(Options);
-	return Options;
-}
-
-function handle_pie_chart(Options) {
-	const newOptions = {
-		...Options,
-		legend: {
-			...Options?.legend,
-			orient: 'vertical',
-			left: 'left',
-		},
-		emphasis: {
-			...Options?.emphasis,
-			itemStyle: {
-				shadowBlur: 10,
-				shadowOffsetX: 0,
-				shadowColor: 'rgba(0, 0, 0, 0.5)',
-			},
-		},
-		xAxis: {
-			show: false,
-		},
-		yAxis: {
-			show: false,
-		},
-	};
-	return newOptions;
-}
-
-function handle_radar_chart(Options) {
-	const newOptions = {
-		...Options,
-		radar: {
-			...Options?.radar,
-		},
-		xAxis: {
-			show: false,
-		},
-		yAxis: {
-			show: false,
-		},
-		legend: {
-			top: 0,
-		},
-	};
-	return newOptions;
-}
-
-
-function handle_funnel_chart(Options) {
-	const newOptions = {
-		...Options,
-		xAxis: {
-			show: false,
-		},
-		yAxis: {
-			show: false,
-		},
-		legend: {
-			top: 0,
-		},
-	};
-	return newOptions;
-}
-
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2024-01-21 19:18:05
+ * @FilePath     : /visualifyjs/src/core/parser/echart.types.js
+ * @Description  :
+ * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+export function handle_alltypes_chart(type, Options) {
+	if (type === 'pie') return handle_pie_chart(Options);
+	if (type === 'radar') return handle_radar_chart(Options);
+	if (type === 'funnel') return handle_funnel_chart(Options);
+	return Options;
+}
+
+function handle_pie_chart(Options) {
+	const newOptions = {
+		...Options,
+		legend: {
+			...Options?.legend,
+			orient: 'vertical',
+			left: 'left',
+		},
+		emphasis: {
+			...Options?.emphasis,
+			itemStyle: {
+				shadowBlur: 10,
+				shadowOffsetX: 0,
+				shadowColor: 'rgba(0, 0, 0, 0.5)',
+			},
+		},
+		xAxis: {
+			show: false,
+		},
+		yAxis: {
+			show: false,
+		},
+	};
+	return newOptions;
+}
+
+function handle_radar_chart(Options) {
+	const newOptions = {
+		...Options,
+		radar: {
+			...Options?.radar,
+		},
+		xAxis: {
+			show: false,
+		},
+		yAxis: {
+			show: false,
+		},
+		legend: {
+			top: 0,
+		},
+	};
+	return newOptions;
+}
+
+
+function handle_funnel_chart(Options) {
+	const newOptions = {
+		...Options,
+		xAxis: {
+			show: false,
+		},
+		yAxis: {
+			show: false,
+		},
+		legend: {
+			top: 0,
+		},
+	};
+	return newOptions;
+}
+

package/src/core/parser/plotly.config.js

@@ -1,10 +1,10 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2024-01-14 14:43:20
- * @FilePath     : /visualifyjs/src/core/parser/plotly.config.js
- * @Description  : 
- * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-const handle_Config = async () => {};
-
-export default handle_Config;
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2024-01-14 14:43:20
+ * @FilePath     : /visualifyjs/src/core/parser/plotly.config.js
+ * @Description  : 
+ * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+const handle_Config = async () => {};
+
+export default handle_Config;

package/src/core/parser/plotly.data.js

@@ -1,132 +1,132 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2024-01-14 14:43:45
- * @FilePath     : /visualifyjs/src/core/parser/plotly.data.js
- * @Description  :
- * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-import conditionalFetch from '../fetch/condfetch';
-import { isEmpty } from 'lodash';
-
-const handle_Data = async (parser = {}, Options = {}, sharedData) => {
-	const { sources } = parser;
-
-	let fetched_data = {}; // response from api
-
-	const processSource = async (source) => {
-		let resp = await conditionalFetch(
-			source,
-			sharedData,
-			Options.title,
-			Options.visualify,
-		);
-		if (resp) fetched_data[source.name] = resp;
-	};
-
-	if (Array.isArray(sources)) {
-		await Promise.all(sources.map(processSource));
-	} else if (typeof sources === 'object') {
-		await processSource(sources);
-	}
-
-	if (isEmpty(fetched_data))
-		throw new Error(parser?.startup_msg ?? 'No data fetched from api');
-
-	return fetched_data;
-};
-
-export default handle_Data;
-
-export const __process_fetched_data = (
-	fetched_data,
-	parser_config,
-	visualify = {},
-) => {
-	//console.log('visualify', visualify);
-	const {
-		seriesBy = visualify?.seriesBy ?? null,
-		mapping = visualify?.mapping ?? {},
-		exclude = visualify?.exclude ?? [],
-		symbol = visualify?.symbol ?? null,
-		symbolSize = visualify?.symbolSize ?? null,
-		merger = visualify?.merger ?? null,
-	} = parser_config;
-	const { x = 'x', y = 'y', z = 'z', extra = [] } = mapping;
-	const aggregatedData = {};
-
-	for (const [key, data] of Object.entries(fetched_data)) {
-		//console.log('processing data from api', key, data);
-		if (!data) {
-			return Object.values(aggregatedData);
-		} else if (data && merger && merger[key]) {
-            /*
-			console.log(
-				`Plotly processing data from merger:`,
-				key,
-				`merger`,
-				merger[key],
-				`data`,
-				data,
-				`with`,
-				aggregatedData,
-			);*/
-			// add extra properties to aggregatedData.data
-			Object.values(aggregatedData).forEach((item) => {
-				item.data.forEach((value) => {
-					if (merger[key].item in value) {
-						let tag = value[merger[key].item];
-						let val = data[tag];
-						if (merger[key].label) value[merger[key].label] = val;
-						if (merger[key].visualMap) value.value.push(val);
-					}
-				});
-			});
-		} else {
-			// if seriesBy is not defined, get the first key of data as the series
-			const seriesKey = seriesBy ?? Object.keys(data)[0];
-			if (
-				data[seriesKey] === undefined ||
-				data === undefined ||
-				!Array.isArray(data[seriesKey])
-			)
-				continue;
-			data[seriesKey].forEach((item, index) => {
-				if (exclude && exclude.includes(item)) return;
-
-				const extraProperties = {};
-				for (const property in mapping.extra) {
-					if (data[extra[property]]) {
-						extraProperties[property] =
-							data[extra[property]][index];
-					}
-				}
-
-				if (!data[x] || !data[y] || !parser_config.type) return;
-
-				const point = data[z]
-					? [data[x][index], data[y][index], data[z][index]]
-					: [data[x][index], data[y][index]];
-
-				if (!aggregatedData[item]) {
-					aggregatedData[item] = {
-						name: item,
-						type: parser_config.type,
-						data: [],
-					};
-					if (symbol) aggregatedData[item].symbol = symbol;
-					if (symbolSize)
-						aggregatedData[item].symbolSize = symbolSize;
-				}
-
-				aggregatedData[item].data.push({
-					value: point,
-					...extraProperties,
-				});
-			});
-		}
-	}
-
-	let processed_data = Object.values(aggregatedData);
-
-	return processed_data;
-};
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2024-01-14 14:43:45
+ * @FilePath     : /visualifyjs/src/core/parser/plotly.data.js
+ * @Description  :
+ * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+import conditionalFetch from '../fetch/condfetch';
+import { isEmpty } from 'lodash';
+
+const handle_Data = async (parser = {}, Options = {}, sharedData) => {
+	const { sources } = parser;
+
+	let fetched_data = {}; // response from api
+
+	const processSource = async (source) => {
+		let resp = await conditionalFetch(
+			source,
+			sharedData,
+			Options.title,
+			Options.visualify,
+		);
+		if (resp) fetched_data[source.name] = resp;
+	};
+
+	if (Array.isArray(sources)) {
+		await Promise.all(sources.map(processSource));
+	} else if (typeof sources === 'object') {
+		await processSource(sources);
+	}
+
+	if (isEmpty(fetched_data))
+		throw new Error(parser?.startup_msg ?? 'No data fetched from api');
+
+	return fetched_data;
+};
+
+export default handle_Data;
+
+export const __process_fetched_data = (
+	fetched_data,
+	parser_config,
+	visualify = {},
+) => {
+	//console.log('visualify', visualify);
+	const {
+		seriesBy = visualify?.seriesBy ?? null,
+		mapping = visualify?.mapping ?? {},
+		exclude = visualify?.exclude ?? [],
+		symbol = visualify?.symbol ?? null,
+		symbolSize = visualify?.symbolSize ?? null,
+		merger = visualify?.merger ?? null,
+	} = parser_config;
+	const { x = 'x', y = 'y', z = 'z', extra = [] } = mapping;
+	const aggregatedData = {};
+
+	for (const [key, data] of Object.entries(fetched_data)) {
+		//console.log('processing data from api', key, data);
+		if (!data) {
+			return Object.values(aggregatedData);
+		} else if (data && merger && merger[key]) {
+            /*
+			console.log(
+				`Plotly processing data from merger:`,
+				key,
+				`merger`,
+				merger[key],
+				`data`,
+				data,
+				`with`,
+				aggregatedData,
+			);*/
+			// add extra properties to aggregatedData.data
+			Object.values(aggregatedData).forEach((item) => {
+				item.data.forEach((value) => {
+					if (merger[key].item in value) {
+						let tag = value[merger[key].item];
+						let val = data[tag];
+						if (merger[key].label) value[merger[key].label] = val;
+						if (merger[key].visualMap) value.value.push(val);
+					}
+				});
+			});
+		} else {
+			// if seriesBy is not defined, get the first key of data as the series
+			const seriesKey = seriesBy ?? Object.keys(data)[0];
+			if (
+				data[seriesKey] === undefined ||
+				data === undefined ||
+				!Array.isArray(data[seriesKey])
+			)
+				continue;
+			data[seriesKey].forEach((item, index) => {
+				if (exclude && exclude.includes(item)) return;
+
+				const extraProperties = {};
+				for (const property in mapping.extra) {
+					if (data[extra[property]]) {
+						extraProperties[property] =
+							data[extra[property]][index];
+					}
+				}
+
+				if (!data[x] || !data[y] || !parser_config.type) return;
+
+				const point = data[z]
+					? [data[x][index], data[y][index], data[z][index]]
+					: [data[x][index], data[y][index]];
+
+				if (!aggregatedData[item]) {
+					aggregatedData[item] = {
+						name: item,
+						type: parser_config.type,
+						data: [],
+					};
+					if (symbol) aggregatedData[item].symbol = symbol;
+					if (symbolSize)
+						aggregatedData[item].symbolSize = symbolSize;
+				}
+
+				aggregatedData[item].data.push({
+					value: point,
+					...extraProperties,
+				});
+			});
+		}
+	}
+
+	let processed_data = Object.values(aggregatedData);
+
+	return processed_data;
+};

package/src/core/parser/plotly.layout.js

@@ -1,10 +1,10 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2024-01-14 14:44:10
- * @FilePath     : /visualifyjs/src/core/parser/plotly.layout.js
- * @Description  : 
- * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-const handle_Layour = async () => {};
-
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2024-01-14 14:44:10
+ * @FilePath     : /visualifyjs/src/core/parser/plotly.layout.js
+ * @Description  : 
+ * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+const handle_Layour = async () => {};
+
 export default handle_Layour;

package/src/core/parser/plotly.violin.js

@@ -1,18 +1,18 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2024-01-14 16:20:14
- * @FilePath     : /visualifyjs/src/core/parser/plotly.violin.js
- * @Description  :
- * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-
-export const handle_violin_plot = (processed_data) => {
-	const plotlyData = processed_data.map((item) => {
-		return {
-			type: item.type,
-			y: item.data.map((d) => d.value[2]),
-			name: item.name,
-		};
-	});
-	return plotlyData;
-};
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2024-01-14 16:20:14
+ * @FilePath     : /visualifyjs/src/core/parser/plotly.violin.js
+ * @Description  :
+ * Copyright (c) 2024 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+
+export const handle_violin_plot = (processed_data) => {
+	const plotlyData = processed_data.map((item) => {
+		return {
+			type: item.type,
+			y: item.data.map((d) => d.value[2]),
+			name: item.name,
+		};
+	});
+	return plotlyData;
+};

package/src/core/recharts.js

@@ -1,62 +1,62 @@
-/*
- * @Author       : Lihao leolihao@arizona.edu
- * @Date         : 2023-11-29 16:02:42
- * @FilePath     : /visualifyjs/src/core/recharts.js
- * @Description  :
- * Copyright (c) 2023 by Lihao (leolihao@arizona.edu), All Rights Reserved.
- */
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-import EChartSwitcher from './modules/echartswitcher';
-import { VisualifyProvider } from './appContext';
-
-class Recharts {
-	constructor(config = {}) {
-		//console.log('config', config);
-		const { el = null } = config;
-		// Default to empty object if nothing is passed
-		if (typeof el === 'string') {
-			this.selector = document.querySelector(el);
-			if (!this.selector) {
-				throw new Error(`Element not found with selector: ${el}`);
-			}
-		} else {
-			this.selector = el;
-		}
-		const { parser = null, advanced = null, ...rest } = config;
-		this.config = rest;
-		this.parser = parser;
-		this.advanced = advanced;
-	}
-
-	mount(selector = this.selector) {
-		const el =
-			typeof selector === 'string'
-				? document.querySelector(selector)
-				: selector;
-
-		if (!el)
-			throw new Error(`Element not found with selector: ${selector}`);
-
-		try {
-			// Assuming createRoot is imported from 'react-dom/client'
-			const charts = createRoot(el);
-			charts.render(
-				<VisualifyProvider>
-					<EChartSwitcher
-						props={{
-							config: this.config,
-							parser: this.parser,
-							advanced: this.advanced,
-						}}
-					/>
-				</VisualifyProvider>,
-			);
-			//console.log('mounted ' + selector, el);
-		} catch (e) {
-			console.error('Error mounting chart:', e);
-		}
-	}
-}
-
-export default Recharts;
+/*
+ * @Author       : Lihao leolihao@arizona.edu
+ * @Date         : 2023-11-29 16:02:42
+ * @FilePath     : /visualifyjs/src/core/recharts.js
+ * @Description  :
+ * Copyright (c) 2023 by Lihao (leolihao@arizona.edu), All Rights Reserved.
+ */
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+import EChartSwitcher from './modules/echartswitcher';
+import { VisualifyProvider } from './appContext';
+
+class Recharts {
+	constructor(config = {}) {
+		//console.log('config', config);
+		const { el = null } = config;
+		// Default to empty object if nothing is passed
+		if (typeof el === 'string') {
+			this.selector = document.querySelector(el);
+			if (!this.selector) {
+				throw new Error(`Element not found with selector: ${el}`);
+			}
+		} else {
+			this.selector = el;
+		}
+		const { parser = null, advanced = null, ...rest } = config;
+		this.config = rest;
+		this.parser = parser;
+		this.advanced = advanced;
+	}
+
+	mount(selector = this.selector) {
+		const el =
+			typeof selector === 'string'
+				? document.querySelector(selector)
+				: selector;
+
+		if (!el)
+			throw new Error(`Element not found with selector: ${selector}`);
+
+		try {
+			// Assuming createRoot is imported from 'react-dom/client'
+			const charts = createRoot(el);
+			charts.render(
+				<VisualifyProvider>
+					<EChartSwitcher
+						props={{
+							config: this.config,
+							parser: this.parser,
+							advanced: this.advanced,
+						}}
+					/>
+				</VisualifyProvider>,
+			);
+			//console.log('mounted ' + selector, el);
+		} catch (e) {
+			console.error('Error mounting chart:', e);
+		}
+	}
+}
+
+export default Recharts;