pict-section-form 1.0.169 → 1.0.171

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

@@ -0,0 +1,255 @@
+const libPictSectionInputExtension = require('../Pict-Provider-InputExtension.js');
+
+/**
+ * Input provider for simple templated content display.
+ *
+ * @class
+ * @extends libPictSectionInputExtension
+ * @memberof providers.inputs
+ */
+class TemplatedInputProvider extends libPictSectionInputExtension
+{
+	/**
+	 * @param {import('fable')} pFable - The Fable instance.
+	 * @param {Record<string, any>} [pOptions] - The options for the provider.
+	 * @param {string} [pServiceHash] - The service hash for the provider.
+	 */
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+
+		/** @type {import('pict')} */
+		this.pict;
+		/** @type {import('pict')} */
+		this.fable;
+		/** @type {any} */
+		this.log;
+	}
+
+	/**
+	 * Generates the HTML ID for a content display input element.
+	 *
+	 * @param {string} pInputHTMLID - The HTML ID of the input element.
+	 * @returns {string} - The generated HTML ID for the content display input element.
+	 */
+	getContentDisplayHTMLID(pInputHTMLID)
+	{
+		return `#DISPLAY-FOR-${pInputHTMLID}`;
+	}
+
+	/**
+	 * Generates a tabular content display input ID based on the provided input HTML ID and row index.
+	 *
+	 * @param {string} pInputHTMLID - The input HTML ID.
+	 * @param {number} pRowIndex - The row index.
+	 * @returns {string} - The generated tabular content display input ID.
+	 */
+	getTabularContentDisplayInputID(pInputHTMLID, pRowIndex)
+	{
+		return `#DISPLAY-FOR-TABULAR-${pInputHTMLID}-${pRowIndex}`;
+	}
+
+	/**
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The input value.
+	 * @param {number} [pRowIndex] - (optional) The row index for tabular data.
+	 *
+	 * @return {void}
+	 */
+	handleContentUpdate(pView, pInput, pValue, pRowIndex)
+	{
+		let tmpContent = '';
+		if (pValue && (typeof(pValue) === 'string'))
+		{
+			tmpContent = pValue;
+		}
+		let tmpIsLocked = false;
+		//TODO: support more templates
+		//TODO: support "locked" content?
+		if (!tmpIsLocked && pInput.PictForm && pInput.PictForm.Template && (typeof(pInput.PictForm.Template) === 'string'))
+		{
+			tmpContent = this.pict.parseTemplate(pInput.PictForm.Template, Object.assign({}, this.pict, { Data: pView.getMarshalDestinationObject() }), null, [this], this);
+		}
+		if (!tmpContent && !tmpIsLocked && pInput.Default && (typeof(pInput.Default) === 'string'))
+		{
+			tmpContent = pInput.Default;
+		}
+
+		if (pRowIndex != null)
+		{
+			pView.setDataTabularByHash(pInput.PictForm.GroupIndex, pInput.Hash, pRowIndex, tmpContent);
+		}
+		else
+		{
+			pView.setDataByInput(pInput, tmpContent);
+		}
+	}
+
+	/**
+	 * Initializes the input element for the Pict provider select input.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} 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 input value.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+	 * @returns {boolean} - Returns true if the input element is successfully initialized, false otherwise.
+	 */
+	onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
+	{
+		this._handleInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, null, pTransactionGUID);
+		return super.onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
+	}
+
+	/**
+	 * Initializes a tabular input element.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} 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, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
+	{
+		this._handleInitialize(pView, pGroup, null, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
+		return super.onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
+	}
+
+	/**
+	 * Initializes a tabular input element.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} pView - The view object.
+	 * @param {Object} pGroup - The group object.
+	 * @param {Object|null} pRow - The row object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The input value.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {number|null} pRowIndex - The index of the row.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
+	 * @returns {any} - The result of the initialization.
+	 */
+	_handleInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
+	{
+		if (pInput.PictForm && pInput.PictForm.Templates && typeof pInput.PictForm.Templates === 'object' && !Array.isArray(pInput.PictForm.Templates))
+		{
+			for (const [ tmpTemplateHash, tmpTemplate ] of Object.entries(pInput.PictForm.Templates))
+			{
+				if (this.pict.TemplateProvider.templates[tmpTemplateHash])
+				{
+					this.pict.log.error(`[Pict-Input-Templated] Attempt to override template with hash: ${tmpTemplateHash}; skipping.`);
+					continue;
+				}
+				this.pict.TemplateProvider.addTemplate(tmpTemplateHash, tmpTemplate, `Templated Input hash: ${pInput.Hash}`);
+			}
+		}
+		this.handleContentUpdate(pView, pInput, pValue);
+	}
+
+	/**
+	 * Marshals data to the form for the given input.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} 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, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
+	{
+		this.pict.ContentAssignment.assignContent(this.getContentDisplayHTMLID(pInput.Macro.RawHTMLID), pValue);
+		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
+	}
+
+	/**
+	 * Marshals data to a form in tabular format.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} 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, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
+	{
+		this.pict.ContentAssignment.assignContent(this.getTabularContentDisplayInputID(pInput.Macro.RawHTMLID, pRowIndex), pValue);
+		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
+	}
+
+	/**
+	 * This input extension only responds to events
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
+	{
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash ] = tmpPayload.split(':');
+
+		if (tmpType !== 'TriggerGroup')
+		{
+			return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+		}
+
+		const tmpTriggerGroupHashes = Array.isArray(pInput.PictForm?.TriggerGroupHash) ? pInput.PictForm.TriggerGroupHash : [pInput.PictForm?.TriggerGroupHash];
+		if (!pInput.PictForm || !pInput.PictForm.TriggerGroupHash || !tmpTriggerGroupHashes.includes(tmpGroupHash))
+		{
+			return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+		}
+		this.handleContentUpdate(pView, pInput, pValue);
+		pView.manualMarshalDataToViewByInput(pInput, pTransactionGUID);
+		return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+	}
+
+	/**
+	 * Handles events for the Pict-Provider-InputExtension.
+	 *
+	 * @param {import('../../views/Pict-View-DynamicForm.js')} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {number} pRowIndex - The row index of the tabular data.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
+	{
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash ] = tmpPayload.split(':');
+
+		if (tmpType !== 'TriggerGroup')
+		{
+			return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+		}
+
+		const tmpTriggerGroupHashes = Array.isArray(pInput.PictForm?.TriggerGroupHash) ? pInput.PictForm.TriggerGroupHash : [pInput.PictForm?.TriggerGroupHash];
+		if (!pInput.PictForm || !pInput.PictForm.TriggerGroupHash || !tmpTriggerGroupHashes.includes(tmpGroupHash))
+		{
+			return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+		}
+		this.handleContentUpdate(pView, pInput, pValue, pRowIndex);
+		pView.manualMarshalTabularDataToViewByInput(pInput, pRowIndex, pTransactionGUID);
+		return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+	}
+}
+
+module.exports = TemplatedInputProvider;

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

@@ -162,39 +162,82 @@ class CustomInputHandler extends libPictSectionInputExtension
 	}
 
 	/**
-	 * Marshals data to the form for the given input.
+	 * This input extension only responds to events
 	 *
 	 * @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 {any} pValue - The value from AppData.
 	 * @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.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
 	 */
