manyfest 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manyfest",
-    "version": "1.0.32",
+    "version": "1.0.34",
     "description": "JSON Object Manifest for Data Description and Parsing",
     "main": "source/Manyfest.js",
     "scripts": {

package/source/Manyfest-HashTranslation.js

@@ -62,7 +62,7 @@ class ManyfestHashTranslation
 
     removeTranslationHash(pTranslationHash)
     {
-        if (this.translationTable.hasOwnProperty(pTranslationHash))
+        if (pTranslationHash in this.translationTable)
         {
             delete this.translationTable[pTranslationHash];
         }
@@ -103,7 +103,7 @@ class ManyfestHashTranslation
 
     translate(pTranslation)
     {
-        if (this.translationTable.hasOwnProperty(pTranslation))
+        if (pTranslation in this.translationTable)
         {
             return this.translationTable[pTranslation];
         }

package/source/Manyfest-ObjectAddress-CheckAddressExists.js

@@ -82,7 +82,7 @@ class ManyfestObjectAddressResolverCheckAddressExists
 			{
 				let tmpFunctionAddress = pAddress.substring(0, tmpFunctionStartIndex).trim();
 
-				if ((pObject.hasOwnProperty(tmpFunctionAddress)) && (typeof(pObject[tmpFunctionAddress]) == 'function'))
+				if (((tmpFunctionAddress in pObject)) && (typeof(pObject[tmpFunctionAddress]) == 'function'))
 				{
 					return true;
 				}
@@ -143,7 +143,7 @@ class ManyfestObjectAddressResolverCheckAddressExists
 					tmpBoxedPropertyReference = this.cleanWrapCharacters("'", tmpBoxedPropertyReference);
 
 					// Check if the property exists.
-					return pObject[tmpBoxedPropertyName].hasOwnProperty(tmpBoxedPropertyReference);
+					return (tmpBoxedPropertyReference in pObject[tmpBoxedPropertyName]);
 				}
 				else
 				{
@@ -154,7 +154,7 @@ class ManyfestObjectAddressResolverCheckAddressExists
 			else
 			{
 				// Check if the property exists
-				return pObject.hasOwnProperty(pAddress);
+				return (pAddress in pObject);
 			}
 		}
 		else
@@ -284,11 +284,11 @@ class ManyfestObjectAddressResolverCheckAddressExists
 
 			// If there is an object property already named for the sub object, but it isn't an object
 			// then the system can't set the value in there.  Error and abort!
-			if (pObject.hasOwnProperty(tmpSubObjectName) && typeof(pObject[tmpSubObjectName]) !== 'object')
+			if ((tmpSubObjectName in pObject) && typeof(pObject[tmpSubObjectName]) !== 'object')
 			{
 				return false;
 			}
-			else if (pObject.hasOwnProperty(tmpSubObjectName))
+			else if (tmpSubObjectName in pObject)
 			{
 				// If there is already a subobject pass that to the recursive thingy
 				return this.checkAddressExists(pObject[tmpSubObjectName], tmpNewAddress, tmpRootObject);

package/source/Manyfest-ObjectAddress-DeleteValue.js

@@ -329,11 +329,11 @@ class ManyfestObjectAddressResolverDeleteValue
 
 			// If there is an object property already named for the sub object, but it isn't an object
 			// then the system can't set the value in there.  Error and abort!
-			if (pObject.hasOwnProperty(tmpSubObjectName) && typeof(pObject[tmpSubObjectName]) !== 'object')
+			if ((tmpSubObjectName in pObject) && typeof(pObject[tmpSubObjectName]) !== 'object')
 			{
 				return undefined;
 			}
-			else if (pObject.hasOwnProperty(tmpSubObjectName))
+			else if (tmpSubObjectName in pObject)
 			{
 				// If there is already a subobject pass that to the recursive thingy
 				// Continue to manage the parent address for recursion

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -163,20 +163,24 @@ class ManyfestObjectAddressResolverGetValue
 					// Now get the value for each argument
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{
-						if(tmpFunctionArguments[i][0] == "'" && tmpFunctionArguments[i][tmpFunctionArguments[i].length - 1] == "'")
-						{
-							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length - 1));
-						}
-						else if(tmpFunctionArguments[i][0] == '"' && tmpFunctionArguments[i][tmpFunctionArguments[i].length - 1] == '"')
-						{
-							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length - 1));
-						}
-						else if(tmpFunctionArguments[i][0] == "`" && tmpFunctionArguments[i][tmpFunctionArguments[i].length - 1] == "`")
+						// 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)
+							&&
+							((tmpFunctionArguments[i].charAt(0) == '"')
+							|| (tmpFunctionArguments[i].charAt(0) == "'")
+							|| (tmpFunctionArguments[i].charAt(0) == "`"))
+							&&
+							((tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == '"')
+							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "'")
+							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "`")))
 						{
-							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length - 1));
+							// This is a string literal
+							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length-1));
 						}
 						else
 						{
+							// This is a hash address
 							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
 						}
 					}
