pict-section-form 1.0.75 → 1.0.76

package/example_applications/postcard_example/providers/PictProvider-BestPostcardTheme.js

@@ -127,6 +127,33 @@ class PostcardTheme extends libPictFormSection.PictFormTemplateProvider
 		let tmpOptions = Object.assign({}, pOptions, {MetaTemplateSet:_Theme});
 		super(pFable, tmpOptions, pServiceHash);
 	}
+
+	/**
+	 * Injects a template set into Pict for the Dynamic Form Section Provider.
+	 *
+	 * The TemplateSet object expects to have a `TemplatePrefix` and `Templates` property.
+	 *
+	 * The `TemplatePrefix` is used to prefix the hash of the template.
+	 *
+	 * The `Templates` property is an array of objects with the following properties:
+	 * - `HashPostfix` - The postfix to be added to the template hash.  This defines which dynamic template in the Layout it represents.
+	 * - `Template` - The template string to be injected.
+	 * - `DefaultInputExtensions` - An optional array of default input extensions to be added to the Dynamic Input provider.
+	 *
+	 * The context of the template *is not the data*.  The template context is one of these five things depending on the layout layer:
+	 * - `Form` - The form object.
+	 * - `Section` - The section object.
+	 * - `Group` - The group object.
+	 * - `Row` - The row object.
+	 * - `Input` - The input object.
+	 *
+	 * @param {Object} pTemplateSet - The template set to be injected.
+	 */
+	injectTemplateSet(pTemplateSet)
+	{
+		this.pict.TemplateProvider.addTemplate('CustomTemplateField1', '<div id="customTemplate">{~D:Record.Value~} ({~D:Record.View.Hash~})</div>');
+		return super.injectTemplateSet(pTemplateSet);
+	}
 }
 
 module.exports = PostcardTheme;

package/example_applications/postcard_example/providers/PictProvider-Dynamic-Sections-MockServerResponse.json

@@ -42,7 +42,7 @@
 							"Hash": "Custom1",
 							"Description": "The message and recipient of your postcard.",
 							"Layout": "Custom",
-							"CustomLayoutTemplate": "<div id=\"custom\"><h5>I AM CUSTOM</h5>{~DI:Custom.CustomField1~}<div>{~SV:Custom.CustomField1~}</div> <div id=\"custom2\">{~DIH:CustomField2~}</div><div>{~SVH:CustomField2~}</div></div>"
+							"CustomLayoutTemplate": "<div id=\"custom\"><h5>I AM CUSTOM</h5>{~DI:Custom.CustomField1~}<div>{~SV:Custom.CustomField1^CustomTemplateField1~}</div> <div id=\"custom2\">{~DIH:CustomField2~}</div><div>{~SVH:CustomField2~}</div></div>"
 						}
 					]
 			}

package/package.json

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

package/source/templates/Pict-Template-DyanmicView-Value.js

@@ -45,28 +45,52 @@ class PictTemplateGetViewSchemaValue extends libPictTemplate
 	 * @param {object} pRecord - The record object.
 	 * @param {function} fCallback - The callback function.
 	 * @param {array} pContextArray - The context array.
-	 * @returns {string} - The rendered template.
+	 * @returns {string?} - The rendered template.
 	 */
 	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray)
 	{
-		const tmpMetatemplateGenerator = this.pict.providers.MetatemplateGenerator;
-		const tmpHash = pTemplateHash.trim();
+		const [ tmpSchemaAddress, tmpTemplateHash ] = pTemplateHash.trim().split('^');
 		/** @type{import('../views/Pict-View-Form-Metacontroller.js')} */
 		const metacontroller = this.pict.views.PictFormMetacontroller;
 		/** @type {import('./Pict-Template-ControlFromDynamicManifest.js').Manyfest} */
 		const manifest = metacontroller.manifest;
-		const descriptor = manifest.getDescriptor(tmpHash);
+		const descriptor = manifest.getDescriptor(tmpSchemaAddress);
 		if (!descriptor)
 		{
-			this.log.error(`PictTemplateGetViewSchemaValue: Cannot find descriptor for address [${tmpHash}]`);
+			this.log.error(`PictTemplateGetViewSchemaValue: Cannot find descriptor for address [${tmpSchemaAddress}]`);
 			return '';
 		}
 		/** @type {import('../views/Pict-View-DynamicForm.js')} */
 		const tmpView = this.pict.views[descriptor.PictForm.ViewHash];
 
-		const value = tmpView.getValueByHash(tmpHash);
+		const value = tmpView.getValueByHash(tmpSchemaAddress);
+
+		if (tmpTemplateHash)
+		{
+			const tmpRecord = { Value: value, ParentRecord: pRecord, View: tmpView, Descriptor: descriptor };
+			if (typeof fCallback !== 'function')
+			{
+				return this.pict.parseTemplateByHash(tmpTemplateHash, tmpRecord, null, pContextArray);
+			}
+			return this.pict.parseTemplateByHash(tmpTemplateHash, tmpRecord,
+				(pError, pValue) =>
+				{
+					if (pError)
+					{
+						return fCallback(pError, '');
+					}
+					return fCallback(null, pValue);
+				}, pContextArray);
+		}
 
-		return value ? String(value) : '';
+		if (typeof(fCallback) === 'function')
+		{
+			fCallback(null, value ? String(value) : '');
+		}
+		else
+		{
+			return value ? String(value) : '';
+		}
 	}
 }
 

package/source/templates/Pict-Template-DyanmicView-ValueByHash.js

