pict-section-form 1.0.156 → 1.0.157

package/package.json

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

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

@@ -378,7 +378,7 @@ class PictFormMetacontroller extends libPictViewClass
 				{
 					continue;
 				}
-				const tmpTranslatedAddress = tmpAddressTranslation[tmpIterAddress].replace(new RegExp(`\\b${tmpOriginalAddress}\\b`, 'g'), tmpUpdatedAddress);
+				const tmpTranslatedAddress = tmpAddressTranslation[tmpIterAddress].replace(new RegExp(`^${tmpOriginalAddress}\\b`, 'g'), tmpUpdatedAddress);
 				if (tmpTranslatedAddress !== tmpAddressTranslation[tmpIterAddress])
 				{
 					//this.pict.log.info(`DocumentDynamicSectionManager._addTestSections: Updated address translation for "${tmpIterAddress}" from "${tmpAddressTranslation[tmpIterAddress]}" to "${tmpTranslatedAddress}".`);
@@ -416,6 +416,7 @@ class PictFormMetacontroller extends libPictViewClass
 						continue;
 					}
 					let tmpUpdatedSolver = tmpSolverExpression;
+					//FIXME: what if there is a collision in a suffix-part and we replace too much?
 					for (const tmpMapping of tmpAddressMappings)
 					{
 						tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
@@ -440,6 +441,43 @@ class PictFormMetacontroller extends libPictViewClass
 			}
 			for (const tmpGroup of tmpSection.Groups || [])
 			{
+				if (tmpGroup.RecordSetAddress)
+				{
+					let tmpRecordSetAddress = tmpGroup.RecordSetAddress;
+					for (const tmpMapping of tmpAddressMappings)
+					{
+						tmpRecordSetAddress = tmpRecordSetAddress.replace(new RegExp(`^${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);
+					}
+					if (tmpRecordSetAddress !== tmpGroup.RecordSetAddress)
+					{
+						//this.pict.log.info(`DocumentDynamicSectionManager._addTestSections: Updated group record set address from "${tmpGroup.RecordSetAddress}" to "${tmpRecordSetAddress}".`);
+					}
+					else
+					{
+						let tmpArrayIndex = tmpRecordSetAddress.indexOf('[');
+						let tmpDotIndex = tmpRecordSetAddress.indexOf('.');
+						if (tmpDotIndex >= 0 && (tmpDotIndex < tmpArrayIndex || tmpArrayIndex < 0))
+						{
+							const tmpPrefixPart = tmpRecordSetAddress.substring(0, tmpDotIndex);
+							const tmpPostfixPart = tmpRecordSetAddress.substring(tmpDotIndex);
+							tmpRecordSetAddress = `${tmpPrefixPart}_${tmpUUID}${tmpPostfixPart}`;
+						}
+						else if (tmpArrayIndex >= 0 && (tmpArrayIndex < tmpDotIndex || tmpDotIndex < 0))
+						{
+							const tmpArrayPart = tmpRecordSetAddress.substring(0, tmpArrayIndex);
+							const tmpPostfixPart = tmpRecordSetAddress.substring(tmpArrayIndex);
+							tmpRecordSetAddress = `${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.
+							tmpRecordSetAddress = `${tmpGroup.RecordSetAddress}_${tmpUUID}`;
+						}
+						//TODO: does this need to go into the mappings?
+						tmpGroup.RecordSetAddress = tmpRecordSetAddress;
+					}
+
+				}
 				if (Array.isArray(tmpGroup.RecordSetSolvers) && tmpGroup.RecordSetSolvers.length > 0)
 				{
 					for (let i = 0; i < tmpGroup.RecordSetSolvers.length; i++)
@@ -451,6 +489,7 @@ class PictFormMetacontroller extends libPictViewClass
 							continue;
 						}
 						let tmpUpdatedSolver = tmpSolverExpression;
+						//FIXME: what if there is a collision in a suffix-part and we replace too much?
 						for (const tmpMapping of tmpAddressMappings)
 						{
 							tmpUpdatedSolver = tmpUpdatedSolver.replace(new RegExp(`\\b${escapeRegExp(tmpMapping.From)}\\b`, 'g'), tmpMapping.To);

package/test/PictSectionForm-Basic_tests.js

@@ -557,6 +557,15 @@ suite
 									Scope: 'OrderedSolverApplicationForm',
 									Descriptors:
 									{
+										'LevelOfIndirection.AggregateValueAddress':
+										{
+											Hash: 'IndirectAggregateValue',
+											Name: 'Indirect Aggregate Value',
+											DataAddress: 'LevelOfIndirection.AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
 										'LevelOfIndirection.DataTableAddress[].ValueAddress':
 										{
 											Hash: 'ValueArray',
@@ -590,10 +599,19 @@ suite
 										{
 											Name: 'Ordered Solver Section',
 											Hash: 'OrderedSolverSection',
+											Groups:
+											[
+												{
+													Name: 'Group Name',
+													Hash: 'GroupHash',
+													RecordSetAddress: 'LevelOfIndirection.DataTableAddress',
+												},
+											],
 											Solvers:
 											[
 												{ Ordinal: 5, Expression: 'AggregateValue = SUM(ValueArray)' },
 												{ Ordinal: 40, Expression: 'AggregateValue2 = SUM(LevelOfIndirection.DataTableAddress[].ValueAddress)' },
+												{ Ordinal: 60, Expression: 'IndirectAggregateValue = AggregateValue' },
 											],
 										},
 									],
@@ -601,6 +619,7 @@ suite
 
 								let tmpHashedAggregateValue = null;
 								let tmpHashedAggregateValue2 = null;
+								let tmpHashedAggregateValue3 = null;
 								_Pict.PictApplication.initializeAsync(
 									function (pError)
 									{
@@ -612,10 +631,13 @@ suite
 										try
 										{
 											_Pict.log.info('Loading the Application and associated views.');
-											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest);
+											const tmpUUID = _Pict.getUUID().substring(0, 8);
+											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest, tmpUUID);
 											_Pict.log.info('Distinct Manifest:', tmpDistinctManifest);
+											Expect(tmpDistinctManifest.Sections[0].Groups[0].RecordSetAddress).to.equal(`LevelOfIndirection_${tmpUUID}.DataTableAddress`, 'Group RecordSetAddress should be preserved in distinct manifest.');
 											tmpHashedAggregateValue = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue')[0];
 											tmpHashedAggregateValue2 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue2')[0];
+											tmpHashedAggregateValue3 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'IndirectAggregateValue')[0];
 											const tmpInjectedSecionViews = _Pict.views.PictFormMetacontroller.injectManifest(tmpDistinctManifest);
 											_Pict.log.info('Injected Section Views:', tmpInjectedSecionViews.length);
 											_Pict.views.PictFormMetacontroller.updateMetatemplateInDOM();
@@ -635,9 +657,10 @@ suite
 											{
 												try
 												{
-													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2 });
+													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2, tmpHashedAggregateValue3 });
 													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)');
+													Expect(_Pict.manifest.getValueByHash(_Pict.AppData, tmpHashedAggregateValue3)).to.equal('15', 'IndirectAggregateValue should equal 15 (via indirection) using manifest method');
 												}
 												catch (pError)
 												{