manyfest 1.0.47 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manyfest",
-    "version": "1.0.47",
+    "version": "1.0.49",
     "description": "JSON Object Manifest for Data Description and Parsing",
     "main": "source/Manyfest.js",
     "scripts": {
@@ -46,10 +46,10 @@
         ]
     },
     "dependencies": {
-        "fable-serviceproviderbase": "^3.0.17"
+        "fable-serviceproviderbase": "^3.0.19"
     },
     "devDependencies": {
-        "quackage": "^1.0.51",
+        "quackage": "^1.0.59",
         "typescript": "^5.9.3"
     },
     "author": "steven velozo <steven@velozo.com>",

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -208,25 +208,27 @@ class ManyfestObjectAddressResolverGetValue
 					// Now get the value for each argument
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{
+						// Trim whitespace from the argument (e.g. after comma separation: `Book`, `List` --> ` `List``)
+						let tmpArgument = tmpFunctionArguments[i].trim();
 						// Resolve the values for each subsequent entry
 						// Check if the argument value is a string literal or a reference to an address
-						if ((tmpFunctionArguments[i].length >= 2)
+						if ((tmpArgument.length >= 2)
 							&&
-							((tmpFunctionArguments[i].charAt(0) == '"')
-							|| (tmpFunctionArguments[i].charAt(0) == "'")
-							|| (tmpFunctionArguments[i].charAt(0) == "`"))
+							((tmpArgument.charAt(0) == '"')
+							|| (tmpArgument.charAt(0) == "'")
+							|| (tmpArgument.charAt(0) == "`"))
 							&&
-							((tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == '"')
-							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "'")
-							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "`")))
+							((tmpArgument.charAt(tmpArgument.length-1) == '"')
+							|| (tmpArgument.charAt(tmpArgument.length-1) == "'")
+							|| (tmpArgument.charAt(tmpArgument.length-1) == "`")))
 						{
 							// This is a string literal
-							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length-1));
+							tmpArgumentValues.push(tmpArgument.substring(1, tmpArgument.length-1));
 						}
 						else
 						{
 							// This is a hash address
-							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
+							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpArgument));
 						}
 					}
 
@@ -440,25 +442,27 @@ class ManyfestObjectAddressResolverGetValue
 					// Now get the value for each argument
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{
+						// Trim whitespace from the argument (e.g. after comma separation: `Book`, `List` --> ` `List``)
+						let tmpArgument = tmpFunctionArguments[i].trim();
 						// Resolve the values for each subsequent entry
 						// Check if the argument value is a string literal or a reference to an address
-						if ((tmpFunctionArguments[i].length >= 2)
+						if ((tmpArgument.length >= 2)
 							&&
-							((tmpFunctionArguments[i].charAt(0) == '"')
-							|| (tmpFunctionArguments[i].charAt(0) == "'")
-							|| (tmpFunctionArguments[i].charAt(0) == "`"))
+							((tmpArgument.charAt(0) == '"')
+							|| (tmpArgument.charAt(0) == "'")
+							|| (tmpArgument.charAt(0) == "`"))
 							&&
-							((tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == '"')
-							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "'")
-							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "`")))
+							((tmpArgument.charAt(tmpArgument.length-1) == '"')
+							|| (tmpArgument.charAt(tmpArgument.length-1) == "'")
+							|| (tmpArgument.charAt(tmpArgument.length-1) == "`")))
 						{
 							// This is a string literal
-							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length-1));
+							tmpArgumentValues.push(tmpArgument.substring(1, tmpArgument.length-1));
 						}
 						else
 						{
 							// This is a hash address
-							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
+							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpArgument));
 						}
 					}
 

package/source/Manyfest-ObjectAddress-SetValue.js

@@ -70,16 +70,32 @@ class ManyfestObjectAddressSetValue
 			// 		MyValues[`Cost`]
 			//
 			// When we are passed SomeObject["Name"] this code below recurses as if it were SomeObject.Name
+			//
+			// Chained bracket elements look like this:
+			// 		MyValues[SubObject]['Property']
+			// 		MyValues[0]['Name']
+			//
+			// When we encounter chained brackets, resolve the first bracket pair and recurse with the remainder.
+			//
+			// Bracket-at-zero elements look like this (from chained bracket recursion):
+			// 		['Property']
+			// 		[0]
+			//
 			// The requirements to detect a boxed element are:
