pict-section-form 1.2.3 → 1.3.0

package/eslint.config.mjs

@@ -3,8 +3,8 @@ import pluginJs from "@eslint/js";
 
 
 export default [
-	{ files: ["source/**"], languageOptions: { sourceType: "commonjs" } },
-	{ languageOptions: { globals: { ...globals.browser, ...globals.mocha, } } },
+	{ files: ["source/**", "test/**"], languageOptions: { sourceType: "commonjs" } },
+	{ languageOptions: { globals: { ...globals.browser, ...globals.mocha, ...globals.node, } } },
 	pluginJs.configs.recommended,
 	{ rules: { "no-prototype-builtins": "off", "no-unused-vars": "warn", "no-case-declarations": "warn" } },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {
@@ -21,7 +21,8 @@
         "build": "npx quack build",
         "test": "npx quack test",
         "lint": "eslint source/**",
-        "types": "tsc -p .",
+        "types": "tsc -p ./tsconfig.build.json",
+        "check": "tsc -p ./tsconfig.json --noEmit",
         "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t pict-section-form-image:local",
         "docker-dev-run": "docker run -it -d --name pict-section-form-dev -p 48888:8080 -p 49999:9999 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/pict-section-form\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" pict-section-form-image:local",
         "docker-dev-shell": "docker exec -it pict-section-form-dev /bin/bash"
@@ -31,6 +32,9 @@
     "license": "MIT",
     "devDependencies": {
         "@eslint/js": "^9.39.2",
+        "@types/chai": "^4.3.20",
+        "@types/mocha": "^10.0.10",
+        "@types/node": "^22.19.21",
         "browser-env": "^3.3.0",
         "eslint": "^9.39.2",
         "jquery": "^4.0.0",
@@ -49,6 +53,7 @@
         "pict-provider": "^1.0.13",
         "pict-section-excalidraw": "^1.0.3",
         "pict-section-markdowneditor": "^1.0.19",
+        "pict-section-objecteditor": "^1.0.3",
         "pict-section-tuigrid": "^1.0.31",
         "pict-template": "^1.0.15",
         "pict-view": "^1.0.68"

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

@@ -19,6 +19,7 @@ const libInputLink = require('./inputs/Pict-Provider-Input-Link.js');
 const libInputTemplatedEntityLookup = require('./inputs/Pict-Provider-Input-TemplatedEntityLookup.js');
 const libInputChart = require('./inputs/Pict-Provider-Input-Chart.js');
 const libInputTabularTriggerGroup = require('./inputs/Pict-Provider-Input-TabularTriggerGroup.js');
+const libInputObjectEditor = require('./inputs/Pict-Provider-Input-ObjectEditor.js');
 
 /** @type {Record<string, any>} */
 const _DefaultProviderConfiguration = (
@@ -82,6 +83,7 @@ class PictDynamicSolver extends libPictProvider
 		this.pict.addProviderSingleton('Pict-Input-Link', libInputLink.default_configuration, libInputLink);
 		this.pict.addProviderSingleton('Pict-Input-Chart', libInputChart.default_configuration, libInputChart);
 		this.pict.addProviderSingleton('Pict-Input-TabularTriggerGroup', libInputTabularTriggerGroup.default_configuration, libInputTabularTriggerGroup);
+		this.pict.addProviderSingleton('Pict-Input-ObjectEditor', libInputObjectEditor.default_configuration, libInputObjectEditor);
 	}
 
 	logSolveOutcome(pSolveOutcome)

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

@@ -96,7 +96,7 @@ class PictDynamicFormsInformary extends libPictProvider
 	 *
 	 * @param {object} pAppStateData - The application state data object to marshal the form data to.
 	 * @param {string} pFormHash - The form hash representing the form elements.
-	 * @param {object} pManifest - The manifest object used to map form data to the application state data.
+	 * @param {import('manyfest')} pManifest - The manifest object used to map form data to the application state data.
 	 * @param {string} [pDatum] - The datum hash to pull in.  If not provided, all data is marshalled.
 	 * @param {number|string} [pRecordIndex] - The record index to pull in.  If not provided, all data is marshalled.
 	 */
@@ -120,19 +120,19 @@ class PictDynamicFormsInformary extends libPictProvider
 	 * Marshals a specific form element's data to the application state data.
 	 *
 	 * @param {string} pFormHash - The hash of the form.
-	 * @param {HTMLElement} tmpFormElement - The form element to marshal.
-	 * @param {Object} tmpManifest - The manifest object to set values.
+	 * @param {HTMLElement} pFormElement - The form element to marshal.
+	 * @param {import('manyfest')} pManifest - The manifest object to set values.
 	 * @param {Object} pAppStateData - The application state data object.
 	 * @param {any} [pDatumFilter] - Optional filter for datum address.
 	 * @param {any} [pRecordIndexFilter] - Optional filter for record index.
 	 * @returns {boolean} - Returns false if the element falls outside the filters or if the browser value is null.
 	 */
-	marshalSpecicificFormElementToData(pFormHash, tmpFormElement, tmpManifest, pAppStateData, pDatumFilter, pRecordIndexFilter)
+	marshalSpecicificFormElementToData(pFormHash, pFormElement, pManifest, pAppStateData, pDatumFilter, pRecordIndexFilter)
 	{
-		const tmpDatumAddress = tmpFormElement.getAttribute('data-i-datum');
+		const tmpDatumAddress = pFormElement.getAttribute('data-i-datum');
 
-		const tmpContainerAddress = tmpFormElement.getAttribute('data-i-container');
-		const tmpIndex = tmpFormElement.getAttribute('data-i-index');
+		const tmpContainerAddress = pFormElement.getAttribute('data-i-container');
+		const tmpIndex = pFormElement.getAttribute('data-i-index');
 
 		// Process the filters
 		// TODO: Now that this is a function, having these filters here is not good.  We need to move this to the caller.  But the above getAttribute is required... rethink filtering?
@@ -160,13 +160,14 @@ class PictDynamicFormsInformary extends libPictProvider
 
 		if (!tmpContainerAddress)
 		{
-			tmpManifest.setValueAtAddress(pAppStateData, tmpDatumAddress, tmpBrowserValue);
+			pManifest.setValueAtAddress(pAppStateData, tmpDatumAddress, tmpBrowserValue);
 		}
 		else
 		{
 			// Compose the address .. right now only arrays
-			tmpManifest.setValueAtAddress(pAppStateData, this.getComposedContainerAddress(tmpContainerAddress, tmpIndex, tmpDatumAddress), tmpBrowserValue);
-		}		
+			pManifest.setValueAtAddress(pAppStateData, this.getComposedContainerAddress(tmpContainerAddress, tmpIndex, tmpDatumAddress), tmpBrowserValue);
+		}
+		return true;
 	}
 
 	/**
@@ -174,7 +175,7 @@ class PictDynamicFormsInformary extends libPictProvider
 	 *
 	 * @param {object} pAppStateData - The application state data to marshal into the form.  Usually AppData but can be other objects.
 	 * @param {string} pFormHash - The hash of the form to marshal data into.  This is the data-i-form attribute.
-	 * @param {object} pManifest - The manifest object.  If not provided, the generic manifest is used.
+	 * @param {import('manyfest')} pManifest - The manifest object.  If not provided, the generic manifest is used.
 	 */
 	marshalDataToForm(pAppStateData, pFormHash, pManifest)
 	{
@@ -185,20 +186,19 @@ class PictDynamicFormsInformary extends libPictProvider
 		// Enumerate the form elements, and put data in them for each address
 		for (let i = 0; i < tmpFormElements.length; i++)
 		{
-			this.marshalSpecificElementDataToForm(pFormHash, tmpFormElements[i], tmpManifest, pAppStateData);
+			this.marshalSpecificElementDataToForm(tmpFormElements[i], tmpManifest, pAppStateData);
 		}
 	}
 
 	/**
 	 * Marshals specific element data to a form.
 	 *
-	 * @param {string} pFormHash - The hash of the form.
 	 * @param {HTMLElement} pFormElement - The form element to marshal data to.
-	 * @param {Object} tmpManifest - The manifest object containing data retrieval methods.
-	 * @param {Object} pAppStateData - The application state data.
+	 * @param {import('manyfest')} pManifest - The manifest object containing data retrieval methods.
+	 * @param {Record<string, any>} pAppStateData - The application state data.
 	 * @returns {boolean} Returns false if the form element does not have a datum address.
 	 */
-	marshalSpecificElementDataToForm(pFormHash, pFormElement, tmpManifest, pAppStateData)
+	marshalSpecificElementDataToForm(pFormElement, pManifest, pAppStateData)
 	{
 		let tmpDatumAddress = pFormElement.getAttribute('data-i-datum');
 
@@ -213,7 +213,7 @@ class PictDynamicFormsInformary extends libPictProvider
 
 		if (!tmpContainerAddress)
 		{
-			let tmpAppStateValue = tmpManifest.getValueAtAddress(pAppStateData, tmpDatumAddress);
+			let tmpAppStateValue = pManifest.getValueAtAddress(pAppStateData, tmpDatumAddress);
 
 			if (this.pict.LogNoisiness > 3)
 			{
@@ -222,12 +222,12 @@ class PictDynamicFormsInformary extends libPictProvider
 
 			if (tmpAppStateValue != null)
 			{
-				this.pict.ContentAssignment.assignContent(this.getContentBrowserAddress(pFormHash, tmpDatumAddress, tmpContainerAddress, tmpIndex), tmpAppStateValue);
+				this.pict.ContentAssignment.assignContent(pFormElement, tmpAppStateValue);
 			}
 		}
 		else
 		{
-			let tmpAppStateValue = tmpManifest.getValueAtAddress(pAppStateData, this.getComposedContainerAddress(tmpContainerAddress, tmpIndex, tmpDatumAddress));
+			let tmpAppStateValue = pManifest.getValueAtAddress(pAppStateData, this.getComposedContainerAddress(tmpContainerAddress, tmpIndex, tmpDatumAddress));
 
 			if (this.pict.LogNoisiness > 3)
 			{
@@ -236,14 +236,15 @@ class PictDynamicFormsInformary extends libPictProvider
 
 			if (tmpAppStateValue != null)
 			{
-				this.pict.ContentAssignment.assignContent(this.getContentBrowserAddress(pFormHash, tmpDatumAddress, tmpContainerAddress, tmpIndex), tmpAppStateValue);
+				this.pict.ContentAssignment.assignContent(pFormElement, tmpAppStateValue);
 			}
 		}
+		return true;
 	}
 
 	/**
 	 * Manually marshals data to a form by assigning content based on context in the descriptor.
-	 * @param {object} pInput - The input manifest descriptor to marshal data to form from.
+	 * @param {Record<string, any>} pInput - The input manifest descriptor to marshal data to form from.
 	 * @returns boolean if assignment was successful
 	 */
 	manualMarshalDataToFormByInput(pInput)

package/source/providers/dynamictemplates/Pict-DynamicTemplates-DefaultFormTemplates-ReadOnly.js

@@ -186,6 +186,16 @@ Glug glug glug Oo... -->
 					<!-- DataType DateTime {~D:Record.Hash~} {~D:Record.DataType~} -->
 					<input disabled type="hidden" {~D:Record.Macro.InputFullProperties~} value="">
 					<span>{~D:Record.Name~}:</span> <input disabled {~D:Record.Macro.ControlAttr~} id="DATETIME-INPUT-FOR-{~D:Record.Macro.RawHTMLID~}" onchange="{~D:Record.Macro.DataRequestFunction~}" type="datetime-local" value="" />
+`
+		},
+		{
+			"HashPostfix": "-Template-Input-InputType-ObjectEditor",
+			"DefaultInputExtensions": ["Pict-Input-ObjectEditor"],
+			"Template": /*HTML*/`
+					<!-- InputType ObjectEditor {~D:Record.Hash~} {~D:Record.DataType~} -->
+					<input disabled type="hidden" {~D:Record.Macro.InputFullProperties~} {~D:Record.Macro.InputChangeHandler~} value="">
+					<span>{~D:Record.Name~}:</span>
+					<div {~D:Record.Macro.ControlAttr~} id="DISPLAY-FOR-{~D:Record.Macro.RawHTMLID~}" class="pict-section-form-objecteditor pict-section-form-objecteditor-readonly"></div>
 `
 		},
 		/*

package/source/providers/dynamictemplates/Pict-DynamicTemplates-DefaultFormTemplates.js

@@ -324,6 +324,16 @@ Glug glug glug Oo... -->
 					<input type="hidden" {~D:Record.Macro.InputFullProperties~} {~D:Record.Macro.InputChangeHandler~} value="">
 					<span>{~D:Record.Name~}:</span>
 					<div {~D:Record.Macro.ControlAttr~} id="DISPLAY-FOR-{~D:Record.Macro.RawHTMLID~}" class="pict-section-form-diagram"></div>
+`
+		},
+		{
+			"HashPostfix": "-Template-Input-InputType-ObjectEditor",
+			"DefaultInputExtensions": ["Pict-Input-ObjectEditor"],
+			"Template": /*HTML*/`
+					<!-- InputType ObjectEditor {~D:Record.Hash~} {~D:Record.DataType~} -->
+					<input type="hidden" {~D:Record.Macro.InputFullProperties~} {~D:Record.Macro.InputChangeHandler~} value="">
+					<span>{~D:Record.Name~}:</span>
+					<div {~D:Record.Macro.ControlAttr~} id="DISPLAY-FOR-{~D:Record.Macro.RawHTMLID~}" class="pict-section-form-objecteditor"></div>
 `
 		},
 		/*
@@ -555,6 +565,19 @@ Glug glug glug Oo... -->
 					<span>{~D:Record.PictForm.ExtraDescription~}</span>
 					<div {~D:Record.Macro.ControlAttr~} id="DISPLAY-FOR-{~D:Record.Macro.RawHTMLID~}" class="pict-section-form-diagram"></div>
 				</div>
+`
+		},
+		{
+			"HashPostfix": "-VerticalTemplate-Input-InputType-ObjectEditor",
+			"DefaultInputExtensions": ["Pict-Input-ObjectEditor"],
+			"Template": /*HTML*/`
+					<!-- InputType ObjectEditor {~D:Record.Hash~} {~D:Record.DataType~} -->
+				<div class="pict-form-vertical-input">
+					<input type="hidden" {~D:Record.Macro.InputFullProperties~} {~D:Record.Macro.InputChangeHandler~} value="">
+					<label class="pict-form-label">{~D:Record.Name~}</label>
+					<span>{~D:Record.PictForm.ExtraDescription~}</span>
+					<div {~D:Record.Macro.ControlAttr~} id="DISPLAY-FOR-{~D:Record.Macro.RawHTMLID~}" class="pict-section-form-objecteditor"></div>
+				</div>
 `
 		},
 		/*