-	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
+	onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
 	{
-		this.assignDisplayEntityData(this.getContentDisplayHTMLID(pInput.Macro.RawHTMLID), pInput, pValue);
-		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
+		if (!tmpEventGUID)
+		{
+			tmpEventGUID = this.pict.getUUID();
+		}
+
+		if (!pInput.PictForm.TemplatedEntityLookup || !('TriggerGroupHash' in pInput.PictForm.TemplatedEntityLookup))
+		{
+			return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+		}
+		let tmpAutoFillTriggerGroups = [pInput.PictForm.TemplatedEntityLookup];
+
+		for (let i = 0; i < tmpAutoFillTriggerGroups.length; i++)
+		{
+			let tmpAutoFillTriggerGroup = tmpAutoFillTriggerGroups[i];
+			if (tmpAutoFillTriggerGroup.TriggerGroupHash !== tmpGroupHash)
+			{
+				continue;
+			}
+
+			this.assignDisplayEntityData(this.getContentDisplayHTMLID(pInput.Macro.RawHTMLID), pInput, pValue);
+		}
+
+		return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
 	}
 
 	/**
-	 * Marshals data to a form in tabular format.
+	 * Handles events for the Pict-Provider-InputExtension.
 	 *
 	 * @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.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {number} pRowIndex - The row index of the tabular data.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
 	 */
