pict-section-form 1.0.139 → 1.0.141

package/docs/input_providers/009-chart.md

@@ -64,6 +64,24 @@ Because modern charting libraries rely almost entirely on configuration to
 define behavior these days, we can manage the displays this way and only
 rely on the pict-section-form library to broker data back-and-forth.
 
+Chaining by default does the following:
+
+1. If there is a `Raw` use that as the base
+2. If there as an `Address` use that instead of `Raw` as the base (this lets you override config if you want)
+3. If there is a configuration, merge that with the base
+
+So if there is a `ChartLabelsRaw` you can have a set of hard-coded values, and
+then if there is a `ChartLabelsAddress` the input provider will look at that
+address and see if there is an object at that address; if there is it will be
+used instead (as opposed to merging).
+
+Lastly, if there is a configuration,  it will merge the configuration into
+whatever came from these.
+
+You can control this though!  It's controlled by configuration.
+
+
+
 ### Purely Raw Data
 
 You can hard code any chart right into the form.  There are three places
@@ -76,106 +94,116 @@ for raw form config:
 The input provider will use the `ChartJSOptionsCorePrototype` and then
 decorate in the `labels` and `data` objects from their raw entries.
 
-Chaining always does the following:
 
-1. If there is a `Raw`
+### Purely Raw, Hard-coded Data and Labels
+
+This is hard-coded config.  It takes whatever is in the "Raw" configuration and
+puts it into the chart config.
 
 ```json
 {
- "SimpleGraphExampleRawData":
- {
-  Name: "OrderCaloryGraph",
-  Hash: "OrderCaloryGraph",
-  
-  DataType: "Object",
-  PictForm:
-  {
-   Section: "Chart",
-   Group: "SimpleChart",
-
-   Row: 1,
-   Width: 12,
-
-   InputType: "Chart",
-
-   ChartLabelsRaw:  ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
-
-   ChartDatasetsRaw: [
-    {
-     label: 'Awesomeness',
-     data: [ 1500, 1200, 800, 1700, 900, 2000 ]
-    }],
-
-   ChartJSOptionsCorePrototype:
-   {
-    type: 'bar'
-   }
-  }
- }
+	"SimpleGraphExampleRawDataOne":
+	{
+		Name: "SimpleGraphExampleOne",
+		Hash: "SimpleGraphExampleOne",
+
+		DataType: "Object",
+		PictForm:
+		{
+			Section: "Chart",
+			Group: "SimpleChart",
+
+			Row: 1,
+			Width: 3,
+
+			InputType: "Chart",
+
+			ChartLabelsRaw: ['Red', 'Green', 'Yellow', 'Grey', 'Blue'],
+
+			ChartDatasetsRaw: [{
+				label: 'My First Dataset',
+				data: [11, 16, 7, 3, 14],
+				backgroundColor: 
+				[
+					'rgb(255, 99, 132)',
+					'rgb(75, 192, 192)',
+					'rgb(255, 205, 86)',
+					'rgb(201, 203, 207)',
+					'rgb(54, 162, 235)'
+				]
+			}],
+
+			ChartJSOptionsCorePrototype:
+			{
+				type: 'polarArea'
+			}
+		}
+	}
 }
 ```
 
-### Purely Raw Data
+### Configurability via Solvers
+
+This is configuration based on solvers.
 
 ```json
 {
- "SimpleGraphExampleRawData":
- {
-  Name: "OrderCaloryGraph",
-  Hash: "OrderCaloryGraph",
-  
-  DataType: "Object",
-  PictForm:
-  {
-   Section: "Chart",
-   Group: "SimpleChart",
-   Row: 1,
-   Width: 12,
-   InputType: "Chart",
-
-   ChartType: "bar",
-
-   // This allows you to scope data for the chart separately from appdata
-   ChartDataScope: "Form",
+	"SimpleGraphExampleRawDataTwo":
+	{
+		Name: "SimpleGraphExampleTwo",
+		Hash: "SimpleGraphExampleTwo",
+
+		DataType: "Object",
+		PictForm:
+		{
+			Section: "Chart",
+			Group: "SimpleChart",
+
+			Row: 2,
+			Width: 6,
+
+			InputType: "Chart",
+
+			ChartType: "bar",
+			ChartLabelsSolver: `objectkeystoarray(aggregationhistogrambyobject(FruitGrid, "name", "nutritions.calories"))`,
+			ChartDatasetsSolvers:
+				[
+					{
+						Label: 'Calories',
+						DataSolver: `objectvaluestoarray(aggregationhistogrambyobject(FruitGrid, "name", "nutritions.calories"))` 
+					}
+				]
+		}
+	}
+}
+```
 
-   ChartDataAddress: "FruitData.FruityVice",
+### Configurability via Address
 
-   ChartLabelsAddress: "FruitData.FruityVice",
-   ChartLabelsRaw:  ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+This is configuration based on solvers.
 
