pict-section-form 1.0.154 → 1.0.156

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.154",
+    "version": "1.0.156",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {

package/source/providers/Pict-Provider-DynamicSolver.js

@@ -370,7 +370,14 @@ class PictDynamicSolver extends libPictProvider
 
 		// Now sort the ordinal container keys
 		let tmpOrdinalKeys = Object.keys(tmpOrdinalsToSolve);
-		tmpOrdinalKeys.sort();
+		tmpOrdinalKeys.sort((a, b) =>
+		{
+			if (isNaN(Number(a)) || isNaN(Number(b)))
+			{
+				return a.localeCompare(b);
+			}
+			return Number(a) - Number(b);
+		});
 
 		// Now enumerate the keys and solve each layer of the solution set
 		for (let i = 0; i < tmpOrdinalKeys.length; i++)

package/source/views/Pict-View-Form-Metacontroller.js

@@ -290,6 +290,8 @@ class PictFormMetacontroller extends libPictViewClass
 	 */
 	createDistinctManifest(pManifest, pUUID)
 	{
+		const tmpDescriptorHashes = Object.keys(pManifest?.Descriptors || {});
+		const tmpDescriptorHashSet = new Set(tmpDescriptorHashes);
 		const tmpUUID = pUUID != null ? pUUID : this.pict.getUUID().replace(/-/g, '');
 		const tmpManifest = JSON.parse(JSON.stringify(pManifest));
 		for (const tmpSection of tmpManifest.Sections || [])
@@ -305,8 +307,37 @@ class PictFormMetacontroller extends libPictViewClass
 		const tmpNewDescriptors = {};
 		for (const [ tmpKey, tmpDescriptor ] of Object.entries(tmpManifest.Descriptors || {}))
 		{
-			//FIXME: do we want to allow prefixing the data address? (ex. nesting it under a parent object) - caller can still do this themselves.
-			tmpDescriptor.DataAddress = `${tmpDescriptor.DataAddress || tmpKey}_${tmpUUID}`;
+			if (!tmpDescriptor.DataAddress)
+			{
+				tmpDescriptor.DataAddress = tmpKey;
+			}
+			tmpDescriptor.OriginalDataAddress = tmpDescriptor.DataAddress;
+			// we only make distinct top level properties to keep things as tidy as possible so do a split to isoloate that
+			//TODO: if we have .. dereferences (for example) in the data address, this will not work properly
+
+			let tmpArrayIndex = tmpDescriptor.DataAddress.indexOf('[');
+			let tmpDotIndex = tmpDescriptor.DataAddress.indexOf('.');
+			if (tmpDotIndex >= 0 && (tmpDotIndex < tmpArrayIndex || tmpArrayIndex < 0))
+			{
+				const tmpPrefixPart = tmpDescriptor.DataAddress.substring(0, tmpDotIndex);
+				const tmpPostfixPart = tmpDescriptor.DataAddress.substring(tmpDotIndex);
+				tmpDescriptor.DataAddress = `${tmpPrefixPart}_${tmpUUID}${tmpPostfixPart}`;
+			}
+			else if (tmpArrayIndex >= 0 && (tmpArrayIndex < tmpDotIndex || tmpDotIndex < 0))
+			{
+				const tmpArrayPart = tmpDescriptor.DataAddress.substring(0, tmpArrayIndex);
+				const tmpPostfixPart = tmpDescriptor.DataAddress.substring(tmpArrayIndex);
+				tmpDescriptor.DataAddress = `${tmpArrayPart}_${tmpUUID}${tmpPostfixPart}`;
+			}
+			else
+			{
+				//FIXME: do we want to allow prefixing the data address? (ex. nesting it under a parent object) - caller can still do this themselves.
+				tmpDescriptor.DataAddress = `${tmpDescriptor.OriginalDataAddress}_${tmpUUID}`;
+			}
+			if (tmpDescriptor.Address != null)
+			{
+				tmpDescriptor.Address = tmpDescriptor.DataAddress;
+			}
 			if (tmpDescriptor.Hash)
 			{
 				tmpDescriptor.OriginalHash = tmpDescriptor.Hash;
@@ -323,9 +354,127 @@ class PictFormMetacontroller extends libPictViewClass
 					tmpDescriptor.PictForm.Group = `${tmpDescriptor.PictForm.Group}_${tmpUUID}`;
 				}
 			}
-			tmpNewDescriptors[`${tmpKey}_${tmpUUID}`] = tmpDescriptor;
+			tmpNewDescriptors[tmpDescriptor.DataAddress] = tmpDescriptor;
 		}
 		tmpManifest.Descriptors = tmpNewDescriptors;
+		const tmpAddressTranslation = {};
+		const tmpHashTranslation = {};
+		for (const tmpDescriptor of Object.values(tmpManifest?.Descriptors || {}))
+		{
+			if (tmpDescriptor.OriginalDataAddress)
+			{
+				tmpAddressTranslation[tmpDescriptor.OriginalDataAddress] = tmpDescriptor.DataAddress;
+			}
+			if (tmpDescriptor.OriginalHash)
+			{
+				tmpHashTranslation[tmpDescriptor.OriginalHash] = tmpDescriptor.Hash;
+			}
+		}
+		for (const [ tmpOriginalAddress, tmpUpdatedAddress ] of Object.entries(tmpAddressTranslation))
+		{
+			for (const tmpIterAddress of Object.keys(tmpAddressTranslation))
+			{
+				if (tmpIterAddress === tmpOriginalAddress)
+				{
+					continue;
+				}
+				const tmpTranslatedAddress = tmpAddressTranslation[tmpIterAddress].replace(new RegExp(`\\b${tmpOriginalAddress}\\b`, 'g'), tmpUpdatedAddress);
+				if (tmpTranslatedAddress !== tmpAddressTranslation[tmpIterAddress])
+				{
+					//this.pict.log.info(`DocumentDynamicSectionManager._addTestSections: Updated address translation for "${tmpIterAddress}" from "${tmpAddressTranslation[tmpIterAddress]}" to "${tmpTranslatedAddress}".`);
+					tmpAddressTranslation[tmpIterAddress] = tmpTranslatedAddress;
+					const [ tmpCurrentKey, tmpOriginalDescriptor ] = Object.entries(tmpManifest.Descriptors).find(([ pKey, pDescriptor ]) => pDescriptor.OriginalDataAddress === tmpIterAddress);
+					tmpManifest.Descriptors[tmpCurrentKey].DataAddress = tmpTranslatedAddress;
+					if (tmpManifest.Descriptors[tmpCurrentKey].Address != null)
+					{
+						tmpManifest.Descriptors[tmpCurrentKey].Address = tmpManifest.Descriptors[tmpCurrentKey].DataAddress;
+					}
+					tmpManifest.Descriptors[tmpTranslatedAddress] = tmpManifest.Descriptors[tmpCurrentKey];
+					delete tmpManifest.Descriptors[tmpCurrentKey];
+				}
+			}
+		}
+		//TODO: should we merge these two together for solvers?
+		const tmpAddressMappings = Object.entries(tmpAddressTranslation).map(([ pOldAddress, pNewAddress ]) => ({ From: pOldAddress, To: pNewAddress }));
+		tmpAddressMappings.sort((a, b) => b.From.length - a.From.length);
+		const tmpHashMappings = Object.entries(tmpHashTranslation).map(([ pOldHash, pNewHash ]) => ({ From: pOldHash, To: pNewHash }));
+		tmpHashMappings.sort((a, b) => b.From.length - a.From.length);
+		const escapeRegExp = (string) =>
+		{
+			return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+		}
+		for (const tmpSection of tmpManifest.Sections || [])
+		{
+			if (Array.isArray(tmpSection.Solvers) && tmpSection.Solvers.length > 0)
+			{
+				for (let i = 0; i < tmpSection.Solvers.length; i++)
+				{
+					const tmpSolver = tmpSection.Solvers[i];
+					const tmpSolverExpression = typeof tmpSolver === 'string' ? tmpSolver : tmpSolver.Expression;
+					if (!tmpSolverExpression)
+					{
+						continue;
+					}
+					let tmpUpdatedSolver = tmpSolverExpression;
+					for (const tmpMapping of tmpAddressMappings)
+					{
+						tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
+					}
+					for (const tmpMapping of tmpHashMappings)
+					{
+						tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
+					}
+					if (tmpUpdatedSolver !== tmpSolver)
+					{
+						//this.pict.log.info(`DocumentDynamicSectionManager._addTestSections: Updated section solver reference ${i} from "${tmpSolverExpression}" to "${tmpUpdatedSolver}".`);
+						if (typeof tmpSolver === 'string')
+						{
+							tmpSection.Solvers[i] = tmpUpdatedSolver;
+						}
+						else
+						{
+							tmpSection.Solvers[i].Expression = tmpUpdatedSolver;
+						}
+					}
+				}
+			}
+			for (const tmpGroup of tmpSection.Groups || [])
+			{
+				if (Array.isArray(tmpGroup.RecordSetSolvers) && tmpGroup.RecordSetSolvers.length > 0)
+				{
+					for (let i = 0; i < tmpGroup.RecordSetSolvers.length; i++)
+					{
+						const tmpSolver = tmpGroup.RecordSetSolvers[i];
+						const tmpSolverExpression = typeof tmpSolver === 'string' ? tmpSolver : tmpSolver.Expression;
+						if (!tmpSolverExpression)
+						{
+							continue;
+						}
+						let tmpUpdatedSolver = tmpSolverExpression;
+						for (const tmpMapping of tmpAddressMappings)
+						{
+							tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
+						}
+						for (const tmpMapping of tmpHashMappings)
+						{
+							tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
+						}
+						if (tmpUpdatedSolver !== tmpSolver)
+						{
+							//this.pict.log.info(`DocumentDynamicSectionManager._addTestSections: Updated group solver reference ${i} from "${tmpSolver}" to "${tmpUpdatedSolver}".`);
+							if (typeof tmpSolver === 'string')
+							{
+								tmpGroup.RecordSetSolvers[i] = tmpUpdatedSolver;
+							}
+							else
+							{
+								tmpGroup.RecordSetSolvers[i].Expression = tmpUpdatedSolver;
+							}
+						}
+					}
+				}
+			}
+		}
 		return tmpManifest;
 	}
 

