pict-section-form 1.0.171 → 1.0.172

package/example_applications/simple_distill/Simple-Form-Application.js

@@ -96,6 +96,17 @@ module.exports.default_configuration.pict_configuration = (
 								"Filter": "FBL~IDBook~INN~{~PJU:,^IDBook^AppData.BookAuthorJoins~}",
 								"Destination": "AppData.Books"
 							},
+							{
+								"Type": "MapJoin",
+								"DestinationRecordSetAddress": "AppData.Books",
+								"DestinationJoinValue": "IDBook",
+								"JoinJoinValueLHS": "IDBook",
+								"Joins": "AppData.BookAuthorJoins",
+								"JoinJoinValueRHS": "IDBookAuthorJoin",
+								"JoinRecordSetAddress": "AppData.BookAuthorJoins",
+								"JoinValue": "IDBookAuthorJoin",
+								"RecordDestinationAddress": "BookAuthorJoins"
+							},
 							{
 								"Type": "Custom",
 								"Protocol": "HTTP",

package/package.json

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

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

@@ -227,30 +227,68 @@ class CustomInputHandler extends libPictSectionInputExtension
 		let tmpValue = pValue;
 		let tmpAnticipate = this.fable.newAnticipate();
 
-		for (let i = 0; i < tmpInput.PictForm.EntitiesBundle.length; i++)
+		if (tmpInput.PictForm.EntitiesBundle.length > 0 && tmpInput.PictForm.EntitiesBundle[0].PictMode)
 		{
-			let tmpEntityBundleEntry = tmpInput.PictForm.EntitiesBundle[i];
-			tmpAnticipate.anticipate(
-				(fNext) =>
-				{
-					try
+			tmpAnticipate.anticipate((fNext) =>
+			{
+				this.pict.EntityProvider.gatherDataFromServer(tmpInput.PictForm.EntitiesBundle, fNext);
+			});
+		}
+		else
+		{
+			const tmpStateStack = [];
+			/** @type {Record<string, any>} */
+			let tmpState = { Value: tmpValue, Input: tmpInput, View: pView };
+			for (let i = 0; i < tmpInput.PictForm.EntitiesBundle.length; i++)
+			{
+				let tmpEntityBundleEntry = tmpInput.PictForm.EntitiesBundle[i];
+				tmpAnticipate.anticipate(
+					(fNext) =>
 					{
-						switch (tmpEntityBundleEntry.Type)
+						try
 						{
-							case 'Custom':
-								return this.gatherCustomDataSet(fNext, tmpEntityBundleEntry, pView, tmpInput, tmpValue);
-							// This is the default case, for a meadow entity set or single entity
-							case 'MeadowEntity':
-							default:
-								return this.gatherEntitySet(fNext, tmpEntityBundleEntry, pView, tmpInput, tmpValue);
+							switch (tmpEntityBundleEntry.Type)
+							{
+								case 'Custom':
+									return this.gatherCustomDataSet(fNext, tmpEntityBundleEntry, pView, tmpInput, tmpValue);
+								case 'SetStateAddress':
+									tmpStateStack.push(tmpState);
+									tmpState = this.fable.manifest.getValueByHash(this.fable, tmpEntityBundleEntry.StateAddress);
+									if (typeof tmpState === 'undefined')
+									{
+										tmpState = {};
+										this.fable.manifest.setValueByHash(this.fable, tmpEntityBundleEntry.StateAddress, tmpState);
+									}
+									break;
+								case 'PopState':
+									if (tmpStateStack.length > 0)
+									{
+										tmpState = tmpStateStack.pop();
+									}
+									else
+									{
+										this.log.warn(`EntityBundleRequest encountered a PopState without a matching SetStateAddress.`);
+									}
+									break;
+								case 'MapJoin':
+									this.pict.EntityProvider.mapJoin(tmpEntityBundleEntry, this.pict.EntityProvider.prepareState(tmpState, tmpEntityBundleEntry));
+									break;
+								case 'ProjectDataset':
+									this.pict.EntityProvider.projectDataset(tmpEntityBundleEntry, this.pict.EntityProvider.prepareState(tmpState, tmpEntityBundleEntry));
+									break;
+								// This is the default case, for a meadow entity set or single entity
+								case 'MeadowEntity':
+								default:
+									return this.gatherEntitySet(fNext, tmpEntityBundleEntry, pView, tmpInput, tmpValue);
+							}
 						}
-					}
-					catch (pError)
-					{
-						this.log.error(`EntityBundleRequest error gathering entity set: ${pError}`, pError);
-					}
-					return fNext();
-				});
+						catch (pError)
+						{
+							this.log.error(`EntityBundleRequest error gathering entity set: ${pError}`, pError);
+						}
+						return fNext();
+					});
+			}
 		}
 
 		tmpAnticipate.anticipate(

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-Input-EntityBundleRequest.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH;IAWE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,4DAA4D;IAC5D,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,GAAG,CAAA;KAAE,CAC9C;IAKX,oGA0EC;IAED,+GAgEC;IAED;;;;;;;;;;OAUG;IACH,sDANW,GAAG,iBACH,MAAM,qBACN,MAAM,GAEL,OAAO,CAAC,KAAK,OAAC,CAAC,CAwF1B;IA0BD;;;;;;;;;;;OAWG;IACH,uEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CASf;CA0BD"}
+{"version":3,"file":"Pict-Provider-Input-EntityBundleRequest.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH;IAWE,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,4DAA4D;IAC5D,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,GAAG,CAAA;KAAE,CAC9C;IAKX,oGA0EC;IAED,+GAgEC;IAED;;;;;;;;;;OAUG;IACH,sDANW,GAAG,iBACH,MAAM,qBACN,MAAM,GAEL,OAAO,CAAC,KAAK,OAAC,CAAC,CA8H1B;IA0BD;;;;;;;;;;;OAWG;IACH,uEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CASf;CA0BD"}