pict-section-form 1.0.103 → 1.0.105

package/example_applications/postcard_example/Pict-Application-Postcard.js

@@ -76,6 +76,7 @@ class PostcardApplication extends libPictApplication
 
 		// Set a custom address for all the views to marshal to.
 		// This can also be set on specific views (same property)
+		this.pict.AppData.PostKard = { };
 		this.pict.views.PictFormMetacontroller.viewMarshalDestination = 'AppData.PostKard';
 
 		this.pict.views.PostcardNavigation.render()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.103",
+    "version": "1.0.105",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {
@@ -31,7 +31,7 @@
         "browser-env": "^3.3.0",
         "eslint": "^9.26.0",
         "jquery": "^3.7.1",
-        "pict": "^1.0.277",
+        "pict": "^1.0.281",
         "pict-application": "^1.0.27",
         "pict-service-commandlineutility": "^1.0.15",
         "quackage": "^1.0.42",

package/source/Pict-Section-Form.js

@@ -5,7 +5,7 @@ module.exports = require('./views/Pict-View-DynamicForm.js');
 //module.exports.default_configuration = require('./views/Pict-View-DynamicForm-DefaultConfiguration.json');
 
 // The dynamic application dependencies
-module.exports.PictDynamicApplicationService = require('./services/Pict-Service-DynamicApplication.js');
+module.exports.PictDynamicFormDependencyManager = require('./services/Pict-Service-DynamicFormDependencyManager.js');
 
 // The base provider class for form section templates; meant to be subclassed
 module.exports.PictFormTemplateProvider = require('./providers/Pict-Provider-DynamicTemplates.js');

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

@@ -176,7 +176,7 @@ class PictMetalist extends libPictProvider
 		}
 
 		// Now try to fetch the list data