package/test/PictSectionForm-Basic_tests.js

@@ -50,6 +50,46 @@ class DoNothingView extends libPictView
 	}
 }
 
+class OrderedSolverApplication extends DoNothingApplication
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+
+		this.pict.AppData.A = '5';
+		this.pict.AppData.B = '3';
+	}
+
+	onAfterSolve()
+	{
+		super.onAfterSolve();
+		this.pict.log.info('OrderedSolverApplication onAfterSolve called.');
+		this._testDone?.();
+	}
+
+	onAfterInitialize()
+	{
+	}
+}
+
+OrderedSolverApplication.default_configuration.pict_configuration.DefaultFormManifest =
+{
+	Scope: 'OrderedSolverApplicationForm',
+	Descriptors: {},
+	Sections:
+	[
+		{
+			Name: 'Ordered Solver Section',
+			Hash: 'OrderedSolverSection',
+			Solvers:
+			[
+				{ Ordinal: 5, Expression: 'C = A + B' },
+				{ Ordinal: 40, Expression: 'D = C - B' },
+			],
+		},
+	],
+};
+
 suite
 (
 	'PictSectionForm Basic',
@@ -148,6 +188,546 @@ suite
 									});
 							}
 						);
+					test(
+							'Distinct Array Test',
+							(fDone) =>
+							{
+								//NOTE: code is a clone of Pict.safeLoadPictApplication
+								let _Pict;
+								const tmpApplicationClass = OrderedSolverApplication;
+								if (tmpApplicationClass && ('default_configuration' in tmpApplicationClass) && ('pict_configuration' in tmpApplicationClass.default_configuration))
+								{
+									_Pict = new libPict(tmpApplicationClass.default_configuration.pict_configuration);
+								}
+								else
+								{
+									_Pict = new libPict();
+								}
+
+								//_Pict.LogNoisiness = 0;
+
+								let tmpApplicationHash = 'DefaultApplication';
+								let tmpDefaultConfiguration = {};
+
+								if ('default_configuration' in tmpApplicationClass)
+								{
+									tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+
+									if ('Hash' in tmpApplicationClass.default_configuration)
+									{
+										tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+										tmpApplicationHash = tmpApplicationClass.default_configuration.Hash;
+									}
+								}
+								_Pict.log.info(`Loading the pict application [${tmpApplicationHash}] and associated views.`);
+
+								_Pict.addApplication(tmpApplicationHash, tmpDefaultConfiguration, tmpApplicationClass);
+
+								// Add the pict form service
+								_Pict.addServiceType('PictSectionForm', libPictSectionForm);
+
+								// Add the pict form metacontroller service, which provides programmaatic view construction from manifests and render/marshal methods.
+								_Pict.addView('PictFormMetacontroller', {}, libPictSectionForm.PictFormMetacontroller);
+
+								const tmpManifest =
+								{
+									Scope: 'OrderedSolverApplicationForm',
+									Descriptors:
+									{
+										DataTableAddress:
+										{
+											Hash: 'DataTable',
+											Name: 'Data Table',
+											DataAddress: 'DataTableAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										'DataTableAddress[].ValueAddress':
+										{
+											Hash: 'ValueArray',
+											Name: 'Data Value',
+											DataAddress: 'DataTableAddress[].ValueAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress:
+										{
+											Hash: 'AggregateValue',
+											Name: 'Aggregate Value',
+											DataAddress: 'AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress2:
+										{
+											Hash: 'AggregateValue2',
+											Name: 'Aggregate Value 2',
+											DataAddress: 'AggregateValueAddress2',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+									},
+									Sections:
+									[
+										{
+											Name: 'Ordered Solver Section',
+											Hash: 'OrderedSolverSection',
+											Solvers:
+											[
+												{ Ordinal: 5, Expression: 'AggregateValue = SUM(ValueArray)' },
+												{ Ordinal: 40, Expression: 'AggregateValue2 = SUM(DataTableAddress[].ValueAddress)' },
+											],
+										},
+									],
+								};
+
+								let tmpHashedAggregateValue = null;
+								let tmpHashedAggregateValue2 = null;
+								_Pict.PictApplication.initializeAsync(
+									function (pError)
+									{
+										if (pError)
+										{
+											_Pict.log.info('Error initializing the pict application: '+pError)
+										}
+
+										try
+										{
+											_Pict.log.info('Loading the Application and associated views.');
+											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest);
+											_Pict.log.info('Distinct Manifest:', tmpDistinctManifest);
+											tmpHashedAggregateValue = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue')[0];
+											tmpHashedAggregateValue2 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue2')[0];
+											const tmpInjectedSecionViews = _Pict.views.PictFormMetacontroller.injectManifest(tmpDistinctManifest);
+											_Pict.log.info('Injected Section Views:', tmpInjectedSecionViews.length);
+											_Pict.views.PictFormMetacontroller.updateMetatemplateInDOM();
+											setTimeout(() =>
+											{
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.render();
+												}
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.marshalToView();
+												}
+												//TODO: do we need to trigger a solve here?
+											}, 0);
+											_Pict.PictApplication.testDone = () =>
+											{
+												try
+												{
+													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2 });
+													Expect(_Pict.AppData[tmpHashedAggregateValue]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via hash)');
+													Expect(_Pict.AppData[tmpHashedAggregateValue2]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via address)');
+												}
+												catch (pError)
+												{
+													return fDone(pError);
+												}
+												fDone();
+											};
+											const [ tmpValueArrayKey, tmpValueArrayDescriptor ] = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pDescriptor]) => pDescriptor.OriginalHash == 'ValueArray');
+											const tmpAddress = tmpValueArrayDescriptor.DataAddress;
+											_Pict.log.info('Setting up Distinct Array Test with address:', { tmpValueArrayKey, tmpValueArrayDescriptor, tmpAddress });
+											const tmpArrayAddress = tmpAddress.substring(0, tmpAddress.indexOf('[]'));
+											const tmpPropertyAddress = tmpAddress.substring(tmpAddress.indexOf('[]') + 3);
+											_Pict.manifest.setValueByHash(_Pict.AppData, tmpArrayAddress,
+												[
+													{ [tmpPropertyAddress]: '1' },
+													{ [tmpPropertyAddress]: '2' },
+													{ [tmpPropertyAddress]: '3' },
+													{ [tmpPropertyAddress]: '4' },
+													{ [tmpPropertyAddress]: '5' },
+												]);
+											_Pict.PictApplication.solve();
+										}
+										catch (pError)
+										{
+											_Pict.log.error('Error during Distinct Array Test:', pError);
+											return fDone(pError);
+										}
+									});
+							}
+						);
+					test(
+							'Distinct Array Test 2',
+							(fDone) =>
+							{
+								//NOTE: code is a clone of Pict.safeLoadPictApplication
+								let _Pict;
+								const tmpApplicationClass = OrderedSolverApplication;
+								if (tmpApplicationClass && ('default_configuration' in tmpApplicationClass) && ('pict_configuration' in tmpApplicationClass.default_configuration))
+								{
+									_Pict = new libPict(tmpApplicationClass.default_configuration.pict_configuration);
+								}
+								else
+								{
+									_Pict = new libPict();
+								}
+
+								//_Pict.LogNoisiness = 0;
+
+								let tmpApplicationHash = 'DefaultApplication';
+								let tmpDefaultConfiguration = {};
+
+								if ('default_configuration' in tmpApplicationClass)
+								{
+									tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+
+									if ('Hash' in tmpApplicationClass.default_configuration)
+									{
+										tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+										tmpApplicationHash = tmpApplicationClass.default_configuration.Hash;
+									}
+								}
+								_Pict.log.info(`Loading the pict application [${tmpApplicationHash}] and associated views.`);
+
+								_Pict.addApplication(tmpApplicationHash, tmpDefaultConfiguration, tmpApplicationClass);
+
+								// Add the pict form service
+								_Pict.addServiceType('PictSectionForm', libPictSectionForm);
+
+								// Add the pict form metacontroller service, which provides programmaatic view construction from manifests and render/marshal methods.
+								_Pict.addView('PictFormMetacontroller', {}, libPictSectionForm.PictFormMetacontroller);
+
+								const tmpManifest =
+								{
+									Scope: 'OrderedSolverApplicationForm',
+									Descriptors:
+									{
+										'DataTableAddress[].ValueAddress':
+										{
+											Hash: 'ValueArray',
+											Name: 'Data Value',
+											DataAddress: 'DataTableAddress[].ValueAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress:
+										{
+											Hash: 'AggregateValue',
+											Name: 'Aggregate Value',
+											DataAddress: 'AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress2:
+										{
+											Hash: 'AggregateValue2',
+											Name: 'Aggregate Value 2',
+											DataAddress: 'AggregateValueAddress2',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+									},
+									Sections:
+									[
+										{
+											Name: 'Ordered Solver Section',
+											Hash: 'OrderedSolverSection',
+											Solvers:
+											[
+												{ Ordinal: 5, Expression: 'AggregateValue = SUM(ValueArray)' },
+												{ Ordinal: 40, Expression: 'AggregateValue2 = SUM(DataTableAddress[].ValueAddress)' },
+											],
+										},
+									],
+								};
+
+								let tmpHashedAggregateValue = null;
+								let tmpHashedAggregateValue2 = null;
+								_Pict.PictApplication.initializeAsync(
+									function (pError)
+									{
+										if (pError)
+										{
+											_Pict.log.info('Error initializing the pict application: '+pError)
+										}
+
+										try
+										{
+											_Pict.log.info('Loading the Application and associated views.');
+											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest);
+											_Pict.log.info('Distinct Manifest:', tmpDistinctManifest);
+											tmpHashedAggregateValue = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue')[0];
+											tmpHashedAggregateValue2 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue2')[0];
+											const tmpInjectedSecionViews = _Pict.views.PictFormMetacontroller.injectManifest(tmpDistinctManifest);
+											_Pict.log.info('Injected Section Views:', tmpInjectedSecionViews.length);
+											_Pict.views.PictFormMetacontroller.updateMetatemplateInDOM();
+											setTimeout(() =>
+											{
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.render();
+												}
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.marshalToView();
+												}
+												//TODO: do we need to trigger a solve here?
+											}, 0);
+											_Pict.PictApplication.testDone = () =>
+											{
+												try
+												{
+													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2 });
+													Expect(_Pict.AppData[tmpHashedAggregateValue]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via hash)');
+													Expect(_Pict.AppData[tmpHashedAggregateValue2]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via address)');
+												}
+												catch (pError)
+												{
+													return fDone(pError);
+												}
+												fDone();
+											};
+											const [ tmpValueArrayKey, tmpValueArrayDescriptor ] = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pDescriptor]) => pDescriptor.OriginalHash == 'ValueArray');
+											const tmpAddress = tmpValueArrayDescriptor.DataAddress;
+											_Pict.log.info('Setting up Distinct Array Test with address:', { tmpValueArrayKey, tmpValueArrayDescriptor, tmpAddress });
+											const tmpArrayAddress = tmpAddress.substring(0, tmpAddress.indexOf('[]'));
+											const tmpPropertyAddress = tmpAddress.substring(tmpAddress.indexOf('[]') + 3);
+											_Pict.manifest.setValueByHash(_Pict.AppData, tmpArrayAddress,
+												[
+													{ [tmpPropertyAddress]: '1' },
+													{ [tmpPropertyAddress]: '2' },
+													{ [tmpPropertyAddress]: '3' },
+													{ [tmpPropertyAddress]: '4' },
+													{ [tmpPropertyAddress]: '5' },
+												]);
+											_Pict.PictApplication.solve();
+										}
+										catch (pError)
+										{
+											_Pict.log.error('Error during Distinct Array Test:', pError);
+											return fDone(pError);
+										}
+									});
+							}
+						);
+					test(
+							'Distinct Array Test 3',
+							(fDone) =>
+							{
+								//NOTE: code is a clone of Pict.safeLoadPictApplication
+								let _Pict;
+								const tmpApplicationClass = OrderedSolverApplication;
+								if (tmpApplicationClass && ('default_configuration' in tmpApplicationClass) && ('pict_configuration' in tmpApplicationClass.default_configuration))
+								{
+									_Pict = new libPict(tmpApplicationClass.default_configuration.pict_configuration);
+								}
+								else
+								{
+									_Pict = new libPict();
+								}
+
+								//_Pict.LogNoisiness = 0;
+
+								let tmpApplicationHash = 'DefaultApplication';
+								let tmpDefaultConfiguration = {};
+
+								if ('default_configuration' in tmpApplicationClass)
+								{
+									tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+
+									if ('Hash' in tmpApplicationClass.default_configuration)
+									{
+										tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+										tmpApplicationHash = tmpApplicationClass.default_configuration.Hash;
+									}
+								}
+								_Pict.log.info(`Loading the pict application [${tmpApplicationHash}] and associated views.`);
+
+								_Pict.addApplication(tmpApplicationHash, tmpDefaultConfiguration, tmpApplicationClass);
+
+								// Add the pict form service
+								_Pict.addServiceType('PictSectionForm', libPictSectionForm);
+
+								// Add the pict form metacontroller service, which provides programmaatic view construction from manifests and render/marshal methods.
+								_Pict.addView('PictFormMetacontroller', {}, libPictSectionForm.PictFormMetacontroller);
+
+								const tmpManifest =
+								{
+									Scope: 'OrderedSolverApplicationForm',
+									Descriptors:
+									{
+										'LevelOfIndirection.DataTableAddress[].ValueAddress':
+										{
+											Hash: 'ValueArray',
+											Name: 'Data Value',
+											DataAddress: 'LevelOfIndirection.DataTableAddress[].ValueAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress:
+										{
+											Hash: 'AggregateValue',
+											Name: 'Aggregate Value',
+											DataAddress: 'AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress2:
+										{
+											Hash: 'AggregateValue2',
+											Name: 'Aggregate Value 2',
+											DataAddress: 'AggregateValueAddress2',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+									},
+									Sections:
+									[
+										{
+											Name: 'Ordered Solver Section',
+											Hash: 'OrderedSolverSection',
+											Solvers:
+											[
+												{ Ordinal: 5, Expression: 'AggregateValue = SUM(ValueArray)' },
+												{ Ordinal: 40, Expression: 'AggregateValue2 = SUM(LevelOfIndirection.DataTableAddress[].ValueAddress)' },
+											],
+										},
+									],
+								};
+
+								let tmpHashedAggregateValue = null;
+								let tmpHashedAggregateValue2 = null;
+								_Pict.PictApplication.initializeAsync(
+									function (pError)
+									{
+										if (pError)
+										{
+											_Pict.log.info('Error initializing the pict application: '+pError)
+										}
+
+										try
+										{
+											_Pict.log.info('Loading the Application and associated views.');
+											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest);
+											_Pict.log.info('Distinct Manifest:', tmpDistinctManifest);
+											tmpHashedAggregateValue = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue')[0];
+											tmpHashedAggregateValue2 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue2')[0];
+											const tmpInjectedSecionViews = _Pict.views.PictFormMetacontroller.injectManifest(tmpDistinctManifest);
+											_Pict.log.info('Injected Section Views:', tmpInjectedSecionViews.length);
+											_Pict.views.PictFormMetacontroller.updateMetatemplateInDOM();
+											setTimeout(() =>
+											{
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.render();
+												}
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.marshalToView();
+												}
+												//TODO: do we need to trigger a solve here?
+											}, 0);
+											_Pict.PictApplication.testDone = () =>
+											{
+												try
+												{
+													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2 });
+													Expect(_Pict.AppData[tmpHashedAggregateValue]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via hash)');
+													Expect(_Pict.AppData[tmpHashedAggregateValue2]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via address)');
+												}
+												catch (pError)
+												{
+													return fDone(pError);
+												}
+												fDone();
+											};
+											const [ tmpValueArrayKey, tmpValueArrayDescriptor ] = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pDescriptor]) => pDescriptor.OriginalHash == 'ValueArray');
+											const tmpAddress = tmpValueArrayDescriptor.DataAddress;
+											_Pict.log.info('Setting up Distinct Array Test with address:', { tmpValueArrayKey, tmpValueArrayDescriptor, tmpAddress });
+											const tmpArrayAddress = tmpAddress.substring(0, tmpAddress.indexOf('[]'));
+											const tmpPropertyAddress = tmpAddress.substring(tmpAddress.indexOf('[]') + 3);
+											_Pict.manifest.setValueByHash(_Pict.AppData, tmpArrayAddress,
+												[
+													{ [tmpPropertyAddress]: '1' },
+													{ [tmpPropertyAddress]: '2' },
+													{ [tmpPropertyAddress]: '3' },
+													{ [tmpPropertyAddress]: '4' },
+													{ [tmpPropertyAddress]: '5' },
+												]);
+											_Pict.PictApplication.solve();
+										}
+										catch (pError)
+										{
+											_Pict.log.error('Error during Distinct Array Test:', pError);
+											return fDone(pError);
+										}
+									});
+							}
+						);
+					test(
+							'Solve Ordinals',
+							(fDone) =>
+							{
+								//NOTE: code is a clone of Pict.safeLoadPictApplication
+								let _Pict;
+								const tmpApplicationClass = OrderedSolverApplication;
+								if (tmpApplicationClass && ('default_configuration' in tmpApplicationClass) && ('pict_configuration' in tmpApplicationClass.default_configuration))
+								{
+									_Pict = new libPict(tmpApplicationClass.default_configuration.pict_configuration);
+								}
+								else
+								{
+									_Pict = new libPict();
+								}
+
+								//_Pict.LogNoisiness = 0;
+
+								let tmpApplicationHash = 'DefaultApplication';
+								let tmpDefaultConfiguration = {};
+
+								if ('default_configuration' in tmpApplicationClass)
+								{
+									tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+
+									if ('Hash' in tmpApplicationClass.default_configuration)
+									{
+										tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+										tmpApplicationHash = tmpApplicationClass.default_configuration.Hash;
+									}
+								}
+								_Pict.log.info(`Loading the pict application [${tmpApplicationHash}] and associated views.`);
+
+								_Pict.addApplication(tmpApplicationHash, tmpDefaultConfiguration, tmpApplicationClass);
+
+								_Pict.PictApplication.testDone = () =>
+								{
+									try
+									{
+										Expect(_Pict.AppData.C).to.equal('8', 'C should equal 8 (A + B)');
+										Expect(_Pict.AppData.D).to.equal('5', 'D should equal 5 (C - B)');
+									}
+									catch (pError)
+									{
+										return fDone(pError);
+									}
+									fDone();
+								};
+
+								_Pict.PictApplication.initializeAsync(
+									function (pError)
+									{
+										if (pError)
+										{
+											_Pict.log.info('Error initializing the pict application: '+pError)
+										}
+										_Pict.log.info('Loading the Application and associated views.');
+									});
+							}
+						);
 				}
 			);
 	}

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":";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,uCAoBC;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,QAgChB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAiFxB;IADA;;;;;MAAuC;CAExC;;;;;AAvXD,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,uCAoBC;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,QAgChB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAwFxB;IADA;;;;;MAAuC;CAExC;;;;;AA9XD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