-	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
+	onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
 	{
-		this.assignDisplayEntityData(this.getTabularContentDisplayInputID(pInput.Macro.RawHTMLID, pRowIndex), pInput, pValue);
-		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
+		if (!tmpEventGUID)
+		{
+			tmpEventGUID = this.pict.getUUID();
+		}
+
+		if (!pInput.PictForm.TemplatedEntityLookup || !('TriggerGroupHash' in pInput.PictForm.TemplatedEntityLookup))
+		{
+			return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+		}
+		let tmpAutoFillTriggerGroups = [pInput.PictForm.TemplatedEntityLookup];
+		for (const tmpAutoFillTriggerGroup of tmpAutoFillTriggerGroups)
+		{
+			if (tmpAutoFillTriggerGroup.TriggerGroupHash !== tmpGroupHash)
+			{
+				continue;
+			}
+
+			this.assignDisplayEntityData(this.getTabularContentDisplayInputID(pInput.Macro.RawHTMLID, pRowIndex), pInput, pValue);
+		}
+
+		return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
 	}
 }
 

package/source/services/ManifestFactory.js

@@ -932,6 +932,110 @@ class ManifestFactory extends libFableServiceProviderBase
 		// This is meant to be overloaded by the parent class
 	}
 
+	migrateAutofillTriggerGroupSolvers(pManifests)
+	{
+		for (const tmpManifestFactory of Object.values(pManifests))
+		{
+			const tmpManifest = tmpManifestFactory.manifest;
+
+			const tmpGatheredSolverExpressions = [];
+
+			for (const tmpSection of tmpManifest.Sections || [])
+			{
+				if (Array.isArray(tmpSection.Solvers))
+				{
+					for (let i = 0; i < tmpSection.Solvers.length; i++)
+					{
+						const tmpSolverEntry = tmpSection.Solvers[i];
+						const tmpSolverExpression = (typeof (tmpSolverEntry) === 'string') ? tmpSolverEntry : tmpSolverEntry.Expression;
+						if (typeof tmpSolverExpression === 'string' && tmpSolverExpression.startsWith('TriggerGroup:'))
+						{
+							tmpGatheredSolverExpressions.push(tmpSolverEntry);
+							// Remove it from the section solvers
+							tmpSection.Solvers.splice(i, 1);
+							--i;
+						}
+					}
+				}
+				for (const tmpGroup of tmpSection.Groups || [])
+				{
+					if (Array.isArray(tmpGroup.RecordSetSolvers))
+					{
+						for (let i = 0; i < tmpGroup.RecordSetSolvers.length; i++)
+						{
+							const tmpSolverEntry = tmpGroup.RecordSetSolvers[i];
+							const tmpSolverExpression = (typeof (tmpSolverEntry) === 'string') ? tmpSolverEntry : tmpSolverEntry.Expression;
+							if (typeof tmpSolverExpression === 'string' && tmpSolverExpression.startsWith('TriggerGroup:'))
+							{
+								tmpGatheredSolverExpressions.push(tmpSolverEntry);
+								// Remove it from the group solvers
+								tmpGroup.RecordSetSolvers.splice(i, 1);
+								--i;
+							}
+						}
+					}
+				}
+			}
+			for (const tmpTriggerGroupSolverEntry of tmpGatheredSolverExpressions)
+			{
+				const tmpSolverExpression = (typeof (tmpTriggerGroupSolverEntry) === 'string') ? tmpTriggerGroupSolverEntry : tmpTriggerGroupSolverEntry.Expression;
+				let [ tmpType, tmpTriggerGroupHash, tmpPrePost, tmpSimpleSolverExpression ] = tmpSolverExpression.split(':');
+				if (!tmpSimpleSolverExpression)
+				{
+					tmpSimpleSolverExpression = tmpPrePost;
+					tmpPrePost = 'post';
+				}
+
+				if (!tmpSimpleSolverExpression || tmpSimpleSolverExpression.trim() === '')
+				{
+					this.log.error(`Skipping migration of empty TriggerGroup solver expression in manifest [${tmpManifest.Scope}] for TriggerGroup [${tmpTriggerGroupHash}]`);
+					continue;
+				}
+				const tmpTriggerGroupDescriptor = Object.values(tmpManifest.Descriptors).find((pDescriptor) =>
+				{
+					if (!pDescriptor.PictForm?.AutofillTriggerGroup)
+					{
+						return false;
+					}
+					/** @type {Array<any>} */
+					const tmpTriggerGroups = Array.isArray(pDescriptor.PictForm.AutofillTriggerGroup) ? pDescriptor.PictForm.AutofillTriggerGroup : [pDescriptor.PictForm.AutofillTriggerGroup];
+					return tmpTriggerGroups.some((pTriggerGroup) => pTriggerGroup.TriggerGroupHash === tmpTriggerGroupHash);
+				});
+				if (!tmpTriggerGroupDescriptor)
+				{
+					this.log.error(`Could not find descriptor for TriggerGroup [${tmpTriggerGroupHash}] in manifest [${tmpManifest.Scope}] while migrating solver expression: ${tmpSolverExpression}`);
+					continue;
+				}
+				const tmpTriggerGroups = Array.isArray(tmpTriggerGroupDescriptor.PictForm.AutofillTriggerGroup) ? tmpTriggerGroupDescriptor.PictForm.AutofillTriggerGroup : [tmpTriggerGroupDescriptor.PictForm.AutofillTriggerGroup];
+				const tmpTriggerGroup = tmpTriggerGroups.find((pTriggerGroup) => pTriggerGroup.TriggerGroupHash === tmpTriggerGroupHash);
+				if (!tmpTriggerGroup)
+				{
+					this.log.error(`Could not find TriggerGroup entry for TriggerGroup [${tmpTriggerGroupHash}] in descriptor [${tmpTriggerGroupDescriptor.Hash}] while migrating solver expression: ${tmpSolverExpression}`);
+					continue;
+				}
+				let tmpUpdatedTriggerGroupSolverEntry = tmpTriggerGroupSolverEntry;
+				if (typeof tmpTriggerGroupSolverEntry === 'string')
+				{
+					tmpUpdatedTriggerGroupSolverEntry = tmpSimpleSolverExpression;
+				}
+				else
+				{
+					tmpTriggerGroupSolverEntry.Expression = tmpSimpleSolverExpression;
+				}
+				if (tmpPrePost.toLowerCase() === 'pre')
+				{
+					tmpTriggerGroup.PreSolvers = tmpTriggerGroup.PreSolvers || [];
+					tmpTriggerGroup.PreSolvers.push(tmpUpdatedTriggerGroupSolverEntry);
+				}
+				else
+				{
+					tmpTriggerGroup.PostSolvers = tmpTriggerGroup.PostSolvers || [];
+					tmpTriggerGroup.PostSolvers.push(tmpUpdatedTriggerGroupSolverEntry);
+				}
+			}
+		}
+	}
+
 	/**
 	 * Create some manifests with a "factory" pattern.
 	 *
@@ -983,6 +1087,7 @@ class ManifestFactory extends libFableServiceProviderBase
 				this.tabularRowAddDescriptor(tmpManifest, tmpRecord);
 			}
 		}
+		this.migrateAutofillTriggerGroupSolvers(tmpManifests);
 
 		this.log.info(`Generated ${Object.keys(tmpManifests).length} manifests.`);
 

package/source/views/Pict-View-DynamicForm.js

@@ -567,7 +567,7 @@ class PictViewDynamicForm extends libPictViewClass
 	}
 
 	/**
-	 * Executes the solve operation for the dynamic views, then auto marshals data if options.AutoMarshalDataOnSolve is set to true.
+	 * Executes the solve operation for the dynamic views.
 	 *
 	 * @returns {any} The result of the solve operation.
 	 */