@@ -358,7 +362,25 @@ class ManyfestObjectAddressResolverGetValue
 					for (let i = 0; i < tmpFunctionArguments.length; i++)
 					{
 						// Resolve the values for each subsequent entry
-						tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
+						// Check if the argument value is a string literal or a reference to an address
+						if ((tmpFunctionArguments[i].length >= 2)
+							&&
+							((tmpFunctionArguments[i].charAt(0) == '"')
+							|| (tmpFunctionArguments[i].charAt(0) == "'")
+							|| (tmpFunctionArguments[i].charAt(0) == "`"))
+							&&
+							((tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == '"')
+							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "'")
+							|| (tmpFunctionArguments[i].charAt(tmpFunctionArguments[i].length-1) == "`")))
+						{
+							// This is a string literal
+							tmpArgumentValues.push(tmpFunctionArguments[i].substring(1, tmpFunctionArguments[i].length-1));
+						}
+						else
+						{
+							// This is a hash address
+							tmpArgumentValues.push(this.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
+						}
 					}
 
 					return this.getValueAtAddress(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpParentAddress, tmpRootObject);
@@ -504,11 +526,11 @@ class ManyfestObjectAddressResolverGetValue
 
 			// If there is an object property already named for the sub object, but it isn't an object
 			// then the system can't set the value in there.  Error and abort!
-			if (pObject.hasOwnProperty(tmpSubObjectName) && typeof(pObject[tmpSubObjectName]) !== 'object')
+			if ((tmpSubObjectName in pObject) && typeof(pObject[tmpSubObjectName]) !== 'object')
 			{
 				return undefined;
 			}