-			//    1) The start bracket is after character 0
-			if ((tmpBracketStartIndex > 0)
+			//    1) The start bracket exists
+			if ((tmpBracketStartIndex >= 0)
 			//    2) The end bracket has something between them
 				&& (tmpBracketStopIndex > tmpBracketStartIndex)
 			//    3) There is data
 				&& (tmpBracketStopIndex - tmpBracketStartIndex > 1))
 			{
-				// The "Name" of the Object contained too the left of the bracket
-				let tmpBoxedPropertyName = pAddress.substring(0, tmpBracketStartIndex).trim();
+				// Check for any remaining address after the closing bracket (chained brackets or dot paths)
+				let tmpRemainingAddress = pAddress.substring(tmpBracketStopIndex + 1);
+				if (tmpRemainingAddress.length > 0 && tmpRemainingAddress.charAt(0) === '.')
+				{
+					// Strip leading dot separator (e.g. [SubObject].Property --> Property)
+					tmpRemainingAddress = tmpRemainingAddress.substring(1);
+				}
 
 				// The "Reference" to the property within it, either an array element or object property
 				let tmpBoxedPropertyReference = pAddress.substring(tmpBracketStartIndex+1, tmpBracketStopIndex).trim();
@@ -87,6 +103,52 @@ class ManyfestObjectAddressSetValue
 				let tmpBoxedPropertyNumber = parseInt(tmpBoxedPropertyReference, 10);
 				let tmpIndexIsNumeric = !isNaN(tmpBoxedPropertyNumber);
 
+				// When the bracket is at position 0, there is no property name prefix -- we are
+				// accessing a property or index directly on the current object.  This happens when
+				// chained bracket resolution recurses with a remainder like ['Property'].
+				if (tmpBracketStartIndex === 0)
+				{
+					if (tmpIndexIsNumeric)
+					{
+						// Array access at position 0: [0], [1], etc.
+						if (!Array.isArray(pObject))
+						{
+							return false;
+						}
+						while (pObject.length < (tmpBoxedPropertyNumber + 1))
+						{
+							pObject.push({});
+						}
+						if (tmpRemainingAddress.length > 0)
+						{
+							return this.setValueAtAddress(pObject[tmpBoxedPropertyNumber], tmpRemainingAddress, pValue);
+						}
+						pObject[tmpBoxedPropertyNumber] = pValue;
+						return true;
+					}
+					else
+					{
+						// Named property access at position 0: ['Property'], ["Name"], etc.
+						tmpBoxedPropertyReference = this.cleanWrapCharacters('"', tmpBoxedPropertyReference);
+						tmpBoxedPropertyReference = this.cleanWrapCharacters('`', tmpBoxedPropertyReference);
+						tmpBoxedPropertyReference = this.cleanWrapCharacters("'", tmpBoxedPropertyReference);
+
+						if (tmpRemainingAddress.length > 0)
+						{
+							if (!(tmpBoxedPropertyReference in pObject) || typeof(pObject[tmpBoxedPropertyReference]) !== 'object')
+							{
+								pObject[tmpBoxedPropertyReference] = {};
+							}
+							return this.setValueAtAddress(pObject[tmpBoxedPropertyReference], tmpRemainingAddress, pValue);
+						}
+						pObject[tmpBoxedPropertyReference] = pValue;
+						return true;
+					}
+				}
+
+				// The "Name" of the Object contained to the left of the bracket
+				let tmpBoxedPropertyName = pAddress.substring(0, tmpBracketStartIndex).trim();
+
 				if (pObject[tmpBoxedPropertyName] == null)
 				{
 					if (tmpIndexIsNumeric)
@@ -132,8 +194,13 @@ class ManyfestObjectAddressSetValue
 						pObject[tmpBoxedPropertyName][tmpBoxedPropertyReference] = {};
 					}
 
-					// Return the value in the property
-					//TODO: For cases where we have chained [][] properties, this needs to recurse somehow
+					// If there is remaining address after this bracket pair, recurse into the resolved subobject
+					if (tmpRemainingAddress.length > 0)
+					{
+						return this.setValueAtAddress(pObject[tmpBoxedPropertyName][tmpBoxedPropertyReference], tmpRemainingAddress, pValue);
+					}
+
+					// No remaining address -- set the value directly
 					pObject[tmpBoxedPropertyName][tmpBoxedPropertyReference] = pValue;
 					return true;
 				}
@@ -145,6 +212,12 @@ class ManyfestObjectAddressSetValue
 						pObject[tmpBoxedPropertyName].push({});
 					}
 
+					// If there is remaining address after this bracket pair, recurse into the resolved element
+					if (tmpRemainingAddress.length > 0)
+					{
+						return this.setValueAtAddress(pObject[tmpBoxedPropertyName][tmpBoxedPropertyNumber], tmpRemainingAddress, pValue);
+					}
+
 					pObject[tmpBoxedPropertyName][tmpBoxedPropertyNumber] = pValue;
 					return true;
 				}