-		let tmpListData = this.pict.views.PictFormMetacontroller.getValueByHash(pListObject.ListSourceAddress);
+		let tmpListData = this.pict.providers.DataBroker.getValueByHash(pListObject.ListSourceAddress);
 		if (!tmpListData)
 		{
 			//this.log.warn(`Dynamic MetaList Provider [${this.UUID}]::[${this.Hash}] failed to fetch the list data for PickList [${pListObject.Hash}]. Skipping.`);

package/source/services/{Pict-Service-DynamicApplication.js → Pict-Service-DynamicFormDependencyManager.js}

@@ -23,7 +23,7 @@ const libPictLayoutCustom = require('../providers/layouts/Pict-Layout-Custom.js'
 
 const libInformary = require('../providers/Pict-Provider-Informary.js');
 
-class PictDynamicApplication extends libFableServiceProviderBase
+class PictDynamicFormDependencyManager extends libFableServiceProviderBase
 {
 	constructor(pFable, pOptions, pServiceHash)
 	{
@@ -63,7 +63,7 @@ class PictDynamicApplication extends libFableServiceProviderBase
 	}
 }
 
-module.exports = PictDynamicApplication;
+module.exports = PictDynamicFormDependencyManager;
 
 /** @type {Record<string, any>} */
-PictDynamicApplication.default_configuration = { };
+PictDynamicFormDependencyManager.default_configuration = { };

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

@@ -63,7 +63,7 @@ class PictViewDynamicForm extends libPictViewClass
 		/** @type {import('pict') & { PictApplication: import('pict-application'), log: any; instantiateServiceProviderWithoutRegistration: (hash: string) => any; }} */
 		this.pict;
 
-		if (!this.fable.PictDynamicApplication)
+		if (!this.fable.PictDynamicFormDependencyManager)
 		{
 			throw new Error('PictSectionForm instantiation attempt without a PictDynamicApplication service in fable -- cannot instantiate.');
 		}

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

@@ -1,6 +1,6 @@
 const libPictViewClass = require('pict-view');
 
-const libPictDynamicApplication = require(`../services/Pict-Service-DynamicApplication.js`);
+const libPictDynamicFormDependencyManager = require(`../services/Pict-Service-DynamicFormDependencyManager.js`);
 const libPictViewDynamicForm = require('./Pict-View-DynamicForm.js');
 
 // TODO: Potentially create an internalized list of views for this to manage, separate from the pict.views object
@@ -26,9 +26,7 @@ class PictFormMetacontroller extends libPictViewClass
 		this.serviceType = 'PictFormMetacontroller';
 
 		// Load the dynamic application dependencies if they don't exist
-		this.fable.addAndInstantiateSingletonService('PictDynamicApplication', libPictDynamicApplication.default_configuration, libPictDynamicApplication);
-
-		this.viewMarshalDestination = 'AppData';
+		this.fable.addAndInstantiateSingletonService('PictDynamicFormDependencyManager', libPictDynamicFormDependencyManager.default_configuration, libPictDynamicFormDependencyManager);
 
 		this.lastRenderedViews = [];
 
@@ -37,6 +35,16 @@ class PictFormMetacontroller extends libPictViewClass
 		this.manifest = this.pict.manifest;
 	}
 
+	get viewMarshalDestination()
+	{
+		return this.pict.providers.DataBroker.marshalDestination;
+	}
+
+	set viewMarshalDestination(pValue)
+	{
+		this.pict.providers.DataBroker.marshalDestination = pValue;
+	}
+
 	/**
 	 * Marshals data from the view to the model, usually AppData (or configured data store).
 	 *
@@ -73,25 +81,6 @@ class PictFormMetacontroller extends libPictViewClass
 		return super.onMarshalToView();
 	}
 
-	/**
-	 * Retrieves the marshal destination object.  This is where the model data is stored.
-	 *
-	 * @returns {Object} The marshal destination object.
-	 */
-	getMarshalDestinationObject()
-	{
-		return this.manifest.getValueByHash(this, this.viewMarshalDestination);
-	}
-
-	/**
-	 * Gets a value by hash address.
-	 * @param {string} pHashAddress
-	 */
-	getValueByHash(pHashAddress)
-	{
-		return this.manifest.getValueByHash(this.getMarshalDestinationObject(), pHashAddress);
-	}
-
 	gatherInitialBundle(fCallback)
 	{
 		if (this.manifestDescription && this.manifestDescription.InitialBundle)
@@ -517,7 +506,7 @@ class PictFormMetacontroller extends libPictViewClass
 		if (this.options.AutoPopulateDefaultObject)
 		{
 			// Fill out the defaults at the marshal location if it doesn't exist
-			let tmpMarshalDestinationObject = tmpManifest.getValueAtAddress(this, this.viewMarshalDestination);
+			const tmpMarshalDestinationObject = this.pict.providers.DataBroker.marshalDestinationObject;
 			if (typeof(tmpMarshalDestinationObject) === 'object')
 			{
 				tmpManifest.populateDefaults(tmpMarshalDestinationObject);
@@ -605,8 +594,6 @@ class PictFormMetacontroller extends libPictViewClass
 			}
 		}
 
-		this.manifest = tmpManifest;
-
 		// Now see if there is custom CSS
 		for (let i = 0; i < tmpSectionList.length; i++)
 		{

package/test/PictSectionForm-Basic_tests.js

@@ -78,7 +78,7 @@ suite
 
 								tmpViewConfiguration.Manifests = { Section: manifestPostcard };
 
-								_Pict.addAndInstantiateSingletonService('PictDynamicApplication', libPictSectionForm.PictDynamicApplicationService.default_configuration, libPictSectionForm.PictDynamicApplicationService);
+								_Pict.addAndInstantiateSingletonService('PictDynamicFormDependencyManager', libPictSectionForm.PictDynamicFormDependencyManager.default_configuration, libPictSectionForm.PictDynamicFormDependencyManager);
 
 								let _PictSectionForm = _Pict.addView(tmpViewHash, tmpViewConfiguration, libPictSectionForm);
 

package/types/source/Pict-Section-Form.d.ts

@@ -1,7 +1,7 @@
 declare const _exports: {
     new (pFable: any, pOptions: any, pServiceHash: any): import("./views/Pict-View-DynamicForm.js");
     default_configuration: Record<string, any>;
-    PictDynamicApplicationService: typeof import("./services/Pict-Service-DynamicApplication.js");
+    PictDynamicFormDependencyManager: typeof import("./services/Pict-Service-DynamicFormDependencyManager.js");
     PictFormTemplateProvider: typeof import("./providers/Pict-Provider-DynamicTemplates.js");
     PictInputExtensionProvider: typeof import("./providers/Pict-Provider-InputExtension.js");
     PictFormMetacontroller: typeof import("./views/Pict-View-Form-Metacontroller.js");

package/types/source/services/{Pict-Service-DynamicApplication.d.ts → Pict-Service-DynamicFormDependencyManager.d.ts}

@@ -1,5 +1,5 @@
-export = PictDynamicApplication;
-declare class PictDynamicApplication {
+export = PictDynamicFormDependencyManager;
+declare class PictDynamicFormDependencyManager {
     constructor(pFable: any, pOptions: any, pServiceHash: any);
     /** @type {import('pict') & { addAndInstantiateSingletonService: (hash: string, options: any, prototype: any) => any }} */
     fable: import("pict") & {
@@ -10,7 +10,7 @@ declare class PictDynamicApplication {
     /** @type {string} */
     UUID: string;
 }
-declare namespace PictDynamicApplication {
+declare namespace PictDynamicFormDependencyManager {
     let default_configuration: Record<string, any>;
 }
-//# sourceMappingURL=Pict-Service-DynamicApplication.d.ts.map
+//# sourceMappingURL=Pict-Service-DynamicFormDependencyManager.d.ts.map

package/types/source/services/Pict-Service-DynamicFormDependencyManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Pict-Service-DynamicFormDependencyManager.d.ts","sourceRoot":"","sources":["../../../source/services/Pict-Service-DynamicFormDependencyManager.js"],"names":[],"mappings":";AAyBA;IAEC,2DAmCC;IA7BA,0HAA0H;IAC1H,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,iCAAiC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,GAAG,CAAA;KAAE,CAC5G;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IACR,qBAAqB;IACrB,MADW,MAAM,CACR;CAyBV;;+BAIU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC"}

package/types/source/views/Pict-View-Form-Metacontroller.d.ts

@@ -11,10 +11,11 @@ export = PictFormMetacontroller;
  */
 declare class PictFormMetacontroller extends libPictViewClass {
     constructor(pFable: any, pOptions: any, pServiceHash: any);
-    viewMarshalDestination: string;
     lastRenderedViews: any[];
     formTemplatePrefix: any;
     manifest: any;
+    set viewMarshalDestination(pValue: any);
+    get viewMarshalDestination(): any;
     /**
      * Marshals data from the view to the model, usually AppData (or configured data store).
      *
@@ -27,17 +28,6 @@ declare class PictFormMetacontroller extends libPictViewClass {
      * @returns {any} The result of the super.onMarshalToView() method.
      */
     onMarshalToView(): any;
-    /**
-     * Retrieves the marshal destination object.  This is where the model data is stored.
-     *
-     * @returns {Object} The marshal destination object.
-     */
-    getMarshalDestinationObject(): any;
-    /**
-     * Gets a value by hash address.
-     * @param {string} pHashAddress
-     */
-    getValueByHash(pHashAddress: string): any;
     gatherInitialBundle(fCallback: any): any;
     /**
      * Executes after the initialization of the object.

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

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AASA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAeC;IAPA,+BAAuC;IAEvC,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAGnC;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mCAGC;IAED;;;OAGG;IACH,6BAFW,MAAM,OAKhB;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA2BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,gDAGC;IAED,+CAGC;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAmHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED;;;;;OAKG;IACH,qEA+HC;IA3GA,yBAAiD;IA6GlD;;;OAGG;IACH,gCAFW,MAAM,QAgBhB;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBApoBjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}
+{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AASA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAaC;IALA,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAQnC,wCAGC;IARD,kCAGC;IAOD;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA2BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,gDAGC;IAED,+CAGC;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAmHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED;;;;;OAKG;IACH,qEA6HC;IAzGA,yBAAiD;IA2GlD;;;OAGG;IACH,gCAFW,MAAM,QAgBhB;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBAvnBjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}

package/types/source/services/Pict-Service-DynamicApplication.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Pict-Service-DynamicApplication.d.ts","sourceRoot":"","sources":["../../../source/services/Pict-Service-DynamicApplication.js"],"names":[],"mappings":";AAyBA;IAEC,2DAmCC;IA7BA,0HAA0H;IAC1H,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,iCAAiC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,GAAG,CAAA;KAAE,CAC5G;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IACR,qBAAqB;IACrB,MADW,MAAM,CACR;CAyBV;;+BAIU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC"}