-   ChartDatasetsAddress: "FruitData.FruityVice",
-   ChartDatasetsConfig:
-   {
-    Calories:
-    {
-     ChartLabel: "Calories",
-     DataSolver: "Data = {~D:Record.nutritions.calories~}",
-     DataTemplate: "{~D:Record.SolverResult~}", // Could also be something from the solver postfix stack
-     DataCorePrototype:
-     {
-      borderWidth: 1
-     }
-    }
-   },
-   ChartDatasetsRaw: [
-    {
-     label: 'Awesomeness',
-     data: [ 1500, 1200, 800, 1700, 900, 2000 ]
-    }],
-
-   // Do anything you want here!!
-   ChartJSOptionsCorePrototype:
-   {
-    type: 'bar',
-    options: {
-     scales: {
-      y: {
-       beginAtZero: true
-      }
-     }
-    }
-   }
-  }
- }
+```json
+{
+	"SimpleGraphExampleRawDataTwo":
+	{
+		Name: "SimpleGraphExampleTwo",
+		Hash: "SimpleGraphExampleTwo",
+
+		DataType: "Object",
+		PictForm:
+		{
+			Section: "Chart",
+			Group: "SimpleChart",
+
+			Row: 2,
+			Width: 6,
+
+			InputType: "Chart",
+
+			ChartType: "bar",
+			ChartLabelsAddress: `AppData.Chart.LabelsArray`,
+			ChartDatasetsAddress: `AppData.Chart.Datasets`
+		}
+	}
 }
-```
+```

package/example_applications/complex_table/Complex-Tabular-Application.js

@@ -354,7 +354,7 @@ module.exports.default_configuration.pict_configuration = {
 						]
 					}],
 
-					ChartJSOptionsCorePrototype:
+					ChartConfigCorePrototypeRaw:
 					{
 						type: 'polarArea'
 					}
@@ -379,7 +379,7 @@ module.exports.default_configuration.pict_configuration = {
 
 					ChartType: "bar",
 					ChartLabelsSolver: `objectkeystoarray(aggregationhistogrambyobject(FruitGrid, "name", "nutritions.calories"))`,
-					ChartDataSolvers: 
+					ChartDatasetsSolvers:
 						[
 							{
 								Label: 'Calories',
@@ -407,7 +407,7 @@ module.exports.default_configuration.pict_configuration = {
 
 					ChartType: "bar",
 					ChartLabelsSolver: `objectkeystoarray(aggregationhistogrambyobject(FruitGrid, "name", "nutritions.fat"))`,
-					ChartDataSolvers: 
+					ChartDatasetsSolvers: 
 						[
 							{
 								Label: 'Fat',
@@ -441,30 +441,8 @@ module.exports.default_configuration.pict_configuration = {
 					Width: 12,
 					InputType: "Chart",
 
-					//ChartType: "Bar",
-
-					// This allows you to scope data for the chart separately from appdata
-					ChartDataScope: "Form",
-
-					ChartDataAddress: "FruitData.FruityVice",
-
-					ChartLabelsAddress: "FruitData.FruityVice",
 					ChartLabelsRaw: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
 
-					ChartDatasetsAddress: "FruitData.FruityVice",
-					ChartDatasetsConfig:
-					{
-						Calories:
-						{
-							ChartLabel: "Calories",
-							DataSolver: "Data = {~D:Record.nutritions.calories~}",
-							DataTemplate: "{~D:Record.SolverResult~}", // Could also be something from the solver postfix stack
-							DataCorePrototype:
-							{
-								borderWidth: 1
-							}
-						}
-					},
 					ChartDatasetsRaw: [
 						{
 							label: 'Awesomeness',
@@ -472,7 +450,7 @@ module.exports.default_configuration.pict_configuration = {
 						}],
 
 					// Do anything you want here!!
-					ChartJSOptionsCorePrototype:
+					ChartConfigCorePrototypeRaw:
 					{
 						type: 'bar',
 						options: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.139",
+    "version": "1.0.141",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {
@@ -40,7 +40,7 @@
     },
     "dependencies": {
         "fable-serviceproviderbase": "^3.0.15",
-        "marked": "^16.4.1",
+        "marked": "^15.0.12",
         "pict-provider": "^1.0.6",
         "pict-section-tuigrid": "^1.0.27",
         "pict-template": "^1.0.13",

package/source/providers/inputs/Pict-Provider-Input-Chart.js

@@ -20,86 +20,548 @@ class CustomInputHandler extends libPictSectionInputExtension
 		/** @type {any} */
 		this.log;
 
+		// Manage the the configuration parsing configurations -- these can be overridden in the object or even per-input
+		if (!this.options.DefaultCoreParsingConfiguration || !Array.isArray(this.options.DefaultCoreParsingConfiguration))
+		{
+			this.options.DefaultCoreParsingConfiguration = (
+				{
+					AddressInObject: '',
+					ObjectType: 'object',
+					MergeMethod: 'Object',
+					Steps: [
+						{
+							InputProperty: false,
+							Method: `Initialize`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartConfigCorePrototypeRaw',
+							Method: `Raw`,
+							Merge: true
+						},
+						{
+							InputProperty: 'PictForm.ChartConfigCorePrototypeAddress',
+							Method: `Address`,
+							Merge: true
+						},
+						{
+							InputProperty: `PictForm.ChartConfigCorePrototype`,
+							Method: 'SingleSolver',
+							Merge: true
+						}
+					]
+				});
+		}
+		this.defaultCoreParsingConfiguration = JSON.parse(JSON.stringify(this.options.DefaultCoreParsingConfiguration));
+
+		if (typeof (this.options.DefaultLabelParsingConfiguration) !== 'object' || !Array.isArray(this.options.DefaultLabelParsingConfiguration.Steps))
+		{
+			this.options.DefaultLabelParsingConfiguration = (
+				{
+					AddressInObject: 'data.labels',
+					ObjectType: 'array',
+					MergeMethod: 'Array',
+					Steps: [
+						{
+							InputProperty: false,
+							Method: `Initialize`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartLabelsRaw',
+							Method: `Raw`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartLabelsAddress',
+							Method: `Address`,
+							Merge: false
+						},
+						{
+							InputProperty: `PictForm.ChartLabelsSolver`,
+							Method: 'SingleSolver',
+							Merge: false
+						}
+					]
+				});
+		}
+		this.defaultLabelParsingConfiguration = JSON.parse(JSON.stringify(this.options.DefaultLabelParsingConfiguration));
+
+		if (typeof (this.options.DefaultDataParsingConfiguration) !== 'object' || !Array.isArray(this.options.DefaultDataParsingConfiguration.Steps))
+		{
+			this.options.DefaultDataParsingConfiguration = (
+				{
+					AddressInObject: 'data.datasets',
+					ObjectType: 'array',
+					MergeMethod: 'Array',
+					Steps: [
+						{
+							InputProperty: false,
+							Method: `Initialize`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartDatasetsRaw',
+							Method: `Raw`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartDatasetsAddress',
+							Method: `Address`,
+							Merge: false
+						},
+						{
+							InputProperty: 'PictForm.ChartDatasetsSolvers',
+							Method: `ArrayOfSolvers`,
+							Merge: true
+						}
+					]
+				});
+		}
+		this.defaultDataParsingConfiguration = JSON.parse(JSON.stringify(this.options.DefaultDataParsingConfiguration));
+
 		this.currentChartObjects = {};
 	}
 
-	getInputChartConfiguration(pView, pInput, pValue)
+	/**
+	 * 
+	 * @param {Object} pInput - The PictForm input object
+	 * @param {*} pChartConfiguration - The current configuration object for the form
+	 * @param {*} pParsingConfiguration - The parsing configuration to apply
+	 * @param {*} pInputParsingConfigurationScope - The input-specific parsing configuration string address for additional configuration
+	 * @returns 
+	 */
+	applyInputParsingConfiguration(pInput, pChartConfiguration, pParsingConfiguration, pInputParsingConfigurationScope)
 	{
-		let tmpView = pView;
+		// TODO: There is a ton of DRY to be had in this function when we break it out to the base class
 		let tmpInput = pInput;
-		let tmpValue = pValue;
+		let tmpInputParsingConfigurationScope = pInputParsingConfigurationScope;
 
-		if (!('PictForm' in tmpInput))
+		let tmpChartConfiguration = pChartConfiguration;
+		let tmpParsingConfiguration = pParsingConfiguration;
+
+		if (typeof (pInput) !== 'object')
+		{
+			return false;
+		}
+		if (typeof (pInputParsingConfigurationScope) !== 'string' || (pInputParsingConfigurationScope.length < 1))
+		{
+			return false;
+		}
+		if (typeof (tmpParsingConfiguration) !== 'object')
 		{
 			return false;
 		}
 
-		let tmpPictform = pInput.PictForm;
+		if (typeof (tmpChartConfiguration) !== 'object')
+		{
+			tmpChartConfiguration = {};
+		}
 
-		let tmpChartConfiguration = (typeof(tmpPictform.ChartJSOptionsCorePrototype) === 'object') ? tmpPictform.ChartJSOptionsCorePrototype : {};
+		// 1. Check if there is any custom configurtion for how to parse the config for this input (dynamic dynamic)
+		let tmpInputCustomConfiguration = this.pict.manifest.getValueByHash(tmpInput, tmpInputParsingConfigurationScope);
+		if (typeof (tmpInputCustomConfiguration) === 'object')
+		{
+			// Merge the custom configuration into the base configuration
+			tmpParsingConfiguration = Object.assign(tmpParsingConfiguration, tmpInputCustomConfiguration);
+		}
 
-		// Vet the most important two properties for defaults
-		if (!('type' in tmpChartConfiguration))
+		// Get existing data
+		let tmpExistingData;
+		if (!tmpParsingConfiguration.AddressInObject || (tmpParsingConfiguration.AddressInObject == ''))
 		{
-			tmpChartConfiguration.type = (typeof(tmpPictform.ChartType) === 'string') ? tmpPictform.ChartType : 'bar';
+			tmpExistingData = tmpChartConfiguration;
 		}
-		if (!('data' in tmpChartConfiguration))
+		else
 		{
-			tmpChartConfiguration.data = {};
+			tmpExistingData = this.pict.manifest.getValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject);
 		}
 
-		// See if there is a data solution configuration
-
-		// Start with Raw / defaults for labels and data
-		if (!('labels' in tmpChartConfiguration))
+		// 2. Enumerate through each step and apply them consistently
+		for (let i = 0; i < tmpParsingConfiguration.Steps.length; i++)
 		{
-			tmpChartConfiguration.data.labels = [];
+			let tmpCurrentStep = tmpParsingConfiguration.Steps[i];
 
-			if (Array.isArray(tmpPictform.ChartLabelsRaw))
+			switch (tmpCurrentStep.Method)
 			{
-				tmpChartConfiguration.data.labels = tmpPictform.ChartLabelsRaw;
-			}
-			// Now do the configuration-based population behaviors
+				case 'Initialize':
+					// Do nothing, already initialized
+					if (tmpParsingConfiguration.AddressInObject && (typeof (tmpParsingConfiguration.AddressInObject) === 'string') && (tmpParsingConfiguration.AddressInObject.length > 0))
+					{
+						let tmpCurrentStepData = this.pict.manifest.getValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject);
+						// see if the address exists and if it's the type we expect
+						if (tmpParsingConfiguration.ObjectType === 'array')
+						{
+							if (!tmpCurrentStepData || !Array.isArray(tmpCurrentStepData))
+							{
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, []);
+							}
+						}
+						else if (tmpParsingConfiguration.ObjectType === 'object')
+						{
+							if (!tmpCurrentStepData || (typeof (tmpCurrentStepData) !== 'object'))
+							{
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, {});
+							}
+						}
+						else
+						{
+							this.pict.log.warn(`Unsupported ObjectType ${tmpParsingConfiguration.ObjectType} parsing chart Initialize configuration for input ${tmpInput.Macro.RawHTMLID}`);
+						}
+					}
+					break;
+				case 'Raw':
+					// Check if the Raw is in there
+					let tmpRawDataExists = this.pict.manifest.checkAddressExists(tmpInput, tmpCurrentStep.InputProperty);
+					if (!tmpRawDataExists)
+					{
+						break;
+					}
 
-			if (`ChartLabelsSolver` in tmpPictform)
-			{
-				let tmpSolvedLabels = this.pict.providers.DynamicSolver.runSolver(tmpPictform.ChartLabelsSolver);
-				if (Array.isArray(tmpSolvedLabels))
-				{
-					// TODO: This may need to get complex for multiple sets of labels?
-					tmpChartConfiguration.data.labels = tmpSolvedLabels;
-				}
-			}
-		}
-		if (!('datasets' in tmpChartConfiguration))
-		{
-			tmpChartConfiguration.data.datasets = [];
-			
-			if (Array.isArray(tmpPictform.ChartDatasetsRaw))
-			{
-				tmpChartConfiguration.data.datasets = tmpChartConfiguration.data.datasets.concat(tmpPictform.ChartDatasetsRaw);
-			}
+					// Get the raw data from the input
+					let tmpRawData = this.pict.manifest.getValueByHash(tmpInput, tmpCurrentStep.InputProperty);
+					let tmpRawDataType = typeof(tmpRawData);
 
-			// Now see if there are any non-raw datasets to add
-			if (`ChartDataSolvers` in tmpPictform)
-			{
-				for (let i = 0; i < tmpPictform.ChartDataSolvers.length; i++)
-				{
-					let tmpDatasetSolverConfig = tmpPictform.ChartDataSolvers[i];
-					// TODO: Cache and check if it's changed before making it initialize data in the control again
-					let tmpDataSetSolved = this.pict.providers.DynamicSolver.runSolver(tmpDatasetSolverConfig.DataSolver);
-					if (!'Label' in tmpDatasetSolverConfig)
+					// We only support objects as configuration
+					if (tmpRawDataType !== 'object')
+					{
+						break;
+					}
+
+					if (tmpParsingConfiguration.ObjectType === 'array')
 					{
-						tmpDatasetSolverConfig.Label = `Dataset ${i+1}`;
+						if (Array.isArray(tmpRawData))
+						{
+							if (tmpCurrentStep.Merge)
+							{
+								// Get existing data
+								if (!Array.isArray(tmpExistingData))
+								{
+									tmpExistingData = [];
+								}
+								// Merge in the arrays
+								let tmpMergedData = tmpExistingData.concat(tmpRawData);
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+							}
+							else
+							{
+								// Just set the value
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+							}
+						}
 					}
-					let tmpNewDataset = {
-						label: tmpDatasetSolverConfig.Label,
-						data: (Array.isArray(tmpDataSetSolved)) ? tmpDataSetSolved : []
-					};
-					tmpChartConfiguration.data.datasets.push(tmpNewDataset);
-				}
+					else if (tmpParsingConfiguration.ObjectType === 'object')
+					{
+						if (tmpCurrentStep.Merge)
+						{
+							if (!tmpParsingConfiguration.AddressInObject || (tmpParsingConfiguration.AddressInObject == ''))
+							{
+								// This is the "root" object, so we need to merge or set directly
+								if (tmpCurrentStep.Merge)
+								{
+									tmpChartConfiguration = Object.assign(tmpChartConfiguration, tmpRawData);
+								}
+								else
+								{
+									tmpChartConfiguration = tmpRawData;
+								}
+							}
+							else
+							{
+								if ((typeof(tmpExistingData) != 'object') || (tmpExistingData == null))
+								{
+									tmpExistingData = {};
+								}
+								if (tmpCurrentStep.Merge)
+								{
+									// Merge the objects
+									let tmpMergedData = Object.assign(tmpExistingData, tmpRawData);
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+								}
+								else
+								{
+									// Just set the value
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+								}
+							}
+						}
+						else
+						{
+							// Just set the value?
+							this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+						}
+					}
+					break;
+				case 'Address':
+					let tmpAddress = this.pict.manifest.getValueByHash(tmpInput, tmpCurrentStep.InputProperty);
+					// Input is the Record in the resolution chain
+					if (!tmpAddress)
+					{
+						break;
+					}
+
+					let tmpPotentialConfigurationObject = this.pict.resolveStateFromAddress(tmpAddress, pInput);
+
+					if (typeof (tmpPotentialConfigurationObject) !== 'object')
+					{
+						break;
+					}
+
+					if (tmpParsingConfiguration.ObjectType === 'array')
+					{
+						if (Array.isArray(tmpRawData))
+						{
+							if (tmpCurrentStep.Merge)
+							{
+								// Get existing data
+								if (!Array.isArray(tmpExistingData))
+								{
+									tmpExistingData = [];
+								}
+								// Merge in the arrays
+								let tmpMergedData = tmpExistingData.concat(tmpRawData);
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+							}
+							else
+							{
+								// Just set the value
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+							}
+						}
+					}
+					else if (tmpParsingConfiguration.ObjectType === 'object')
+					{
+						if (tmpCurrentStep.Merge)
+						{
+							if (!tmpParsingConfiguration.AddressInObject || (tmpParsingConfiguration.AddressInObject == ''))
+							{
+								// This is the "root" object, so we need to merge or set directly
+								if (tmpCurrentStep.Merge)
+								{
+									tmpChartConfiguration = Object.assign(tmpChartConfiguration, tmpRawData);
+								}
+								else
+								{
+									tmpChartConfiguration = tmpRawData;
+								}
+							}
+							else
+							{
+								if ((typeof(tmpExistingData) != 'object') || (tmpExistingData == null))
+								{
+									tmpExistingData = {};
+								}
+								if (tmpCurrentStep.Merge)
+								{
+									// Merge the objects
+									let tmpMergedData = Object.assign(tmpExistingData, tmpRawData);
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+								}
+								else
+								{
+									// Just set the value
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+								}
+							}
+						}
+						else
+						{
+							// Just set the value?
+							this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+						}
+					}
+					break;
+				case 'SingleSolver':
+					let tmpSolverExpression = this.pict.manifest.getValueByHash(tmpInput, tmpCurrentStep.InputProperty);
+					// Check that the expression is a string
+					if (typeof (tmpSolverExpression) !== 'string')
+					{
+						break;
+					}
+
+					let tmpSolvedConfiguration = this.pict.providers.DynamicSolver.runSolver(tmpSolverExpression);
+
+					if (tmpParsingConfiguration.ObjectType === 'array')
+					{
+						if (Array.isArray(tmpSolvedConfiguration))
+						{
+							if (tmpCurrentStep.Merge)
+							{
+								// Get existing data
+								if (!Array.isArray(tmpExistingData))
+								{
+									tmpExistingData = [];
+								}
+								// Merge in the arrays
+								let tmpMergedData = tmpExistingData.concat(tmpSolvedConfiguration);
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+							}
+							else
+							{
+								// Just set the value
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpSolvedConfiguration);
+							}
+						}
+					}
+					else if (tmpParsingConfiguration.ObjectType === 'object')
+					{
+						if (tmpCurrentStep.Merge)
+						{
+							if (!tmpParsingConfiguration.AddressInObject || (tmpParsingConfiguration.AddressInObject == ''))
+							{
+								// This is the "root" object, so we need to merge or set directly
+								if (tmpCurrentStep.Merge)
+								{
+									tmpChartConfiguration = Object.assign(tmpChartConfiguration, tmpSolvedConfiguration);
+								}
+								else
+								{
+									tmpChartConfiguration = tmpSolvedConfiguration;
+								}
+							}
+							else
+							{
+								if ((typeof(tmpExistingData) != 'object') || (tmpExistingData == null))
+								{
+									tmpExistingData = {};
+								}
+								if (tmpCurrentStep.Merge)
+								{
+									// Merge the objects
+									let tmpMergedData = Object.assign(tmpExistingData, tmpSolvedConfiguration);
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+								}
+								else
+								{
+									// Just set the value
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+								}
+							}
+						}
+						else
+						{
+							// Just set the value?
+							this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+						}
+					}
+					break;
+
+				case 'ArrayOfSolvers':
+					let tmpSolverExpressionList = this.pict.manifest.getValueByHash(tmpInput, tmpCurrentStep.InputProperty);
+
+					// Check that the expression is a string
+					if (!Array.isArray(tmpSolverExpressionList))
+					{
+						break;
+					}
+
+					for (let i = 0; i < tmpSolverExpressionList.length; i++)
+					{
+						let tmpCurrentSolverExpression = tmpSolverExpressionList[i];
+						if (typeof(tmpCurrentSolverExpression) !== 'object')
+						{
+							continue;
+						}
+
+						let tmpSolverLabel = tmpCurrentSolverExpression.Label;
+						let tmpSolverExpression = tmpCurrentSolverExpression.DataSolver;
+						let tmpSolvedDataSet = this.pict.providers.DynamicSolver.runSolver(tmpSolverExpression);
+
+						let tmpDataObject = (
+							{
+								label: tmpSolverLabel,
+								data: (Array.isArray(tmpSolvedDataSet)) ? tmpSolvedDataSet : []
+							});
+
+						if (tmpParsingConfiguration.ObjectType === 'array')
+						{
+							if (Array.isArray(tmpSolvedDataSet))
+							{
+								if (tmpCurrentStep.Merge)
+								{
+									// Get existing data
+									if (!Array.isArray(tmpExistingData))
+									{
+										tmpExistingData = [];
+									}
+									tmpExistingData.push(tmpDataObject);
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpExistingData);
+								}
+								else
+								{
+									this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, [tmpDataObject]);
+								}
+							}
+						}
+						else if (tmpParsingConfiguration.ObjectType === 'object')
+						{
+							if (tmpCurrentStep.Merge)
+							{
+								if (!tmpParsingConfiguration.AddressInObject || (tmpParsingConfiguration.AddressInObject == ''))
+								{
+									// This is the "root" object, so we need to merge or set directly
+									if (tmpCurrentStep.Merge)
+									{
+										tmpChartConfiguration = Object.assign(tmpChartConfiguration, tmpSolvedDataSet);
+									}
+									else
+									{
+										tmpChartConfiguration = tmpSolvedDataSet;
+									}
+								}
+								else
+								{
+									if ((typeof(tmpExistingData) != 'object') || (tmpExistingData == null))
+									{
+										tmpExistingData = {};
+									}
+									if (tmpCurrentStep.Merge)
+									{
+										// Merge the objects
+										let tmpMergedData = Object.assign(tmpExistingData, tmpSolvedDataSet);
+										this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpMergedData);
+									}
+									else
+									{
+										// Just set the value
+										this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+									}
+								}
+							}
+							else
+							{
+								// Just set the value?
+								this.pict.manifest.setValueByHash(tmpChartConfiguration, tmpParsingConfiguration.AddressInObject, tmpRawData);
+							}
+						}
+					}
+					break;
 			}
 		}
+	}
+
+	getInputChartConfiguration(pView, pInput, pValue)
+	{
+		let tmpView = pView;
+		let tmpInput = pInput;
+		let tmpValue = pValue;
+
+		if (!('PictForm' in tmpInput))
+		{
+			return false;
+		}
+
+		let tmpPictform = pInput.PictForm;
+
+		let tmpChartConfiguration = (typeof (tmpPictform.ChartJSOptionsCorePrototype) === 'object') ? tmpPictform.ChartJSOptionsCorePrototype : {};
+
+		this.applyInputParsingConfiguration(pInput, tmpChartConfiguration, this.defaultCoreParsingConfiguration, 'PictForm.ChartConfigCoreParsingConfigurationOverride');
+		if (!('type' in tmpChartConfiguration))
+		{
+			tmpChartConfiguration.type = (typeof (tmpPictform.ChartType) === 'string') ? tmpPictform.ChartType : 'bar';
+		}
+		this.applyInputParsingConfiguration(pInput, tmpChartConfiguration, this.defaultLabelParsingConfiguration, 'PictForm.ChartLabelsParsingConfigurationOverride');
+		this.applyInputParsingConfiguration(pInput, tmpChartConfiguration, this.defaultDataParsingConfiguration, 'PictForm.ChartDataParsingConfigurationOverride');
 
 		return tmpChartConfiguration;
 	}
@@ -121,7 +583,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 		tmpChartCanvasElement = tmpChartCanvasElement[0]
 
 		// Check if there is a window.Chart which is the Chart.js library
-		if (typeof(window.Chart) !== 'function')
+		if (typeof (window.Chart) !== 'function')
 		{
 			this.log.warn(`Chart.js library not loaded for input ${tmpChartCanvasElementSelector}`);
 		}

package/types/source/providers/Pict-Provider-DynamicSolver.d.ts

@@ -18,6 +18,7 @@ declare class PictDynamicSolver extends libPictProvider {
         instantiateServiceProviderIfNotExists: (hash: string) => any;
         ExpressionParser: any;
     };
+    runSolver(pSolverExpression: any): any;
     /**
      * Checks the solver and returns the solver object if it passes the checks.
      *

package/types/source/providers/Pict-Provider-DynamicSolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-DynamicSolver.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicSolver.js"],"names":[],"mappings":";AA8BA;;GAEG;AACH;IAEC;;;;;;OAMG;IACH,oBAJW,MAAM,YACN,MAAM,gBACN,MAAM,EAqChB;IA9BA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,uHAAuH;IACvH,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,qCAAqC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;QAAC,gBAAgB,EAAE,GAAG,CAAA;KAAE,CACzG;IA6BX;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED;;;;;;;OAOG;IACH,wDAFW,MAAM,QAyDhB;IAED;;;;;OAKG;IACH,gEAFW,MAAM,QA+BhB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAiFxB;IADA;;;;;MAAuC;CAExC;;;;;AAhWD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}
+{"version":3,"file":"Pict-Provider-DynamicSolver.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicSolver.js"],"names":[],"mappings":";AA+BA;;GAEG;AACH;IAEC;;;;;;OAMG;IACH,oBAJW,MAAM,YACN,MAAM,gBACN,MAAM,EAqChB;IA9BA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,uHAAuH;IACvH,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,qCAAqC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;QAAC,gBAAgB,EAAE,GAAG,CAAA;KAAE,CACzG;IA6BX,uCAaC;IAED;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED;;;;;;;OAOG;IACH,wDAFW,MAAM,QAyDhB;IAED;;;;;OAKG;IACH,gEAFW,MAAM,QA+BhB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAiFxB;IADA;;;;;MAAuC;CAExC;;;;;AA/WD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

package/types/source/providers/inputs/Pict-Provider-Input-Chart.d.ts

@@ -0,0 +1,115 @@
+export = CustomInputHandler;
+/**
+ * CustomInputHandler class.
+ *
+ * @class
+ * @extends libPictSectionInputExtension
+ * @memberof providers.inputs
+ */
+declare class CustomInputHandler extends libPictSectionInputExtension {
+    constructor(pFable: any, pOptions: any, pServiceHash: any);
+    /** @type {import('pict')} */
+    pict: import("pict");
+    /** @type {import('pict')} */
+    fable: import("pict");
+    defaultCoreParsingConfiguration: any;
+    defaultLabelParsingConfiguration: any;
+    defaultDataParsingConfiguration: any;
+    currentChartObjects: {};
+    /**
+     *
+     * @param {Object} pInput - The PictForm input object
+     * @param {*} pChartConfiguration - The current configuration object for the form
+     * @param {*} pParsingConfiguration - The parsing configuration to apply
+     * @param {*} pInputParsingConfigurationScope - The input-specific parsing configuration string address for additional configuration
+     * @returns
+     */
+    applyInputParsingConfiguration(pInput: any, pChartConfiguration: any, pParsingConfiguration: any, pInputParsingConfigurationScope: any): boolean;
+    getInputChartConfiguration(pView: any, pInput: any, pValue: any): any;
+    initializeChartVisualization(pView: any, pGroup: any, pRow: any, pInput: any, pValue: any, pHTMLSelector: any): boolean;
+    /**
+     * Initializes a tabular input element.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pGroup - The group object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The input value.
+     * @param {string} pHTMLSelector - The HTML selector.
+     * @param {number} pRowIndex - The index of the row.
+     * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+     * @returns {any} - The result of the initialization.
+     */
+    onInputInitializeTabular(pView: any, pGroup: any, pInput: any, pValue: any, pHTMLSelector: string, pRowIndex: number, pTransactionGUID: string): any;
+    /**
+     * Handles the change event for the data in the select input.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The new value of the input.
+     * @param {string} pHTMLSelector - The HTML selector of the input.
+     * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+     * @returns {any} - The result of the super.onDataChange method.
+     */
+    onDataChange(pView: any, pInput: any, pValue: any, pHTMLSelector: string, pTransactionGUID: string): any;
+    /**
+     * Handles the change event for tabular data.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The new value.
+     * @param {string} pHTMLSelector - The HTML selector.
+     * @param {number} pRowIndex - The index of the row.
+     * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+     * @returns {any} - The result of the super method.
+     */
+    onDataChangeTabular(pView: any, pInput: any, pValue: any, pHTMLSelector: string, pRowIndex: number, pTransactionGUID: string): any;
+    /**
+     * Marshals data to the form for the given input.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pGroup - The group object.
+     * @param {Object} pRow - The row object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The value to be marshaled.
+     * @param {string} pHTMLSelector - The HTML selector.
+     * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+     * @returns {boolean} - Returns true if the value is successfully marshaled to the form, otherwise false.
+     */
+    onDataMarshalToForm(pView: any, pGroup: any, pRow: any, pInput: any, pValue: any, pHTMLSelector: string, pTransactionGUID: string): boolean;
+    /**
+     * Marshals data to a form in tabular format.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pGroup - The group object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The value parameter.
+     * @param {string} pHTMLSelector - The HTML selector parameter.
+     * @param {number} pRowIndex - The row index parameter.
+     * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+     * @returns {any} - The result of the data marshaling.
+     */
+    onDataMarshalToFormTabular(pView: any, pGroup: any, pInput: any, pValue: any, pHTMLSelector: string, pRowIndex: number, pTransactionGUID: string): any;
+    /**
+     * Handles the data request event for a select input in the PictProviderInputSelect class.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The value object.
+     * @param {string} pHTMLSelector - The HTML selector object.
+     * @returns {any} - The result of the onDataRequest method.
+     */
+    onDataRequest(pView: any, pInput: any, pValue: any, pHTMLSelector: string): any;
+    /**
+     * Handles the data request event for a tabular input.
+     *
+     * @param {Object} pView - The view object.
+     * @param {Object} pInput - The input object.
+     * @param {any} pValue - The value object.
+     * @param {string} pHTMLSelector - The HTML selector.
+     * @param {number} pRowIndex - The row index.
+     * @returns {any} - The result of the data request.
+     */
+    onDataRequestTabular(pView: any, pInput: any, pValue: any, pHTMLSelector: string, pRowIndex: number): any;
+}
+import libPictSectionInputExtension = require("../Pict-Provider-InputExtension.js");
+//# sourceMappingURL=Pict-Provider-Input-Chart.d.ts.map

package/types/source/providers/inputs/Pict-Provider-Input-Chart.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Pict-Provider-Input-Chart.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-Chart.js"],"names":[],"mappings":";AAEA;;;;;;GAMG;AACH;IAEC,2DAgHC;IA5GA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6BAA6B;IAC7B,OADW,OAAO,MAAM,CAAC,CACf;IAoCV,qCAA+G;IAiC/G,sCAAiH;IAiCjH,qCAA+G;IAE/G,wBAA6B;IAG9B;;;;;;;OAOG;IACH,iEALW,GAAC,yBACD,GAAC,mCACD,GAAC,WA0ZX;IAED,sEAwBC;IAED,wHAyBC;IAoBD;;;;;;;;;;;OAWG;IACH,uEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;;OAUG;IACH,qDANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;;;OAWG;IACH,6EALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,OAAO,CAKnB;IAED;;;;;;;;;;;OAWG;IACH,yEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;OAQG;IACH,+CAJW,GAAG,iBACH,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;OASG;IACH,sDALW,GAAG,iBACH,MAAM,aACN,MAAM,GACJ,GAAG,CAKf;CACD"}

package/types/source/providers/layouts/Pict-Layout-Record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Layout-Record.d.ts","sourceRoot":"","sources":["../../../../source/providers/layouts/Pict-Layout-Record.js"],"names":[],"mappings":";AAEA;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6BAA6B;IAC7B,OADW,OAAO,MAAM,CAAC,CACf;CAgDX"}
+{"version":3,"file":"Pict-Layout-Record.d.ts","sourceRoot":"","sources":["../../../../source/providers/layouts/Pict-Layout-Record.js"],"names":[],"mappings":";AAEA;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6BAA6B;IAC7B,OADW,OAAO,MAAM,CAAC,CACf;CAiGX"}

package/types/source/views/support/Pict-View-PSF-SupportBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-PSF-SupportBase.d.ts","sourceRoot":"","sources":["../../../../source/views/support/Pict-View-PSF-SupportBase.js"],"names":[],"mappings":";AAqBA;IAEC,2DAYC;IALA,yBAA2B;IAC3B,wBAAkC;IAMnC;;;;;;;;;;;;;;MAgMC;IAED,8CAKC;IAGD,8CA6BC;IAED,uMA8GC;IAED,8BAiIC;CACD"}
+{"version":3,"file":"Pict-View-PSF-SupportBase.d.ts","sourceRoot":"","sources":["../../../../source/views/support/Pict-View-PSF-SupportBase.js"],"names":[],"mappings":";AAqBA;IAEC,2DAYC;IALA,yBAA2B;IAC3B,wBAAkC;IAMnC;;;;;;;;;;;;;;MAsMC;IAED,8CAKC;IAGD,8CA6BC;IAED,uMA8GC;IAED,8BAiIC;CACD"}