@@ -173,13 +246,49 @@ class ManyfestObjectAddressSetValue
 			//
 			// When we are passed SomeObject["Name"] this code below recurses as if it were SomeObject.Name
 			// The requirements to detect a boxed element are:
-			//    1) The start bracket is after character 0
-			if ((tmpBracketStartIndex > 0)
+			//    1) The start bracket exists
+			if ((tmpBracketStartIndex >= 0)
 			//    2) The end bracket has something between them
 				&& (tmpBracketStopIndex > tmpBracketStartIndex)
 			//    3) There is data
 				&& (tmpBracketStopIndex - tmpBracketStartIndex > 1))
 			{
+				// When the bracket is at position 0, there is no property name prefix -- we are
+				// accessing a property or index directly on the current object.  This happens when
+				// chained bracket resolution recurses with a segment like ['Nested'].
+				if (tmpBracketStartIndex === 0)
+				{
+					let tmpBoxedPropertyReference = tmpSubObjectName.substring(1, tmpBracketStopIndex).trim();
+					let tmpBoxedPropertyNumber = parseInt(tmpBoxedPropertyReference, 10);
+
+					if (!isNaN(tmpBoxedPropertyNumber))
+					{
+						// Array access: [0], [1], etc.
+						if (!Array.isArray(pObject))
+						{
+							return false;
+						}
+						while (pObject.length < (tmpBoxedPropertyNumber + 1))
+						{
+							pObject.push({});
+						}
+						return this.setValueAtAddress(pObject[tmpBoxedPropertyNumber], tmpNewAddress, pValue);
+					}
+					else
+					{
+						// Named property access: ['Nested'], ["Name"], etc.
+						tmpBoxedPropertyReference = this.cleanWrapCharacters('"', tmpBoxedPropertyReference);
+						tmpBoxedPropertyReference = this.cleanWrapCharacters('`', tmpBoxedPropertyReference);
+						tmpBoxedPropertyReference = this.cleanWrapCharacters("'", tmpBoxedPropertyReference);
+
+						if (!(tmpBoxedPropertyReference in pObject) || typeof(pObject[tmpBoxedPropertyReference]) !== 'object')
+						{
+							pObject[tmpBoxedPropertyReference] = {};
+						}
+						return this.setValueAtAddress(pObject[tmpBoxedPropertyReference], tmpNewAddress, pValue);
+					}
+				}
+
 				let tmpBoxedPropertyName = tmpSubObjectName.substring(0, tmpBracketStartIndex).trim();
 
 				let tmpBoxedPropertyReference = tmpSubObjectName.substring(tmpBracketStartIndex+1, tmpBracketStopIndex).trim();
@@ -187,6 +296,30 @@ class ManyfestObjectAddressSetValue
 				let tmpBoxedPropertyNumber = parseInt(tmpBoxedPropertyReference, 10);
 				let tmpIndexIsNumeric = !isNaN(tmpBoxedPropertyNumber);
 
+				// Check for chained brackets within this segment (e.g. _Object[SubObject]['Nested'])
+				// Any remaining address after the first ] within the segment name needs to be
+				// prepended to tmpNewAddress so it is not lost during recursion.
+				let tmpSegmentRemainder = tmpSubObjectName.substring(tmpBracketStopIndex + 1);
+				if (tmpSegmentRemainder.length > 0)
+				{
+					// Prepend the remainder to the new address
+					// e.g. if segment was _Object[SubObject]['Nested'] and newAddress was Deep,
+					//      then combined address becomes ['Nested'].Deep
+					if (tmpNewAddress.length > 0)
+					{
+						tmpNewAddress = tmpSegmentRemainder + '.' + tmpNewAddress;
+					}
+					else
+					{
+						tmpNewAddress = tmpSegmentRemainder;
+					}
+					// Strip leading dot if present
+					if (tmpNewAddress.charAt(0) === '.')
+					{
+						tmpNewAddress = tmpNewAddress.substring(1);
+					}
+				}
+
 				//if (typeof(pObject[tmpBoxedPropertyName]) !== 'object')
 				if (pObject[tmpBoxedPropertyName] == null)
 				{

package/test/Manyfest_Object_Read_tests.js

@@ -324,6 +324,71 @@ suite
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.SillyFUNCTIONNOTFOUND().Stores[0]')).to.equal(false);
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.BrokenObject().Stores[0]')).to.equal(false);
 
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Function arguments with whitespace after comma separators',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest();
+
+						let tmpReceivedArgs = [];
+						let _MockObject = (
+							{
+								"Name": "TestValue",
+								"Category": "Books",
+								"SingleArgFunction": (pValue) => { return `Got: ${pValue}`; },
+								"MultiArgFunction": (pArg1, pArg2) => { tmpReceivedArgs = [pArg1, pArg2]; return `${pArg1}:${pArg2}`; },
+								"ThreeArgFunction": (pArg1, pArg2, pArg3) => { return `${pArg1}-${pArg2}-${pArg3}`; },
+								"Nested":
+									{
+										"Value": 42,
+										"MultiArgMethod": function(pArg1, pArg2) { return `${pArg1}+${pArg2}`; }
+									}
+							});
+
+						// Baseline: no spaces after commas (already worked)
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction("Book","List")'))
+							.to.equal('Book:List');
+
+						// THE BUG: spaces after comma with backtick-delimited string literals
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction(`Book`, `List`)'))
+							.to.equal('Book:List');
+
+						// Spaces after comma with double-quoted string literals
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction("Book", "List")'))
+							.to.equal('Book:List');
+
+						// Spaces after comma with single-quoted string literals
+						Expect(_Manyfest.getValueAtAddress(_MockObject, "MultiArgFunction('Book', 'List')"))
+							.to.equal('Book:List');
+
+						// Mixed quote styles with spaces
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction("Book", `List`)'))
+							.to.equal('Book:List');
+
+						// Multiple spaces after comma
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction(`Book`,   `List`)'))
+							.to.equal('Book:List');
+
+						// Spaces with address references (not string literals)
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction(Name, Category)'))
+							.to.equal('TestValue:Books');
+
+						// Mixed: string literal with space, then address reference with space
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'MultiArgFunction("Hello", Name)'))
+							.to.equal('Hello:TestValue');
+
+						// Three arguments with spaces
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ThreeArgFunction(`A`, `B`, `C`)'))
+							.to.equal('A-B-C');
+
+						// Non-terminal function path with spaced arguments
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Nested.MultiArgMethod(`X`, `Y`)'))
+							.to.equal('X+Y');
+
 						fTestComplete();
 					}
 				);