-			else if (pObject.hasOwnProperty(tmpSubObjectName))
+			else if (tmpSubObjectName in pObject)
 			{
 				// If there is already a subobject pass that to the recursive thingy
 				// Continue to manage the parent address for recursion

package/source/Manyfest-ObjectAddress-Parser.js

@@ -46,13 +46,13 @@ module.exports = {
 				tmpSegmentCount++;
 			}
 			// IF This is the start of an enclosure
-			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			else if (tmpString[i] in tmpEnclosureStartSymbolMap)
 			{
 				// Add it to the stack!
 				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
 			}
 			// IF This is the end of an enclosure
-			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+			else if ((tmpString[i] in tmpEnclosureEndSymbolMap)
 				// AND it matches the current nest level symbol
 				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
 			{
@@ -100,13 +100,13 @@ module.exports = {
 				return tmpString.substring(0, i);
 			}
 			// IF This is the start of an enclosure
-			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			else if (tmpString[i] in tmpEnclosureStartSymbolMap)
 			{
 				// Add it to the stack!
 				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
 			}
 			// IF This is the end of an enclosure
-			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+			else if ((tmpString[i] in tmpEnclosureEndSymbolMap)
 				// AND it matches the current nest level symbol
 				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
 			{
@@ -158,13 +158,13 @@ module.exports = {
 				tmpCurrentSegmentStart = i+1;
 			}
 			// IF This is the start of an enclosure
-			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			else if (tmpString[i] in tmpEnclosureStartSymbolMap)
 			{
 				// Add it to the stack!
 				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
 			}
 			// IF This is the end of an enclosure
-			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+			else if ((tmpString[i] in tmpEnclosureEndSymbolMap)
 				// AND it matches the current nest level symbol
 				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
 			{

package/source/Manyfest-ObjectAddress-SetValue.js

@@ -186,15 +186,15 @@ class ManyfestObjectAddressSetValue
 
 			// If there is an object property already named for the sub object, but it isn't an object
 			// then the system can't set the value in there.  Error and abort!
-			if (pObject.hasOwnProperty(tmpSubObjectName) && typeof(pObject[tmpSubObjectName]) !== 'object')
+			if ((tmpSubObjectName in pObject) && typeof(pObject[tmpSubObjectName]) !== 'object')
 			{
-				if (!pObject.hasOwnProperty('__ERROR'))
+				if (!('__ERROR' in pObject))
 					pObject['__ERROR'] = {};
 				// Put it in an error object so data isn't lost
 				pObject['__ERROR'][pAddress] = pValue;
 				return false;
 			}
-			else if (pObject.hasOwnProperty(tmpSubObjectName))
+			else if (tmpSubObjectName in pObject)
 			{
 				// If there is already a subobject pass that to the recursive thingy
 				return this.setValueAtAddress(pObject[tmpSubObjectName], tmpNewAddress, pValue);

package/source/Manyfest-SchemaManipulation.js

@@ -55,7 +55,7 @@ class ManyfestSchemaManipulation
 		tmpManyfestAddresses.forEach(
 			(pAddress) =>
 			{
-				if (pManyfestSchemaDescriptors[pAddress].hasOwnProperty('Hash'))
+				if ('Hash' in pManyfestSchemaDescriptors[pAddress])
 				{
 					tmpHashMapping[pManyfestSchemaDescriptors[pAddress].Hash] = pAddress;
 				}
@@ -71,11 +71,11 @@ class ManyfestSchemaManipulation
 				let tmpDescriptor = false;
 
 				// See if there is a matching descriptor either by Address directly or Hash
-				if (pManyfestSchemaDescriptors.hasOwnProperty(pInputAddress))
+				if (pInputAddress in pManyfestSchemaDescriptors)
 				{
 					tmpOldDescriptorAddress = pInputAddress;
 				}
-				else if (tmpHashMapping.hasOwnProperty(pInputAddress))
+				else if (pInputAddress in tmpHashMapping)
 				{
 					tmpOldDescriptorAddress = tmpHashMapping[pInputAddress];
 				}
@@ -124,7 +124,7 @@ class ManyfestSchemaManipulation
 		tmpDescriptorAddresses.forEach(
 			(pDescriptorAddress) =>
 			{
-				if (!tmpNewManyfestSchemaDescriptors.hasOwnProperty(pDescriptorAddress))
+				if (!(pDescriptorAddress in tmpNewManyfestSchemaDescriptors))
 				{
 					tmpNewManyfestSchemaDescriptors[pDescriptorAddress] = tmpSource[pDescriptorAddress];
 				}

package/source/Manyfest.js

@@ -45,7 +45,7 @@ class Manyfest extends libFableServiceProviderBase
 		this.objectAddressSetValue = new libObjectAddressSetValue(this.logInfo, this.logError);
 		this.objectAddressDeleteValue = new libObjectAddressDeleteValue(this.logInfo, this.logError);
 
-		if (!this.options.hasOwnProperty('defaultValues'))
+		if (!('defaultValues' in this.options))
 		{
 			this.options.defaultValues = (
 				{
@@ -61,7 +61,7 @@ class Manyfest extends libFableServiceProviderBase
 					"Null": null
 				});
 		}
-		if (!this.options.hasOwnProperty('strict'))
+		if (!('strict' in this.options))
 		{
 			this.options.strict = false;
 		}
@@ -131,13 +131,13 @@ class Manyfest extends libFableServiceProviderBase
 
 		for (let i = 0; i < tmpDescriptorKeys.length; i++)
 		{
-			if (!tmpManifest.hasOwnProperty(tmpDescriptorKeys[i]))
+			if (!(tmpDescriptorKeys[i] in tmpManifest))
 			{
 				tmpManifest[tmpDescriptorKeys[i]] = JSON.parse(JSON.stringify(_DefaultConfiguration[tmpDescriptorKeys[i]]));
 			}
 		}
 
-		if (tmpManifest.hasOwnProperty('Scope'))
+		if ('Scope' in tmpManifest)
 		{
 			if (typeof(tmpManifest.Scope) === 'string')
 			{
@@ -153,7 +153,7 @@ class Manyfest extends libFableServiceProviderBase
 			this.logError(`(${this.scope}) Error loading scope from manifest object.  Property "Scope" does not exist in the root of the object.`, tmpManifest);
 		}
 
-		if (tmpManifest.hasOwnProperty('Descriptors'))
+		if ('Descriptors' in tmpManifest)
 		{
 			if (typeof(tmpManifest.Descriptors) === 'object')
 			{
@@ -173,7 +173,7 @@ class Manyfest extends libFableServiceProviderBase
 			this.logError(`(${this.scope}) Error loading object description from manifest object.  Property "Descriptors" does not exist in the root of the Manifest object.`, tmpManifest);
 		}
 
-		if (tmpManifest.hasOwnProperty('HashTranslations'))
+		if ('HashTranslations' in tmpManifest)
 		{
 			if (typeof(tmpManifest.HashTranslations) === 'object')
 			{
@@ -207,12 +207,12 @@ class Manyfest extends libFableServiceProviderBase
 		if (typeof(pDescriptor) === 'object')
 		{
 			// Add the Address into the Descriptor if it doesn't exist:
-			if (!pDescriptor.hasOwnProperty('Address'))
+			if (!('Address' in pDescriptor))
 			{
 				pDescriptor.Address = pAddress;
 			}
 
-			if (!this.elementDescriptors.hasOwnProperty(pAddress))
+			if (!(pAddress in this.elementDescriptors))
 			{
 				this.elementAddresses.push(pAddress);
 			}
@@ -223,7 +223,7 @@ class Manyfest extends libFableServiceProviderBase
 			// Always add the address as a hash
 			this.elementHashes[pAddress] = pAddress;
 
-			if (pDescriptor.hasOwnProperty('Hash'))
+			if ('Hash' in pDescriptor)
 			{
 				// TODO: Check if this is a good idea or not..
 				//       Collisions are bound to happen with both representations of the address/hash in here and developers being able to create their own hashes.
@@ -284,8 +284,8 @@ class Manyfest extends libFableServiceProviderBase
 	{
 		let tmpAddress = undefined;
 
-		let tmpInElementHashTable = this.elementHashes.hasOwnProperty(pHash);
-		let tmpInTranslationTable = this.hashTranslations.translationTable.hasOwnProperty(pHash);
+		let tmpInElementHashTable = (pHash in this.elementHashes);
+		let tmpInTranslationTable = (pHash in this.hashTranslations.translationTable);
 
 		// The most straightforward: the hash exists, no translations.
 		if (tmpInElementHashTable && !tmpInTranslationTable)
@@ -293,7 +293,7 @@ class Manyfest extends libFableServiceProviderBase
 			tmpAddress = this.elementHashes[pHash];
 		}
 		// There is a translation from one hash to another, and, the elementHashes contains the pointer end
-		else if (tmpInTranslationTable && this.elementHashes.hasOwnProperty(this.hashTranslations.translate(pHash)))
+		else if (tmpInTranslationTable && (this.hashTranslations.translate(pHash) in this.elementHashes))
 		{
 			tmpAddress = this.elementHashes[this.hashTranslations.translate(pHash)];
 		}
@@ -477,7 +477,7 @@ class Manyfest extends libFableServiceProviderBase
 			return undefined;
 		}
 
-		if (pDescriptor.hasOwnProperty('Default'))
+		if ('Default' in pDescriptor)
 		{
 			return pDescriptor.Default;
 		}
@@ -485,8 +485,8 @@ class Manyfest extends libFableServiceProviderBase
 		{
 			// Default to a null if it doesn't have a type specified.
 			// This will ensure a placeholder is created but isn't misinterpreted.
-			let tmpDataType = (pDescriptor.hasOwnProperty('DataType')) ? pDescriptor.DataType : 'String';
-			if (this.options.defaultValues.hasOwnProperty(tmpDataType))
+			let tmpDataType = ('DataType' in pDescriptor) ? pDescriptor.DataType : 'String';
+			if (tmpDataType in this.options.defaultValues)
 			{
 				return this.options.defaultValues[tmpDataType];
 			}
@@ -505,7 +505,7 @@ class Manyfest extends libFableServiceProviderBase
 			// This just sets up a simple filter to see if there is a default set.
 			(pDescriptor) =>
 			{
-				return pDescriptor.hasOwnProperty('Default');
+				return ('Default' in pDescriptor);
 			});
 	}