package/types/source/views/Pict-View-Form-Metacontroller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AAaA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAyBC;IAjBA,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAElC,gCAAkC;IAClC,8BAAiC;IAEjC;;;;;;MAOE;IAQH,wCAGC;IARD,kCAGC;IAOD;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA8BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,kCAGC;IAED,gDAGC;IAED,+CAGC;IAED;;;;OAIG;IACH,2DAJW,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAW9B;IAED;;;;;;OAMG;IACH,mCANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,UACN,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAwBtD;IAED;;;;;OAKG;IACH,0BALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAgCtD;IAED;;;;;;;;;OASG;IACH,kCALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACnB,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAyC9B;IAED;;;;OAIG;IACH,uCAJW,KAAK,CAAC,MAAM,CAAC,sBACb,MAAM,UACN,MAAM,QAuBhB;IAED;;;OAGG;IACH,6CAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,SAehB;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAoHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;;;OAOG;IACH,gEAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;;;OAOG;IACH,uEAJW,YAAY,GAEX,IAAI,CAsFf;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED,+CAeC;IAED;;;;;;;OAOG;IACH,kFAJW,MAAM,GAEJ,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAoLtC;IA5JC,gCAA0D;IAC1D,yBAAiD;IA6JnD;;;;OAIG;IACH,gCAHW,MAAM,qBACN,MAAM,QA0BhB;IAED;;;OAGG;IACH,yDAHW,MAAM,uBACN,MAAM,QAKhB;IAED;;;;;OAKG;IACH,yDALW,MAAM,uBACN,MAAM,GAEL,OAAO,CAoDlB;IAED;;;;OAIG;IACH,sCAJW,MAAM,GAEL,OAAO,CA0ClB;IAED;;;OAGG;IACH,wDAHW,MAAM,6BAuBhB;IAED,oCAgBC;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBAvqCjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}
+{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AAaA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAyBC;IAjBA,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAElC,gCAAkC;IAClC,8BAAiC;IAEjC;;;;;;MAOE;IAQH,wCAGC;IARD,kCAGC;IAOD;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA8BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,kCAGC;IAED,gDAGC;IAED,+CAGC;IAED;;;;OAIG;IACH,2DAJW,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAW9B;IAED;;;;;;OAMG;IACH,mCANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,UACN,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAwBtD;IAED;;;;;OAKG;IACH,0BALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAgCtD;IAED;;;;;;;;;OASG;IACH,kCALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACnB,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA8L9B;IAED;;;;OAIG;IACH,uCAJW,KAAK,CAAC,MAAM,CAAC,sBACb,MAAM,UACN,MAAM,QAuBhB;IAED;;;OAGG;IACH,6CAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,SAehB;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAoHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;;;OAOG;IACH,gEAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;;;OAOG;IACH,uEAJW,YAAY,GAEX,IAAI,CAsFf;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED,+CAeC;IAED;;;;;;;OAOG;IACH,kFAJW,MAAM,GAEJ,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAoLtC;IA5JC,gCAA0D;IAC1D,yBAAiD;IA6JnD;;;;OAIG;IACH,gCAHW,MAAM,qBACN,MAAM,QA0BhB;IAED;;;OAGG;IACH,yDAHW,MAAM,uBACN,MAAM,QAKhB;IAED;;;;;OAKG;IACH,yDALW,MAAM,uBACN,MAAM,GAEL,OAAO,CAoDlB;IAED;;;;OAIG;IACH,sCAJW,MAAM,GAEL,OAAO,CA0ClB;IAED;;;OAGG;IACH,wDAHW,MAAM,6BAuBhB;IAED,oCAgBC;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBA5zCjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}