package/test/Manyfest_Object_Write_tests.js

@@ -195,8 +195,7 @@ suite
 						fTestComplete();
 					}
 				);
-				//TODO: known broken case for multiple bracketed properties
-				test.skip
+				test
 				(
 					'Indexed subobject are settable double brackets',
 					(fTestComplete)=>
@@ -211,6 +210,79 @@ suite
 						fTestComplete();
 					}
 				);
+				test
+				(
+					'Chained brackets with double-quoted inner bracket',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest({});
+						let _SimpleObject = {};
+						_Manyfest.setValueAtAddress(_SimpleObject, `_Object[SubObject]["Property"]`, '456');
+						Expect(_Manyfest.getValueAtAddress(_SimpleObject, `_Object.SubObject.Property`))
+							.to.equal('456');
+						Expect(_SimpleObject._Object.SubObject.Property)
+							.to.equal('456');
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Chained brackets with quoted outer and quoted inner',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest({});
+						let _SimpleObject = {};
+						_Manyfest.setValueAtAddress(_SimpleObject, `_Object["SubObject"]['Property']`, '789');
+						Expect(_Manyfest.getValueAtAddress(_SimpleObject, `_Object.SubObject.Property`))
+							.to.equal('789');
+						Expect(_SimpleObject._Object.SubObject.Property)
+							.to.equal('789');
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Chained bracket then dot path',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest({});
+						let _SimpleObject = {};
+						_Manyfest.setValueAtAddress(_SimpleObject, `_Object[SubObject]['Nested'].Deep`, 'abc');
+						Expect(_Manyfest.getValueAtAddress(_SimpleObject, `_Object.SubObject.Nested.Deep`))
+							.to.equal('abc');
+						Expect(_SimpleObject._Object.SubObject.Nested.Deep)
+							.to.equal('abc');
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Array index then chained bracket',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest({});
+						let _SimpleObject = { Items: [{}, {}, {}] };
+						_Manyfest.setValueAtAddress(_SimpleObject, `Items[1]['Name']`, 'Second');
+						Expect(_Manyfest.getValueAtAddress(_SimpleObject, `Items[1].Name`))
+							.to.equal('Second');
+						Expect(_SimpleObject.Items[1].Name)
+							.to.equal('Second');
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Bracket at position zero (direct property access)',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest({});
+						let _SimpleObject = {};
+						_Manyfest.setValueAtAddress(_SimpleObject, `['DirectBracket']`, 'direct');
+						Expect(_SimpleObject.DirectBracket)
+							.to.equal('direct');
+						fTestComplete();
+					}
+				);
 			}
 		);
 	}

package/.babelrc

@@ -1,3 +0,0 @@
-{
-	"presets": ["@babel/preset-env"]
-}

package/.browserslistrc

@@ -1 +0,0 @@
-> 0.01%