@@ -49,24 +49,48 @@ class PictTemplateGetViewSchemaValueByHash extends libPictTemplate
 	 */
 	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray)
 	{
-		const tmpMetatemplateGenerator = this.pict.providers.MetatemplateGenerator;
-		const tmpHash = pTemplateHash.trim();
+		const [ tmpSchemaHash, tmpTemplateHash ] = pTemplateHash.trim().split('^');
 		/** @type{import('../views/Pict-View-Form-Metacontroller.js')} */
 		const metacontroller = this.pict.views.PictFormMetacontroller;
 		/** @type {import('./Pict-Template-ControlFromDynamicManifest.js').Manyfest} */
 		const manifest = metacontroller.manifest;
-		const descriptor = manifest.getDescriptorByHash(tmpHash);
+		const descriptor = manifest.getDescriptorByHash(tmpSchemaHash);
 		if (!descriptor)
 		{
-			this.log.error(`PictTemplateGetViewSchemaValueByHash: Cannot find descriptor for hash [${tmpHash}]`);
+			this.log.error(`PictTemplateGetViewSchemaValueByHash: Cannot find descriptor for address [${tmpSchemaHash}]`);
 			return '';
 		}
 		/** @type {import('../views/Pict-View-DynamicForm.js')} */
 		const tmpView = this.pict.views[descriptor.PictForm.ViewHash];
 
-		const value = tmpView.getValueByHash(tmpHash);
+		const value = tmpView.getValueByHash(tmpSchemaHash);
 
-		return value ? String(value) : '';
+		if (tmpTemplateHash)
+		{
+			const tmpRecord = { Value: value, ParentRecord: pRecord, View: tmpView, Descriptor: descriptor };
+			if (typeof fCallback !== 'function')
+			{
+				return this.pict.parseTemplateByHash(tmpTemplateHash, tmpRecord, null, pContextArray);
+			}
+			return this.pict.parseTemplateByHash(tmpTemplateHash, tmpRecord,
+				(pError, pValue) =>
+				{
+					if (pError)
+					{
+						return fCallback(pError, '');
+					}
+					return fCallback(null, pValue);
+				}, pContextArray);
+		}
+
+		if (typeof(fCallback) === 'function')
+		{
+			fCallback(null, value ? String(value) : '');
+		}
+		else
+		{
+			return value ? String(value) : '';
+		}
 	}
 }
 

package/types/source/templates/Pict-Template-DyanmicView-Value.d.ts

@@ -24,9 +24,9 @@ declare class PictTemplateGetViewSchemaValue extends libPictTemplate {
      * @param {object} pRecord - The record object.
      * @param {function} fCallback - The callback function.
      * @param {array} pContextArray - The context array.
-     * @returns {string} - The rendered template.
+     * @returns {string?} - The rendered template.
      */
-    renderAsync(pTemplateHash: string, pRecord: object, fCallback: Function, pContextArray: any[]): string;
+    renderAsync(pTemplateHash: string, pRecord: object, fCallback: Function, pContextArray: any[]): string | null;
 }
 import libPictTemplate = require("pict-template");
 //# sourceMappingURL=Pict-Template-DyanmicView-Value.d.ts.map

package/types/source/templates/Pict-Template-DyanmicView-Value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Template-DyanmicView-Value.d.ts","sourceRoot":"","sources":["../../../source/templates/Pict-Template-DyanmicView-Value.js"],"names":[],"mappings":";AAEA;;GAEG;AACH;IAEC;;;;OAIG;IACH,8DAaC;IATA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6FAA6F;IAC7F,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,eAAe,EAAE,OAAO,gCAAgC,CAAC,CAAA;KAAE,CAC/E;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAmBT;;;;;;;;OAQG;IACH,2BANW,MAAM,WACN,MAAM,8CAGJ,MAAM,CAsBlB;CACD"}
+{"version":3,"file":"Pict-Template-DyanmicView-Value.d.ts","sourceRoot":"","sources":["../../../source/templates/Pict-Template-DyanmicView-Value.js"],"names":[],"mappings":";AAEA;;GAEG;AACH;IAEC;;;;OAIG;IACH,8DAaC;IATA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6FAA6F;IAC7F,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,eAAe,EAAE,OAAO,gCAAgC,CAAC,CAAA;KAAE,CAC/E;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAmBT;;;;;;;;OAQG;IACH,2BANW,MAAM,WACN,MAAM,8CAGJ,MAAM,OAAC,CA8CnB;CACD"}

package/types/source/templates/Pict-Template-DyanmicView-ValueByHash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Template-DyanmicView-ValueByHash.d.ts","sourceRoot":"","sources":["../../../source/templates/Pict-Template-DyanmicView-ValueByHash.js"],"names":[],"mappings":";AAEA;;GAEG;AACH;IAEC;;;;OAIG;IACH,8DAaC;IATA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6FAA6F;IAC7F,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,eAAe,EAAE,OAAO,gCAAgC,CAAC,CAAA;KAAE,CAC/E;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAmBT;;;;;;;;OAQG;IACH,2BANW,MAAM,WACN,MAAM,8CAGJ,MAAM,CAsBlB;CACD"}
+{"version":3,"file":"Pict-Template-DyanmicView-ValueByHash.d.ts","sourceRoot":"","sources":["../../../source/templates/Pict-Template-DyanmicView-ValueByHash.js"],"names":[],"mappings":";AAEA;;GAEG;AACH;IAEC;;;;OAIG;IACH,8DAaC;IATA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6FAA6F;IAC7F,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,eAAe,EAAE,OAAO,gCAAgC,CAAC,CAAA;KAAE,CAC/E;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAmBT;;;;;;;;OAQG;IACH,2BANW,MAAM,WACN,MAAM,8CAGJ,MAAM,CA8ClB;CACD"}