manyfest 1.0.43 → 1.0.44

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -205,8 +205,6 @@ class ManyfestObjectAddressResolverGetValue
 				{
 					let tmpArgumentValues = [];
 
-					let tmpRootObject = (typeof(pRootObject) == 'undefined') ? pObject : pRootObject;
-
 					// Now get the value for each argument
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{
@@ -358,13 +356,13 @@ class ManyfestObjectAddressResolverGetValue
 			else
 			{
 				// Now is the point in recursion to return the value in the address
-				if (typeof(pObject[pAddress]) != null)
+				if (typeof(pObject[pAddress]) != 'undefined')
 				{
 					return pObject[pAddress];
 				}
 				else
 				{
-					return null;
+					return undefined;
 				}
 			}
 		}
@@ -439,8 +437,6 @@ class ManyfestObjectAddressResolverGetValue
 				{
 					let tmpArgumentValues = [];
 
-					let tmpRootObject = (typeof(pRootObject) == 'undefined') ? pObject : pRootObject;
-
 					// Now get the value for each argument
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{

package/source/Manyfest-ObjectAddress-Parser.js

@@ -31,7 +31,7 @@ module.exports = {
 		let tmpEnclosureStartSymbolMap = (typeof(pEnclosureStartSymbolMap) == 'object') ? pEnclosureStartSymbolMap : DEFAULT_START_SYMBOL_MAP;
 		let tmpEnclosureEndSymbolMap = (typeof(pEnclosureEndSymbolMap) == 'object') ? pEnclosureEndSymbolMap : DEFAULT_END_SYMBOL_MAP;
 
-		if (pString.length < 1)
+		if (tmpString.length < 1)
 		{
 			return 0;
 		}
@@ -87,7 +87,7 @@ module.exports = {
 		let tmpEnclosureStartSymbolMap = (typeof(pEnclosureStartSymbolMap) == 'object') ? pEnclosureStartSymbolMap : DEFAULT_START_SYMBOL_MAP;
 		let tmpEnclosureEndSymbolMap = (typeof(pEnclosureEndSymbolMap) == 'object') ? pEnclosureEndSymbolMap : DEFAULT_END_SYMBOL_MAP;
 
-		if (pString.length < 1)
+		if (tmpString.length < 1)
 		{
 			return '';
 		}
@@ -145,7 +145,7 @@ module.exports = {
 		let tmpCurrentSegmentStart = 0;
 		let tmpSegmentList = [];
 
-		if (pString.length < 1)
+		if (tmpString.length < 1)
 		{
 			return tmpSegmentList;
 		}

package/source/Manyfest-ObjectAddress-SetValue.js

@@ -4,6 +4,8 @@
 let libSimpleLog = require('./Manyfest-LogToConsole.js');
 let fCleanWrapCharacters = require('./Manyfest-CleanWrapCharacters.js');
 
+let _MockFable = { DataFormat: require('./Manyfest-ObjectAddress-Parser.js') };
+
 /**
 * Object Address Resolver - SetValue
 *
@@ -53,9 +55,10 @@ class ManyfestObjectAddressSetValue
 		// Make sure pAddress is a string
 		if (typeof(pAddress) != 'string') return false;
 
-		let tmpSeparatorIndex = pAddress.indexOf('.');
+		// Use enclosure-aware parser to find the first segment separator
+		let tmpAddressPartBeginning = _MockFable.DataFormat.stringGetFirstSegment(pAddress);
 
-		if (tmpSeparatorIndex == -1)
+		if (tmpAddressPartBeginning.length == pAddress.length)
 		{
 			// Check if it's a boxed property
 			let tmpBracketStartIndex = pAddress.indexOf('[');
@@ -155,8 +158,8 @@ class ManyfestObjectAddressSetValue
 		}
 		else
 		{
-			let tmpSubObjectName = pAddress.substring(0, tmpSeparatorIndex);
-			let tmpNewAddress = pAddress.substring(tmpSeparatorIndex+1);
+			let tmpSubObjectName = tmpAddressPartBeginning;
+			let tmpNewAddress = pAddress.substring(tmpAddressPartBeginning.length+1);
 
 			// Test if the tmpNewAddress is an array or object
 			// Check if it's a boxed property

package/source/Manyfest-ParseConditionals.js

@@ -27,20 +27,16 @@ const testCondition = (pManyfest, pRecord, pSearchAddress, pSearchComparator, pV
 	{
 		case 'TRUE':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === true);
-			break;
 		case 'FALSE':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === false);
-			break;
 		case 'LNGT':
 		case 'LENGTH_GREATER_THAN':
 			switch(typeof(pManyfest.getValueAtAddress(pRecord, pSearchAddress)))
 			{
 				case 'string':
 					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length > pValue);
-					break;
 				case 'object':
 					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length > pValue);
-					break;
 				default:
 					return false;
 					break;
@@ -52,10 +48,8 @@ const testCondition = (pManyfest, pRecord, pSearchAddress, pSearchComparator, pV
 			{
 				case 'string':
 					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length < pValue);
-					break;
 				case 'object':
 					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length < pValue);
-					break;
 				default:
 					return false;
 					break;
@@ -72,26 +66,19 @@ const testCondition = (pManyfest, pRecord, pSearchAddress, pSearchComparator, pV
 		// 	break;
 		case '!=':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) != pValue);
-			break;
 		case '<':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) < pValue);
-			break;
 		case '>':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) > pValue);
-			break;
 		case '<=':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) <= pValue);
-			break;
 		case '>=':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) >= pValue);
-			break;
 		case '===':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === pValue);
-			break;
 		case '==':
 		default:
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) == pValue);
-			break;
 	}
 };
 

package/source/Manyfest.js

@@ -229,11 +229,8 @@ class Manyfest extends libFableServiceProviderBase
 		{
 			if (typeof(tmpManifest.HashTranslations) === 'object')
 			{
-				for (let i = 0; i < tmpManifest.HashTranslations.length; i++)
-				{
-					// Each translation is
-					//FIXME: ?????????
-				}
+				// HashTranslations is serialized as a plain object of source:target pairs
+				this.hashTranslations.addTranslation(tmpManifest.HashTranslations);
 			}
 		}
 	}
@@ -406,13 +403,15 @@ class Manyfest extends libFableServiceProviderBase
 
 	lintAddress(pAddress)
 	{
-		let tmpLintedAddress = pAddress.trim();
-		// Check for a single . (but not a ..) at the end of the address and remove it.
-		if (tmpLintedAddress.endsWith('..'))
+		// Guard against non-string input
+		if (typeof(pAddress) != 'string')
 		{
-			tmpLintedAddress = tmpLintedAddress.slice(0, -1);
+			return '';
 		}
-		else if (tmpLintedAddress.endsWith('.'))
+		let tmpLintedAddress = pAddress.trim();
+		// Check for a single trailing . (but not a ..) at the end of the address and remove it.
+		// We must not strip '..' because that is back-navigation syntax.
+		if (tmpLintedAddress.endsWith('.') && !tmpLintedAddress.endsWith('..'))
 		{
 			tmpLintedAddress = tmpLintedAddress.slice(0, -1);
 		}
@@ -454,16 +453,16 @@ class Manyfest extends libFableServiceProviderBase
 	}
 
 	// Delete the value of an element by its hash
-	deleteValueByHash(pObject, pHash, pValue)
+	deleteValueByHash(pObject, pHash)
 	{
-		return this.deleteValueAtAddress(pObject, this.resolveHashAddress(pHash), pValue);
+		return this.deleteValueAtAddress(pObject, this.resolveHashAddress(pHash));
 	}
 
 	// Delete the value of an element at an address
-	deleteValueAtAddress (pObject, pAddress, pValue)
+	deleteValueAtAddress (pObject, pAddress)
 	{
 		let tmpLintedAddress = this.lintAddress(pAddress);
-		return this.objectAddressDeleteValue.deleteValueAtAddress(pObject, tmpLintedAddress, pValue);
+		return this.objectAddressDeleteValue.deleteValueAtAddress(pObject, tmpLintedAddress);
 	}
 
 	// Validate the consistency of an object against the schema
@@ -560,12 +559,20 @@ class Manyfest extends libFableServiceProviderBase
 						}
 						break;
 
+					case 'boolean':
+						if (tmpElementType != 'boolean')
+						{
+							addValidationError(tmpDescriptor.Address, `has a DataType ${tmpDescriptor.DataType} but is of the type ${tmpElementType}`);
+						}
+						break;
+
 					case 'datetime':
 						let tmpValueDate = new Date(tmpValue);
 						if (tmpValueDate.toString() == 'Invalid Date')
 						{
 							addValidationError(tmpDescriptor.Address, `has a DataType ${tmpDescriptor.DataType} but is not parsable as a Date by Javascript`);
 						}
+						break;
 
 					default:
 						// Check if this is a string, in the default case
@@ -605,7 +612,13 @@ class Manyfest extends libFableServiceProviderBase
 			let tmpDataType = ('DataType' in pDescriptor) ? pDescriptor.DataType : 'String';
 			if (tmpDataType in this.options.defaultValues)
 			{
-				return this.options.defaultValues[tmpDataType];
+				let tmpDefaultValue = this.options.defaultValues[tmpDataType];
+				// Return a copy of mutable defaults (Array and Object) to prevent shared state
+				if (typeof(tmpDefaultValue) == 'object' && tmpDefaultValue !== null)
+				{
+					return JSON.parse(JSON.stringify(tmpDefaultValue));
+				}
+				return tmpDefaultValue;
 			}
 			else
 			{