@@ -578,11 +578,6 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.pict.providers.DynamicSolver.solveViews([this.Hash]);
 		}
-
-		if (this.options.AutoMarshalDataOnSolve)
-		{
-			this.marshalToView();
-		}
 		return super.onSolve();
 	}
 

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

@@ -1151,7 +1151,6 @@ class PictFormMetacontroller extends libPictViewClass
 				tmpViewConfiguration.Manifests = {};
 			}
 			tmpViewConfiguration.Manifests.Section = this.manifestDescription;
-			tmpViewConfiguration.AutoMarshalDataOnSolve = this.options.AutoMarshalDataOnSolve;
 			this.pict.addView(tmpViewHash, tmpViewConfiguration, libPictViewDynamicForm);
 		}
 
@@ -1396,7 +1395,6 @@ module.exports.default_configuration = (
 	"DefaultRenderable": "Pict-Forms-Metacontainer",
 	"DefaultDestinationAddress": "#Pict-Form-Container",
 
-	"AutoMarshalDataOnSolve": true,
 	"OnlyRenderDynamicSections": true,
 
 	"MetaTemplateHash": "Pict-Forms-Metatemplate",

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

@@ -20,6 +20,7 @@ declare class PictDynamicFormsSolverBehaviors extends libPictProvider {
     setCSSSnippets(pCSSHideClass: any, pCSSSnippet: any): void;
     cssHideClass: any;
     addSolverFunction(pExpressionParser: any, pFunctionName: any, pFunctionAddress: any, pFunctionComment: any): void;
+    runSolvers(): any;
     injectBehaviors(pExpressionParser: any): boolean;
     /**
      * @param {number|string} pSolverOrdinal

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-DynamicFormSolverBehaviors.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicFormSolverBehaviors.js"],"names":[],"mappings":";AAaA;;;;;GAKG;AACH;IAeE,kBAAkB;IAClB,SADW,GAAG,CACF;IACZ,qFAAqF;IACrF,MADW,OAAO,MAAM,CAAC,GAAG;QAAE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,UAAU,CAAC,CAAA;KAAE,CACxE;IAIT,qBAAqB;IACrB,qBADW,MAAM,CAC4C;IAC7D,0BAAyD;IACzD,mBAA2H;IAE3H,qBAA0B;IAK3B,2DAMC;IAJA,kBAAsD;IAMvD,kHAaC;IAED,iDAsBC;IAED;;;OAGG;IACH,wCAHW,MAAM,GAAC,MAAM,YACb,OAAO,GAAC,MAAM,GAAC,MAAM,QAK/B;IAED;;OAEG;IACH,oCAFW,MAAM,GAAC,MAAM,QAKvB;IAED;;OAEG;IACH,qCAFW,MAAM,GAAC,MAAM,QAKvB;IAED;;;;OAIG;IACH,yCAJW,MAAM,GAAC,MAAM,GAEZ,OAAO,CAMlB;IAED,gDAGC;IAED,gEAUC;IAGD,wCAiBC;IAED,wCAiBC;IAED,+DAGC;IAED,+EAUC;IAED,uDAiBC;IAED,uDAiBC;IAED;;;;;;;OAOG;IACH,kCANW,MAAM,cACN,MAAM,WACN,MAAM,GAAC,MAAM,qBACb,OAAO,GAAC,MAAM,WAoDxB;IAGD,iEAqBC;IAED,mFA2BC;IAED,kGA0BC;IAED;;;;;;;;OAQG;IACH,mCAPW,MAAM,cACN,MAAM,UACN,MAAM,gBACN,MAAM,iBACN,MAAM,GACJ,OAAO,CAmCnB;IAED;;;;;;;;;;;OAWG;IACH,0CAVW,MAAM,cACN,MAAM,cAEN,MAAM,aADN,MAAM,UAEN,MAAM,gBACN,MAAM,iBACN,MAAM,qBACN,MAAM,GACJ,OAAO,CA0CnB;IAED;;;;;;OAMG;IACH,oCANW,KAAK,CAAC,WAAW,CAAC,UAClB,MAAM,iBACN,MAAM,GAEJ,OAAO,CA2BnB;IAED,+BAWC;CACD;;;;;AA9gBD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ3B"}
+{"version":3,"file":"Pict-Provider-DynamicFormSolverBehaviors.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicFormSolverBehaviors.js"],"names":[],"mappings":";AAaA;;;;;GAKG;AACH;IAeE,kBAAkB;IAClB,SADW,GAAG,CACF;IACZ,qFAAqF;IACrF,MADW,OAAO,MAAM,CAAC,GAAG;QAAE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,UAAU,CAAC,CAAA;KAAE,CACxE;IAIT,qBAAqB;IACrB,qBADW,MAAM,CAC4C;IAC7D,0BAAyD;IACzD,mBAA2H;IAE3H,qBAA0B;IAK3B,2DAMC;IAJA,kBAAsD;IAMvD,kHAaC;IAED,kBAGC;IAED,iDAuBC;IAED;;;OAGG;IACH,wCAHW,MAAM,GAAC,MAAM,YACb,OAAO,GAAC,MAAM,GAAC,MAAM,QAK/B;IAED;;OAEG;IACH,oCAFW,MAAM,GAAC,MAAM,QAKvB;IAED;;OAEG;IACH,qCAFW,MAAM,GAAC,MAAM,QAKvB;IAED;;;;OAIG;IACH,yCAJW,MAAM,GAAC,MAAM,GAEZ,OAAO,CAMlB;IAED,gDAGC;IAED,gEAUC;IAGD,wCAiBC;IAED,wCAiBC;IAED,+DAGC;IAED,+EAUC;IAED,uDAiBC;IAED,uDAiBC;IAED;;;;;;;OAOG;IACH,kCANW,MAAM,cACN,MAAM,WACN,MAAM,GAAC,MAAM,qBACb,OAAO,GAAC,MAAM,WAoDxB;IAGD,iEAqBC;IAED,mFA2BC;IAED,kGA0BC;IAED;;;;;;;;OAQG;IACH,mCAPW,MAAM,cACN,MAAM,UACN,MAAM,gBACN,MAAM,iBACN,MAAM,GACJ,OAAO,CAmCnB;IAED;;;;;;;;;;;OAWG;IACH,0CAVW,MAAM,cACN,MAAM,cAEN,MAAM,aADN,MAAM,UAEN,MAAM,gBACN,MAAM,iBACN,MAAM,qBACN,MAAM,GACJ,OAAO,CA0CnB;IAED;;;;;;OAMG;IACH,oCANW,KAAK,CAAC,WAAW,CAAC,UAClB,MAAM,iBACN,MAAM,GAEJ,OAAO,CA2BnB;IAED,+BAWC;CACD;;;;;AAphBD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-DynamicInputEvents.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicInputEvents.js"],"names":[],"mappings":";AAaA;;GAEG;AACH;IAeC;;;;;;OAMG;IACH,yCAHW,MAAM,WACN,GAAG,QAyDb;IAED;;;;;;;OAOG;IACH,mCAJW,MAAM,UACN,MAAM,qBACN,MAAM,QAgDhB;IAED;;;;;;;;OAQG;IACH,+BANW,OAAO,gCAAgC,CAAC,eACxC,MAAM,eACN,MAAM,aACN,MAAM,WACN,GAAG,QAgEb;IAED;;;;;;;;;OASG;IACH,2CANW,MAAM,eACN,MAAM,aACN,MAAM,UACN,MAAM,qBACN,MAAM,QA4ChB;CACD;;;;;AAnRD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}
+{"version":3,"file":"Pict-Provider-DynamicInputEvents.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicInputEvents.js"],"names":[],"mappings":";AAaA;;GAEG;AACH;IAeC;;;;;;OAMG;IACH,yCAHW,MAAM,WACN,GAAG,QAyDb;IAED;;;;;;;OAOG;IACH,mCAJW,MAAM,UACN,MAAM,qBACN,MAAM,QAgDhB;IAED;;;;;;;;OAQG;IACH,+BANW,OAAO,gCAAgC,CAAC,eACxC,MAAM,eACN,MAAM,aACN,MAAM,WACN,GAAG,QA6Db;IAED;;;;;;;;;OASG;IACH,2CANW,MAAM,eACN,MAAM,aACN,MAAM,UACN,MAAM,qBACN,MAAM,QA4ChB;CACD;;;;;AAhRD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

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

@@ -10,6 +10,7 @@ declare class PictDynamicSolver extends libPictProvider {
         instantiateServiceProviderIfNotExists: (hash: string) => any;
         ExpressionParser: any;
     };
+    _RunSolversRegex: RegExp;
     logSolveOutcome(pSolveOutcome: any): void;
     /**
      * Prepares the solver results map by ensuring it has the necessary structure.
@@ -44,6 +45,37 @@ declare class PictDynamicSolver extends libPictProvider {
      * @returns {object|undefined} - The solver object if it passes the checks, otherwise undefined.
      */
     checkSolver(pSolver: string | object, pFiltered?: boolean, pOrdinal?: number): object | undefined;
+    /** @typedef {{ Ordinal: number, Expression: string } | string} Solver */
+    /**
+     * Execute a set of adhoc solvers.
+     *
+     * @param {import('../views/Pict-View-DynamicForm.js')} pView - The dynamic view to execute the solvers against.
+     * @param {Array<Solver>} pSolvers - An array of solvers to execute.
+     * @param {string} pReason - The reason for executing the solvers.
+     */
+    executeSolvers(pView: import("../views/Pict-View-DynamicForm.js"), pSolvers: Array<string | {
+        Ordinal: number;
+        Expression: string;
+    }>, pReason: string): void;
+    lastAdhocSolveOutcome: {
+        SolverResultsMap: {};
+        StartTimeStamp: number;
+        SolveOrdinals: {};
+        EndTimeStamp: number;
+    };
+    /**
+     * Runs each Adhoc solver formulae for a dynamic view group at a given ordinal.
+     *
+     * Or for all ordinals if no ordinal is passed.
+     *
+     * @param {import('../views/Pict-View-DynamicForm.js')} pView - The dynamic view to execute the solvers against.
+     * @param {Array<string>} pAdhocSolverArray - An array of Solvers from the groups to solve.
+     * @param {string} pReason - The reason for executing the solvers.
+     * @param {number} pOrdinal - The ordinal value to filter to.  Optional.
+     * @param {Object} pSolverResultsMap - The solver results map.
+     * @param {boolean} [pPreventSolverCycles=false] - Whether to prevent solver cycles.
+     */
+    executeAdhocSolvers(pView: import("../views/Pict-View-DynamicForm.js"), pAdhocSolverArray: Array<string>, pReason: string, pOrdinal: number, pSolverResultsMap: any, pPreventSolverCycles?: boolean): void;
     /**
      * Runs each RecordSet solver formulae for a dynamic view group at a given ordinal.
      *
@@ -52,16 +84,18 @@ declare class PictDynamicSolver extends libPictProvider {
      * @param {array} pGroupSolverArray - An array of Solvers from the groups to solve.
      * @param {number} pOrdinal - The ordinal value to filter to.  Optional.
      * @param {Object} pSolverResultsMap - The solver results map.
+     * @param {boolean} [pPreventSolverCycles=false] - Whether to prevent solver cycles.
      */
-    executeGroupSolvers(pGroupSolverArray: any[], pOrdinal: number, pSolverResultsMap: any): void;
+    executeGroupSolvers(pGroupSolverArray: any[], pOrdinal: number, pSolverResultsMap: any, pPreventSolverCycles?: boolean): void;
     /**
      * Executes the section solvers at a given ordinal (or all if no ordinal is passed).
      *
      * @param {Array} pViewSectionSolverArray - The array of view section solvers.
      * @param {number} pOrdinal - The ordinal value.
      * @param {Object} pSolverResultsMap - The solver results map.
+     * @param {boolean} [pPreventSolverCycles=false] - Whether to prevent solver cycles.
      */
-    executeSectionSolvers(pViewSectionSolverArray: any[], pOrdinal: number, pSolverResultsMap: any): void;
+    executeSectionSolvers(pViewSectionSolverArray: any[], pOrdinal: number, pSolverResultsMap: any, pPreventSolverCycles?: boolean): void;
     /**
      * Executes the view solvers for the given array of view hashes.
      *
@@ -101,8 +135,10 @@ declare class PictDynamicSolver extends libPictProvider {
      * leaves on the tree.
 
      * @param {Array|string[]} [pViewHashes] - An optional array of view hashes to solve. If not provided, all views in the fable will be solved.
+     * @param {boolean} [pPreventSolverCycles] - An optional context string for the solve operation.
+     * TODO: make sure you can't cycle with the same solve context - new solver method to invoke this
      */
-    solveViews(pViewHashes?: any[] | string[]): void;
+    solveViews(pViewHashes?: any[] | string[], pPreventSolverCycles?: boolean): void;
     lastSolveOutcome: {
         SolverResultsMap: {};
         StartTimeStamp: number;

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;IAcE,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;IA8BX,0CAsBC;IAED;;;;;MAKE;IACF,qDAgBC;IAED;;;;;OAKG;IACH,oDA+CC;IAED;;;;;;OAMG;IACH,6BAJW,MAAM,YACN,OAAO,GACL,GAAG,CAyBf;IAED;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED;;;;;;;;OAQG;IACH,wDAHW,MAAM,gCA4DhB;IAED;;;;;;OAMG;IACH,gEAHW,MAAM,gCAkChB;IAED;;;;;;OAMG;IACH,sDAHW,MAAM,gCA2BhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QA6FxB;IADA;;;;;;MAAuC;CAExC;;;;;AA7fD,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":";AAgCA;;GAEG;AACH;IAcE,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;IAQV,yBAA0C;IAwB3C,0CAsBC;IAED;;;;;MAKE;IACF,qDAgBC;IAED;;;;;OAKG;IACH,oDA8CC;IAED;;;;;;OAMG;IACH,6BAJW,MAAM,YACN,OAAO,GACL,GAAG,CAyBf;IAED;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED,yEAAyE;IAEzE;;;;;;OAMG;IACH,sBAJW,OAAO,mCAAmC,CAAC,YAC3C,KAAK;iBANS,MAAM;oBAAc,MAAM;MAM3B,WACb,MAAM,QAmDhB;IADA;;;;;MAA4C;IAG7C;;;;;;;;;;;OAWG;IACH,2BAPW,OAAO,mCAAmC,CAAC,qBAC3C,KAAK,CAAC,MAAM,CAAC,WACb,MAAM,YACN,MAAM,iDAEN,OAAO,QAyCjB;IAED;;;;;;;;;OASG;IACH,wDAJW,MAAM,iDAEN,OAAO,QAoEjB;IAED;;;;;;;OAOG;IACH,gEAJW,MAAM,iDAEN,OAAO,QA0CjB;IAED;;;;;;OAMG;IACH,sDAHW,MAAM,gCA2BhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,yBAJW,QAAM,MAAM,EAAE,yBACd,OAAO,QA+FjB;IADA;;;;;;MAAuC;CAExC;;;;;AAtoBD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-MetatemplateGenerator.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-MetatemplateGenerator.js"],"names":[],"mappings":";AAkDA;;;GAGG;AACH;IAcE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IAIT,qCAAqC;IACrC,kBADW,sBAAsB,CACZ;IAErB,2BAAwC;IAGzC,wCAIC;IAED,uCAYC;IAED;;;;;;;OAOG;IACH,kEAJW,MAAM,2BACN,MAAM,GACJ,MAAM,CAmBlB;IAED;;;;;;;OAOG;IACH,+DAJW,MAAM,oBACN,MAAM,GACJ,MAAM,CAKlB;IAED;;;;;;;;OAQG;IACH,6DALW,MAAM,cACN,MAAM,oBACN,MAAM,GACJ,MAAM,CA4BlB;IAED;;;;;;;;;;OAUG;IACH,oEAPW,MAAM,cACN,MAAM,oBACN,MAAM,eACN,MAAM,aACN,MAAM,GACJ,MAAM,CAqDlB;IAED;;;;;;;;OAQG;IACH,qEALW,MAAM,cACN,MAAM,oBACN,MAAM,GACJ,MAAM,CA4BlB;IAED;;;;;;OAMG;IACH,qDA2BC;IAED;;;;;;OAMG;IACH,wCA8BC;CACD;;;;;;AA3VD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}
+{"version":3,"file":"Pict-Provider-MetatemplateGenerator.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-MetatemplateGenerator.js"],"names":[],"mappings":";AAiDA;;;GAGG;AACH;IAcE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IAIT,qCAAqC;IACrC,kBADW,sBAAsB,CACZ;IAErB,2BAAwC;IAGzC,wCAIC;IAED,uCAYC;IAED;;;;;;;OAOG;IACH,kEAJW,MAAM,2BACN,MAAM,GACJ,MAAM,CAmBlB;IAED;;;;;;;OAOG;IACH,+DAJW,MAAM,oBACN,MAAM,GACJ,MAAM,CAKlB;IAED;;;;;;;;OAQG;IACH,6DALW,MAAM,cACN,MAAM,oBACN,MAAM,GACJ,MAAM,CA4BlB;IAED;;;;;;;;;;OAUG;IACH,oEAPW,MAAM,cACN,MAAM,oBACN,MAAM,eACN,MAAM,aACN,MAAM,GACJ,MAAM,CAqDlB;IAED;;;;;;;;OAQG;IACH,qEALW,MAAM,cACN,MAAM,oBACN,MAAM,GACJ,MAAM,CA4BlB;IAED;;;;;;OAMG;IACH,qDA2BC;IAED;;;;;;OAMG;IACH,wCA8BC;CACD;;;;;;AA1VD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-Input-AutofillTriggerGroup.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-AutofillTriggerGroup.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IAWE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IAKV,oDAYC;IAED,sGAwBC;IAED,6HAwBC;IAGD;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CAmBf;IAED;;;;;;;;;;OAUG;IACH,qDANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAmBf;CAyHD"}
+{"version":3,"file":"Pict-Provider-Input-AutofillTriggerGroup.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-AutofillTriggerGroup.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IAWE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IAKV,oDAYC;IAED,sGAwBC;IAED,6HAwBC;IAGD;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CA8Bf;IAED;;;;;;;;;;OAUG;IACH,qDANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CA8Bf;CAmID"}