pict-section-form 1.0.124 → 1.0.127

package/debug/Harness.js

@@ -3,5 +3,5 @@ const libParseCSV = require('../utility/csvparser/ParseCSV-Program.js');
 // This command takes the `TabularManifestCSV.csv` file and imports it into a JSON file
 //libParseCSV.run(['node', 'Harness.js', 'import']);
 // This command takes the `data/MathExampleForm.json` file and injects any sidecare files in the `input_data` folder into the JSON file
-//libParseCSV.run(['node', 'Harness.js', 'inject']);
-libParseCSV.run(['node', 'Harness.js', 'intersect']);
+libParseCSV.run(['node', 'Harness.js', 'inject']);
+//libParseCSV.run(['node', 'Harness.js', 'intersect']);

package/debug/data/DefaultFormManifest.json

@@ -868,7 +868,7 @@
                             "ExtraData": ""
                         },
                         {
-                            "Identifier": "C",
+                            "Identifier": "C and 4\" Nails",
                             "Width": "1",
                             "Height": "1",
                             "Depth": "1",

package/debug/data/MathExampleForm.json

@@ -868,7 +868,7 @@
                             "ExtraData": ""
                         },
                         {
-                            "Identifier": "C",
+                            "Identifier": "C and 4\" Nails",
                             "Width": "1",
                             "Height": "1",
                             "Depth": "1",

package/debug/input_data/Rectangles.csv

@@ -1,7 +1,7 @@
 Identifier,Width,Height,Depth,ExtraData
 A,1,1,1,
 B,1,1,1,
-C,1,1,1,
+"C and 4"" Nails",1,1,1,
 D,1,1,1,
 E,1,1,1,
 F,1,1,1,

package/package.json

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

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

@@ -283,10 +283,10 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 	 * @param {string} pInputHash - The hash of the input to color.
 	 * @param {string} pColor - The HTML hex color to apply (e.g. #FF0000 for red).
 	 * @param {string} pApplyChange - If "0", the change will not be applied.
-	 * @param {string} [pClassTarget] - Optional. If provided, the color will be applied to the closest element with this class instead of the input itself.
+	 * @param {string} [pCSSSelector] - Optional. If provided, the color will be applied to the closest element matching this selector instead of the input itself.
 	 * @returns {boolean} - Returns true if the color was applied successfully or if the change was skipped for pApplyChange equal to "0", false otherwise.
 	 */
-	colorInputBackground(pSectionHash, pInputHash, pColor, pApplyChange, pClassTarget)
+	colorInputBackground(pSectionHash, pInputHash, pColor, pApplyChange, pCSSSelector)
 	{
 		if (pApplyChange == "0")
 		{
@@ -321,13 +321,13 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 
 		// if we passed a class target, find the closest element with that class and apply the color to it
 		// otherwise, just apply it to the input element itself
-		if (pClassTarget)
+		if (pCSSSelector)
 		{
 			// find closest target by class name and if we find it, immediately break out of the loop
 			for (let i = 0; i < tmpElementSet.length; i++)
 			{
 				const element = tmpElementSet[i];
-				const closest = element.closest(`.${pClassTarget}`);
+				const closest = element.closest(`${pCSSSelector}`);
 				if (closest)
 				{
 					tmpElement = closest;

package/source/services/ManifestFactory.js

@@ -624,7 +624,7 @@ class ManifestFactory extends libFableServiceProviderBase
 		{
 			// Clean up the equation a bit to remove any leading/trailing spaces and replace HTML quotes
 			// that may have been added by the CSV or other source.
-			const tmpCleanEquation = tmpRecord['Equation'].trim().replace(/"/g, '"');
+			const tmpCleanEquation = tmpRecord['Equation'].trim();
 			this.log.trace(`Adding solver to ${tmpRecord.Form} --> ${tmpGroup.Name} for ${tmpRecord['Input Hash']}: ${tmpRecord['Equation']}`);
 			if ((tmpGroup.Layout == 'Tabular') || (tmpGroup.Layout == 'RecordSet'))
 			{

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

@@ -169,6 +169,8 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
 			let tmpHashAddress = this.sectionManifest.resolveHashAddress(pInputHash);
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -177,8 +179,6 @@ class PictViewDynamicForm extends libPictViewClass
 				let tmpValue = this.sectionManifest.getValueByHash(tmpMarshalDestinationObject, tmpHashAddress);
 
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
-				this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -195,6 +195,10 @@ class PictViewDynamicForm extends libPictViewClass
 			{
 				this.log.error(`Dynamic form [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInputHash}) data from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 		else
 		{
@@ -229,6 +233,8 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
 			let tmpHashAddress = tmpInput.Address;
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -240,8 +246,6 @@ class PictViewDynamicForm extends libPictViewClass
 				// Each row has a distinct address!
 				let tmpVirtualInformaryHTMLSelector = tmpInput.Macro.HTMLSelectorTabular + `[data-i-index="${pRowIndex}"]`;
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
-				this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -258,6 +262,10 @@ class PictViewDynamicForm extends libPictViewClass
 			{
 				this.log.error(`Dynamic form [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${tmpInput.Hash}) tabular data for group ${pGroupIndex} row ${pRowIndex} from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 		else
 		{
@@ -280,6 +288,8 @@ class PictViewDynamicForm extends libPictViewClass
 	 */
 	setDataByInput(pInput, pValue)
 	{
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
 			this.sectionManifest.setValueByHash(this.getMarshalDestinationObject(), pInput.Hash, pValue)
@@ -289,8 +299,6 @@ class PictViewDynamicForm extends libPictViewClass
 			// Each row has a distinct address!
 			let tmpVirtualInformaryHTMLSelector = pInput.Macro.HTMLSelector;
 			let tmpInputProviderList = this.getInputProviderList(pInput);
-			const tmpTransactionGUID = this.fable.getUUID();
-			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			for (let i = 0; i < tmpInputProviderList.length; i++)
 			{
 				if (this.pict.providers[tmpInputProviderList[i]])
@@ -302,12 +310,15 @@ class PictViewDynamicForm extends libPictViewClass
 					this.log.error(`Dynamic form setDataByInput [${this.Hash}]::[${this.UUID}] cannot find provider [${tmpInputProviderList[i]}] for input [${pInput.Hash}].`);
 				}
 			}
-			this.finalizeTransaction(tmpTransactionGUID);
 		}
 		catch (pError)
 		{
 			this.log.error(`Dynamic form setDataByInput [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInput.Hash}) from view in dataChanged event: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 
 		return false;
 	}
@@ -358,6 +369,8 @@ class PictViewDynamicForm extends libPictViewClass
 		)
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -369,8 +382,6 @@ class PictViewDynamicForm extends libPictViewClass
 				// Each row has a distinct address!
 				let tmpVirtualInformaryHTMLSelector = tmpInput.Macro.HTMLSelectorTabular + `[data-i-index="${pRowIndex}"]`;
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
-				this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -382,12 +393,15 @@ class PictViewDynamicForm extends libPictViewClass
 						this.log.error(`Dynamic form setDataTabularByHash [${this.Hash}]::[${this.UUID}] cannot find provider [${tmpInputProviderList[i]}] for input [${tmpInput.Hash}] row ${pRowIndex}.`);
 					}
 				}
-				this.finalizeTransaction(tmpTransactionGUID);
 			}
 			catch (pError)
 			{
 				this.log.error(`Dynamic form setDataTabularByHash [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInputHash}) tabular data for group ${pGroupIndex} row ${pRowIndex} from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 
 		return false;
@@ -444,10 +458,10 @@ class PictViewDynamicForm extends libPictViewClass
 	onMarshalToView()
 	{
 		// TODO: Only marshal data that has changed since the last marshal.  Thought experiment: who decides what changes happened?
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = this.fable.getUUID();
-			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
 			// TODO: Add optional transaction awareness to informary
 			this.pict.providers.Informary.marshalDataToForm(tmpMarshalDestinationObject, this.formID, this.sectionManifest);
@@ -458,15 +472,19 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling data to view: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 		return super.onMarshalToView();
 	}
 
 	manualMarshalDataToViewByInput(pInput, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
-			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			this.pict.providers.Informary.manualMarshalDataToFormByInput(pInput);
 			this.runLayoutProviderFunctions('onDataMarshalToForm', tmpTransactionGUID);
 			this.runInputProviderFunctions('onDataMarshalToForm', pInput.Hash, null, tmpTransactionGUID);
@@ -475,14 +493,21 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling data to view: ${pError}`);
 		}
+		finally
+		{
+			if (tmpTransactionGUID !== pTransactionGUID)
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
+		}
 	}
 
 	manualMarshalTabularDataToViewByInput(pInput, pRowIndex, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
-			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			this.pict.providers.Informary.manualMarshalTabularDataToFormByInput(pInput, pRowIndex);
 			this.runLayoutProviderFunctions('onDataMarshalToForm', tmpTransactionGUID);
 			this.runInputProviderFunctions('onDataMarshalToForm', pInput.Hash, pRowIndex, tmpTransactionGUID);
@@ -491,6 +516,13 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling tabular data to view: ${pError}`);
 		}
+		finally
+		{
+			if (tmpTransactionGUID !== pTransactionGUID)
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
+		}
 	}
 
 	/**
@@ -518,10 +550,10 @@ class PictViewDynamicForm extends libPictViewClass
 	onAfterMarshalToForm()
 	{
 		// Check to see if there are any hooks set from the input templates
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = this.fable.getUUID();
-			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			this.runInputProviderFunctions('onAfterMarshalToForm', null, null, tmpTransactionGUID);
 
 		}
@@ -529,6 +561,10 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error running after marshal to form: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -609,8 +645,19 @@ class PictViewDynamicForm extends libPictViewClass
 		let tmpTransactionGUID = this.fable.getUUID();
 		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 
-		this.runLayoutProviderFunctions('onGroupLayoutInitialize', tmpTransactionGUID);
-		this.runInputProviderFunctions('onInputInitialize', null, null, tmpTransactionGUID);
+		try
+		{
+			this.runLayoutProviderFunctions('onGroupLayoutInitialize', tmpTransactionGUID);
+			this.runInputProviderFunctions('onInputInitialize', null, null, tmpTransactionGUID);
+		}
+		catch (pError)
+		{
+			this.log.error(`Gross error running after render: ${pError.message || pError}`);
+		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 		return super.onAfterRender(pRenderable);
 	}
 
@@ -671,6 +718,10 @@ class PictViewDynamicForm extends libPictViewClass
 				}
 			}
 		}
+		if (tmpTransactionGUID !== pTransactionGUID)
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -792,7 +843,10 @@ class PictViewDynamicForm extends libPictViewClass
 				}
 			}
 		}
-		this.finalizeTransaction(tmpTransactionGUID);
+		if (pTransactionGUID !== tmpTransactionGUID)
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -1184,6 +1238,8 @@ class PictViewDynamicForm extends libPictViewClass
 				}
 			}
 		}
+		//TODO: figure out how to safely clean up old transactions
+		//delete this.pict.TransactionTracking.transactions[pTransactionGUID];
 		return true;
 	}
 

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-DynamicForm.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-DynamicForm.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Pict-View-DynamicForm.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-DynamicForm.js"],"names":[],"mappings":"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"}

package/utility/csvparser/ParseCSV-Command-Inject.js

@@ -27,6 +27,7 @@ class ImportExtraDataCSVCommand extends libPictCommandLineUtility.ServiceCommand
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 		this.fable.log.info(`Parsing CSV file [${pFilePath}]...`);
 
 		const tmpReadline = libReadline.createInterface(
@@ -59,6 +60,7 @@ class ImportExtraDataCSVCommand extends libPictCommandLineUtility.ServiceCommand
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 		this.fable.log.info(`Parsing Options CSV file [${pFilePath}]...`);
 
 		const tmpReadline = libReadline.createInterface(

package/utility/csvparser/ParseCSV-Command-Parse.js

@@ -67,6 +67,7 @@ class ImportCSVCommand extends libPictCommandLineUtility.ServiceCommandLineComma
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 
 		this.fable.log.info(`Parsing CSV file [${tmpFileName}]...`);
 
@@ -82,6 +83,7 @@ class ImportCSVCommand extends libPictCommandLineUtility.ServiceCommandLineComma
 				const tmpRecord = tmpCSVParser.parseCSVLine(pLine);
 				if (tmpRecord)
 				{
+					tmpRecord.Equation = tmpRecord.Equation.replace(/"/g, '"');
 					tmpRecords.push(tmpRecord);
 				}
 			});