fable 3.0.128 → 3.0.129

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.128",
+    "version": "3.0.129",
     "description": "A service dependency injection, configuration and logging library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -60,11 +60,11 @@
         "cookie": "^0.6.0",
         "data-arithmatic": "^1.0.7",
         "dayjs": "^1.11.11",
-        "fable-log": "^3.0.13",
+        "fable-log": "^3.0.14",
         "fable-serviceproviderbase": "^3.0.13",
-        "fable-settings": "^3.0.9",
-        "fable-uuid": "^3.0.6",
-        "manyfest": "^1.0.32",
+        "fable-settings": "^3.0.10",
+        "fable-uuid": "^3.0.7",
+        "manyfest": "^1.0.33",
         "simple-get": "^4.0.1"
     }
 }

package/source/Fable-Browser-Shim.js

@@ -1,6 +1,6 @@
 var libNPMModuleWrapper = require('./Fable.js');
 
-if ((typeof(window) === 'object') && !window.hasOwnProperty('Fable'))
+if ((typeof(window) === 'object') && !('Fable' in window))
 {
 	window.Fable = libNPMModuleWrapper;
 }

package/source/Fable.js

@@ -118,7 +118,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 	/* Service Manager Methods */
 	addServiceType(pServiceType, pServiceClass)
 	{
-		if (this.servicesMap.hasOwnProperty(pServiceType))
+		if (pServiceType in this.servicesMap)
 		{
 			// TODO: Check if any services are running?
 			this.log.warn(`Adding a service type [${pServiceType}] that already exists.  This will change the default class prototype for this service.`);
@@ -150,7 +150,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 
 	addServiceTypeIfNotExists(pServiceType, pServiceClass)
 	{
-		if (!this.servicesMap.hasOwnProperty(pServiceType))
+		if (!(pServiceType in this.servicesMap))
 		{
 			return this.addServiceType(pServiceType, pServiceClass);
 		}
@@ -169,7 +169,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 
 	addAndInstantiateServiceTypeIfNotExists(pServiceType, pServiceClass)
 	{
-		if (!this.servicesMap.hasOwnProperty(pServiceType))
+		if (!(pServiceType in this.servicesMap))
 		{
 			return this.instantiateServiceProvider(pServiceType, {}, `${pServiceType}-Default`);
 		}
@@ -194,7 +194,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 		this.servicesMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
-		if (!this.services.hasOwnProperty(pServiceType))
+		if (!(pServiceType in this.services))
 		{
 			this.setDefaultServiceInstantiation(pServiceType, tmpService.Hash)
 		}
@@ -211,7 +211,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 		this.servicesMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
-		if (!this.services.hasOwnProperty(pServiceType))
+		if (!(pServiceType in this.services))
 		{
 			this.setDefaultServiceInstantiation(pServiceType, tmpService.Hash)
 		}
@@ -221,7 +221,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 
 	instantiateServiceProviderIfNotExists(pServiceType, pOptions, pCustomServiceHash)
 	{
-		if (this.services.hasOwnProperty(pServiceType))
+		if (pServiceType in this.services)
 		{
 			return this.services[pServiceType];
 		}
@@ -253,7 +253,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 		pServiceInstance.connectFable(this);
 
 		// Add the service type to the map if it isn't there yet
-		if (!this.servicesMap.hasOwnProperty(tmpServiceType))
+		if (!(tmpServiceType in this.servicesMap))
 		{
 			// If the core service hasn't registered itself yet, create the service container for it.
 			// This means you couldn't register another with this type unless it was later registered with a constructor class.
@@ -263,7 +263,7 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 		this.servicesMap[tmpServiceType][tmpServiceHash] = pServiceInstance;
 
 		// If this is the first service of this type, make it the default
-		if (!this.services.hasOwnProperty(tmpServiceType))
+		if (!(tmpServiceType in this.services))
 		{
 			this.setDefaultServiceInstantiation(tmpServiceType, tmpServiceHash, false);
 		}
@@ -276,13 +276,13 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 		// Overwrite services by default, unless told not to
 		let tmpOverwriteService = (typeof(pOverwriteService) === 'undefined') ? true : pOverwriteService;
 		// Make sure the service exists
-		if (this.servicesMap[pServiceType].hasOwnProperty(pServiceHash))
+		if (pServiceHash in this.servicesMap[pServiceType])
 		{
-			if (!this.hasOwnProperty(pServiceType) || tmpOverwriteService)
+			if (!(pServiceType in this) || tmpOverwriteService)
 			{
 				this[pServiceType] = this.servicesMap[pServiceType][pServiceHash];
 			}
-			if (!this.services.hasOwnProperty(pServiceType) || tmpOverwriteService)
+			if (!(pServiceType in this.services) || tmpOverwriteService)
 			{
 				this.services[pServiceType] = this.servicesMap[pServiceType][pServiceHash];
 			}

package/source/services/Fable-Service-DataFormat.js

@@ -518,13 +518,13 @@ class DataFormat extends libFableServiceProviderBase
 				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])
 			{
@@ -576,13 +576,13 @@ class DataFormat extends libFableServiceProviderBase
 				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])
 			{
@@ -635,13 +635,13 @@ class DataFormat extends libFableServiceProviderBase
 				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])
 			{

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Base.js

@@ -20,7 +20,7 @@ class ExpressionParserOperationBase extends libFableServiceProviderBase
 
 	getTokenType(pToken)
 	{
-		if (this.ExpressionParser.tokenMap.hasOwnProperty(pToken))
+		if (pToken in this.ExpressionParser.tokenMap)
 		{
 			return `Token.${this.ExpressionParser.tokenMap[pToken].Type}`;
 		}
@@ -47,7 +47,7 @@ class ExpressionParserOperationBase extends libFableServiceProviderBase
 			{
 				Token: pToken,
 				Type: (typeof(pTokenType) === 'undefined') ? this.getTokenType(pToken) : pTokenType,
-				Descriptor: this.ExpressionParser.tokenMap.hasOwnProperty(pToken) ? this.ExpressionParser.tokenMap[pToken] : false
+				Descriptor: (pToken in this.ExpressionParser.tokenMap) ? this.ExpressionParser.tokenMap[pToken] : false
 			});
 	}
 }

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer.js

@@ -100,7 +100,7 @@ class ExpressionTokenizer extends libExpressionParserOperationBase
 			}
 
 			// [ TOKENS ]
-			if (this.ExpressionParser.tokenMap.hasOwnProperty(tmpCharacter))
+			if (tmpCharacter in this.ExpressionParser.tokenMap)
 			{
 				if (tmpCurrentToken.length > 0)
 				{

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Linter.js

@@ -153,11 +153,11 @@ class ExpressionParserLinter extends libExpressionParserOperationBase
 		let tmpTokenPrevious = false;
 		for (let i = 0; i < pTokenizedExpression.length - 1; i++)
 		{
-			if ((this.ExpressionParser.tokenMap.hasOwnProperty(pTokenizedExpression[i])) && (this.ExpressionParser.tokenMap[pTokenizedExpression[i]].Type != 'Parenthesis') && !tmpTokenPrevious)
+			if ((pTokenizedExpression[i] in this.ExpressionParser.tokenMap) && (this.ExpressionParser.tokenMap[pTokenizedExpression[i]].Type != 'Parenthesis') && !tmpTokenPrevious)
 			{
 				tmpTokenPrevious = true;
 			}
-			else if (this.ExpressionParser.tokenMap.hasOwnProperty(pTokenizedExpression[i]) && (this.ExpressionParser.tokenMap[pTokenizedExpression[i]].Type != 'Parenthesis'))
+			else if ((pTokenizedExpression[i] in this.ExpressionParser.tokenMap) && (this.ExpressionParser.tokenMap[pTokenizedExpression[i]].Type != 'Parenthesis'))
 			{
 				// If this isn't a + or - positivity/negativity multiplier, it's an error.
 				if ((pTokenizedExpression[i] !== '+') && (pTokenizedExpression[i] !== '-'))

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Postfix.js

@@ -64,7 +64,7 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 				{
 					if ((tmpDepthSolveList[i].Type === 'Token.Operator') && (!tmpDepthSolveList[i].Parsed) && 
 						// When walking backward, we only want to mutate if the .
-						tmpDepthSolveList[i].hasOwnProperty('Descriptor') && tmpOperation.Operation.hasOwnProperty('Descriptor') &&
+						('Descriptor' in tmpDepthSolveList[i]) && ('Descriptor' in tmpOperation.Operation) &&
 						// Anything >3 does not have commutative properties
 						(tmpDepthSolveList[i].Descriptor.Precedence > 3))
 					{
@@ -94,7 +94,7 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 				{
 					if ((tmpDepthSolveList[i].Type === 'Token.Operator') && (!tmpDepthSolveList[i].Parsed) && 
 						// When walking forward, we only want to mutate if the precedence hasn't been solved.
-						tmpDepthSolveList[i].hasOwnProperty('Descriptor') && tmpOperation.Operation.hasOwnProperty('Descriptor') &&
+						('Descriptor' in tmpDepthSolveList[i]) && ('Descriptor' in tmpOperation.Operation) &&
 						// Anything >3 does not have commutative properties
 						(tmpDepthSolveList[i].Descriptor.Precedence > 3))
 					{
@@ -273,7 +273,7 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 		let tmpSolveLayerMaxDepth = 0;
 		for (let i = 0; i < tmpResults.PostfixTokenObjects.length; i++)
 		{
-			if (!tmpSolveLayerMap.hasOwnProperty(tmpResults.PostfixTokenObjects[i].SolveLayerStack))
+			if (!(tmpResults.PostfixTokenObjects[i].SolveLayerStack in tmpSolveLayerMap))
 			{
 				tmpSolveLayerMap[tmpResults.PostfixTokenObjects[i].SolveLayerStack] = [];
 			}
@@ -504,7 +504,7 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 							}
 						}
 						// The next token is an operator and it isn't a function
-						else if (tmpPeekedNextToken.Type == 'Token.Operator' && tmpOpenParenthesis.hasOwnProperty('PreviousPrecedence'))
+						else if (tmpPeekedNextToken.Type == 'Token.Operator' && ('PreviousPrecedence' in tmpOpenParenthesis))
 						{
 							// This is the second most complex case -- the next token is an operator.
 							// If the operater is at the same precedence or higher than the open parenthesis previous operator, use the previous operator's identifier

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-SolvePostfixedExpression.js

@@ -18,7 +18,7 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 		let tmpDataDestinationObject = (typeof(pDataDestinationObject) === 'object') ? pDataDestinationObject : {};
 
 		// If there was a fable passed in (e.g. the results object was a service or such), we won't decorate
-		let tmpPassedInFable = tmpResults.hasOwnProperty('fable');
+		let tmpPassedInFable = ('fable' in tmpResults);
 		if (!tmpPassedInFable)
 		{
 			tmpResults.fable = this.fable;
@@ -73,11 +73,11 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 				// TODO: This can be optimized.   A lot.  If necessary.  Seems pretty fast honestly for even thousands of operations.  Slowest part is arbitrary precision.
 				// An operator always has a left and right value.
 				let tmpFunctionAddress = false;
-				if (this.ExpressionParser.tokenMap.hasOwnProperty(tmpStepResultObject.ExpressionStep.Operation.Token))
+				if (tmpStepResultObject.ExpressionStep.Operation.Token in this.ExpressionParser.tokenMap)
 				{
 					tmpFunctionAddress = `ResultsObject.${tmpStepResultObject.ExpressionStep.Operation.Descriptor.Function}`;
 				}
-				else if (this.ExpressionParser.functionMap.hasOwnProperty(tmpStepResultObject.ExpressionStep.Operation.Token.toLowerCase()))
+				else if (tmpStepResultObject.ExpressionStep.Operation.Token.toLowerCase() in this.ExpressionParser.functionMap)
 				{
 					tmpFunctionAddress = `ResultsObject.${this.ExpressionParser.functionMap[tmpStepResultObject.ExpressionStep.Operation.Token.toLowerCase()].Address}`;
 				}

package/source/services/Fable-Service-FilePersistence.js

@@ -13,7 +13,7 @@ class FableServiceFilePersistence extends libFableServiceBase
 
 		this.serviceType = 'FilePersistence';
 
-		if (!this.options.hasOwnProperty('Mode'))
+		if (!('Mode' in this.options))
 		{
 			this.options.Mode = parseInt('0777', 8) & ~process.umask();
 		}
@@ -152,7 +152,7 @@ class FableServiceFilePersistence extends libFableServiceBase
 			return false;
 		}
 
-		if (!tmpParameters.hasOwnProperty('Mode'))
+		if (!('Mode' in tmpParameters))
 		{
 			tmpParameters.Mode = this.options.Mode;
 		}

package/source/services/Fable-Service-MetaTemplate/MetaTemplate-StringParser.js

@@ -91,21 +91,21 @@ class StringParser
 		if (pParserState.PatternMatch)
 		{
 			// If the pattern is still matching the start and we haven't passed the buffer
-			if (!pParserState.StartPatternMatchComplete && pParserState.Pattern.hasOwnProperty(pCharacter))
+			if (!pParserState.StartPatternMatchComplete && (pCharacter in pParserState.Pattern))
 			{
 				pParserState.Pattern = pParserState.Pattern[pCharacter];
 				this.appendOutputBuffer(pCharacter, pParserState);
 			}
 			else if (pParserState.EndPatternMatchBegan)
 			{
-				if (pParserState.Pattern.PatternEnd.hasOwnProperty(pCharacter))
+				if (pCharacter in pParserState.Pattern.PatternEnd)
 				{
 					// This leaf has a PatternEnd tree, so we will wait until that end is met.
 					pParserState.Pattern = pParserState.Pattern.PatternEnd[pCharacter];
 					// Flush the output buffer.
 					this.appendOutputBuffer(pCharacter, pParserState);
 					// If this last character is the end of the pattern, parse it.
-					if (pParserState.Pattern.hasOwnProperty('Parse') && (!pParserState.Pattern.isAsync || pParserState.Pattern.isBoth))
+					if (('Parse' in pParserState.Pattern) && (!pParserState.Pattern.isAsync || pParserState.Pattern.isBoth))
 					{
 						// Run the function
 						pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext);
@@ -117,7 +117,7 @@ class StringParser
 						return this.resetOutputBuffer(pParserState);
 					}
 				}
-				else if (pParserState.PatternStartNode.PatternEnd.hasOwnProperty(pCharacter))
+				else if (pCharacter in pParserState.PatternStartNode.PatternEnd)
 				{
 					// We broke out of the end -- see if this is a new start of the end.
 					pParserState.Pattern = pParserState.PatternStartNode.PatternEnd[pCharacter];
@@ -129,7 +129,7 @@ class StringParser
 					this.appendOutputBuffer(pCharacter, pParserState);
 				}
 			}
-			else if (pParserState.Pattern.hasOwnProperty('PatternEnd'))
+			else if ('PatternEnd' in pParserState.Pattern)
 			{
 				if (!pParserState.StartPatternMatchComplete)
 				{
@@ -139,14 +139,14 @@ class StringParser
 
 				this.appendOutputBuffer(pCharacter, pParserState);
 
-				if (pParserState.Pattern.PatternEnd.hasOwnProperty(pCharacter))
+				if (pCharacter in pParserState.Pattern.PatternEnd)
 				{
 					// This is the first character of the end pattern.
 					pParserState.EndPatternMatchBegan = true;
 					// This leaf has a PatternEnd tree, so we will wait until that end is met.
 					pParserState.Pattern = pParserState.Pattern.PatternEnd[pCharacter];
 					// If this last character is the end of the pattern, parse it.
-					if (pParserState.Pattern.hasOwnProperty('Parse'))
+					if ('Parse' in pParserState.Pattern)
 					{
 						if (pParserState.Pattern.isAsync && !pParserState.Pattern.isBoth)
 						{
@@ -172,7 +172,7 @@ class StringParser
 		if (!pParserState.PatternMatch)
 		{
 			// This may be the start of a new pattern....
-			if (pParserState.ParseTree.hasOwnProperty(pCharacter))
+			if (pCharacter in pParserState.ParseTree)
 			{
 				// ... assign the root node as the matched node.
 				this.resetOutputBuffer(pParserState);
@@ -251,26 +251,26 @@ class StringParser
 		if (pParserState.PatternMatch)
 		{
 			// If the pattern is still matching the start and we haven't passed the buffer
-			if (!pParserState.StartPatternMatchComplete && pParserState.Pattern.hasOwnProperty(pCharacter))
+			if (!pParserState.StartPatternMatchComplete && (pCharacter in pParserState.Pattern))
 			{
 				pParserState.Pattern = pParserState.Pattern[pCharacter];
 				this.appendOutputBuffer(pCharacter, pParserState);
 			}
 			else if (pParserState.EndPatternMatchBegan)
 			{
-				if (pParserState.Pattern.PatternEnd.hasOwnProperty(pCharacter))
+				if (pCharacter in pParserState.Pattern.PatternEnd)
 				{
 					// This leaf has a PatternEnd tree, so we will wait until that end is met.
 					pParserState.Pattern = pParserState.Pattern.PatternEnd[pCharacter];
 					// Flush the output buffer.
 					this.appendOutputBuffer(pCharacter, pParserState);
 					// If this last character is the end of the pattern, parse it.
-					if (pParserState.Pattern.hasOwnProperty('Parse'))
+					if ('Parse' in pParserState.Pattern)
 					{
 						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext);
 					}
 				}
-				else if (pParserState.PatternStartNode.PatternEnd.hasOwnProperty(pCharacter))
+				else if (pCharacter in pParserState.PatternStartNode.PatternEnd)
 				{
 					// We broke out of the end -- see if this is a new start of the end.
 					pParserState.Pattern = pParserState.PatternStartNode.PatternEnd[pCharacter];
@@ -282,7 +282,7 @@ class StringParser
 					this.appendOutputBuffer(pCharacter, pParserState);
 				}
 			}
-			else if (pParserState.Pattern.hasOwnProperty('PatternEnd'))
+			else if ('PatternEnd' in pParserState.Pattern)
 			{
 				if (!pParserState.StartPatternMatchComplete)
 				{
@@ -292,14 +292,14 @@ class StringParser
 
 				this.appendOutputBuffer(pCharacter, pParserState);
 
-				if (pParserState.Pattern.PatternEnd.hasOwnProperty(pCharacter))
+				if (pCharacter in pParserState.Pattern.PatternEnd)
 				{
 					// This is the first character of the end pattern.
 					pParserState.EndPatternMatchBegan = true;
 					// This leaf has a PatternEnd tree, so we will wait until that end is met.
 					pParserState.Pattern = pParserState.Pattern.PatternEnd[pCharacter];
 					// If this last character is the end of the pattern, parse it.
-					if (pParserState.Pattern.hasOwnProperty('Parse'))
+					if ('Parse' in pParserState.Pattern)
 					{
 						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext);
 					}
@@ -315,7 +315,7 @@ class StringParser
 		else
 		{
 			// This may be the start of a new pattern....
-			if (pParserState.ParseTree.hasOwnProperty(pCharacter))
+			if (pCharacter in pParserState.ParseTree)
 			{
 				// ... assign the root node as the matched node.
 				this.resetOutputBuffer(pParserState);

package/source/services/Fable-Service-MetaTemplate/MetaTemplate-WordTree.js

@@ -24,7 +24,7 @@ class WordTree
 	 */
 	addChild (pTree, pPattern)
 	{
-		if (!pTree.hasOwnProperty(pPattern))
+		if (!(pPattern in pTree))
 		{
 			pTree[pPattern] = {};
 		}
@@ -42,7 +42,7 @@ class WordTree
 	 */
 	addEndChild (pTree, pPattern)
 	{
-		if (!pTree.hasOwnProperty('PatternEnd'))
+		if (!('PatternEnd' in pTree))
 		{
 			pTree.PatternEnd = {};
 		}
@@ -79,7 +79,7 @@ class WordTree
 			tmpLeaf = this.addChild(tmpLeaf, pPatternStart[i], i);
 		}
 
-		if (!tmpLeaf.hasOwnProperty('PatternEnd'))
+		if (!('PatternEnd' in tmpLeaf))
 		{
 			tmpLeaf.PatternEnd = {};
 		}

package/source/services/Fable-Service-Operation.js

@@ -142,7 +142,7 @@ class FableOperation extends libFableServiceBase
 
 	setStepTotalOperations(pGUIDStep, pTotalOperationCount)
 	{
-		if (!this.stepMap.hasOwnProperty(pGUIDStep))
+		if (!(pGUIDStep in this.stepMap))
 		{
 			return new Error(`Step [${pGUIDStep}] does not exist in operation [${this.state.Metadata.UUID}] ${this.state.Metadata.Name} when attempting to set total operations to ${pTotalOperationCount}.`);
 		}

package/source/services/Fable-Service-ProgressTime.js

@@ -51,7 +51,7 @@ class FableServiceProgressTime extends libFableServiceBase
 	getTimeStampValue(pTimeStampHash)
 	{
 		let tmpTimeStampHash = (typeof(pTimeStampHash) == 'string') ? pTimeStampHash : 'Default';
-		return this.timeStamps.hasOwnProperty(tmpTimeStampHash) ? this.timeStamps[tmpTimeStampHash] : -1;
+		return (tmpTimeStampHash in this.timeStamps) ? this.timeStamps[tmpTimeStampHash] : -1;
 	}
 
 	updateTimeStampValue(pTimeStampHash, pReferenceTime)
@@ -62,7 +62,7 @@ class FableServiceProgressTime extends libFableServiceBase
 		// This function allows the user to pass in either a reference time in ms, or, a hash of a timestamp.
 		if (typeof(pReferenceTime) == 'string')
 		{
-			tmpReferenceTime = this.timeStamps.hasOwnProperty(tmpReference) ? this.timeStamps[tmpReference] : false;
+			tmpReferenceTime = (tmpReference in this.timeStamps) ? this.timeStamps[tmpReference] : false;
 		}
 		else if (typeof(pReferenceTime) == 'number')
 		{
@@ -73,7 +73,7 @@ class FableServiceProgressTime extends libFableServiceBase
 			tmpReferenceTime = +new Date();
 		}
 
-		if (this.timeStamps.hasOwnProperty(tmpTimeStampHash) && tmpReferenceTime)
+		if ((tmpTimeStampHash in this.timeStamps) && tmpReferenceTime)
 		{
 			this.timeStamps[tmpTimeStampHash] = tmpReferenceTime;
 			return this.timeStamps[tmpTimeStampHash];
@@ -87,7 +87,7 @@ class FableServiceProgressTime extends libFableServiceBase
 	removeTimeStamp(pTimeStampHash)
 	{
 		let tmpTimeStampHash = (typeof(pTimeStampHash) == 'string') ? pTimeStampHash : 'Default';
-		if (this.timeStamps.hasOwnProperty(tmpTimeStampHash))
+		if (tmpTimeStampHash in this.timeStamps)
 		{
 			delete this.timeStamps[tmpTimeStampHash];
 			return true;
@@ -106,7 +106,7 @@ class FableServiceProgressTime extends libFableServiceBase
 		// This function allows the user to pass in either a reference time in ms, or, a hash of a timestamp.
 		if (typeof(pReferenceTime) == 'string')
 		{
-			tmpReferenceTime = this.timeStamps.hasOwnProperty(tmpReference) ? this.timeStamps[tmpReference] : false;
+			tmpReferenceTime = (tmpReference in this.timeStamps) ? this.timeStamps[tmpReference] : false;
 		}
 		else if (typeof(pReferenceTime) == 'number')
 		{
@@ -117,7 +117,7 @@ class FableServiceProgressTime extends libFableServiceBase
 			tmpReferenceTime = +new Date();
 		}
 
-		if (this.timeStamps.hasOwnProperty(tmpTimeStampHash) && tmpReferenceTime)
+		if ((tmpTimeStampHash in this.timeStamps) && tmpReferenceTime)
 		{
 			return tmpReferenceTime-this.timeStamps[tmpTimeStampHash];
 		}
@@ -131,7 +131,7 @@ class FableServiceProgressTime extends libFableServiceBase
 	{
 		let tmpTimeStampHashStart = (typeof(pTimeStampHashStart) == 'string') ? pTimeStampHashStart : 'Default';
 		let tmpTimeStampHashEnd = (typeof(pTimeStampHashEnd) == 'string') ? pTimeStampHashEnd : 'Default';
-		if (this.timeStamps.hasOwnProperty(tmpTimeStampHashStart) && this.timeStamps.hasOwnProperty(tmpTimeStampHashEnd))
+		if ((tmpTimeStampHashStart in this.timeStamps) && (tmpTimeStampHashEnd in this.timeStamps))
 		{
 			return this.timeStamps[tmpTimeStampHashEnd]-this.timeStamps[tmpTimeStampHashStart];
 		}

package/source/services/Fable-Service-ProgressTrackerSet.js

@@ -23,7 +23,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 	{
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.warn(`ProgressTracker ${tmpProgressTrackerHash} does not exist!  Creating a new tracker...`);
 			this.createProgressTracker(tmpProgressTrackerHash, 100);
@@ -36,7 +36,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 	{
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.warn(`ProgressTracker ${tmpProgressTrackerHash} does not exist!  Creating a new tracker...`);
 			this.createProgressTracker(tmpProgressTrackerHash, 100);
@@ -73,7 +73,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 				CurrentCount:-1
 			});
 
-		if (this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (tmpProgressTrackerHash in this.progressTrackers)
 		{
 			this.fable.log.warn(`ProgressTracker ${tmpProgressTrackerHash} already exists!  Overwriting with a new tracker...`);
 			this.progressTimes.removeTimeStamp(tmpProgressTracker.StartTimeHash);
@@ -90,7 +90,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 		let tmpTotalOperations = (typeof(pTotalOperations) == 'number') ? pTotalOperations : 100;
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.warn(`Attempted to set the total operations of ProgressTracker ${tmpProgressTrackerHash} but it does not exist!  Creating a new tracker...`);
 			this.createProgressTracker(tmpProgressTrackerHash, tmpTotalOperations);
@@ -106,7 +106,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 
 		// This is the only method to lazily create ProgressTrackers now
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.createProgressTracker(tmpProgressTrackerHash, 100);
 		}
@@ -127,7 +127,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 	{
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.error(`Attempted to end ProgressTracker ${tmpProgressTrackerHash} that does not exist!`);
 			return false;
@@ -145,7 +145,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 	{
 		let tmpProgressTrackerHash = (typeof(pProgressTrackerHash) == 'string') ? pProgressTrackerHash : 'Default';
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.error(`Attempted to solve ProgressTracker ${tmpProgressTrackerHash} that does not exist!`);
 			return false;
@@ -217,7 +217,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 			return false;
 		}
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.createProgressTracker(100, tmpProgressTrackerHash);
 		}
@@ -237,7 +237,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 			tmpOperationIncrementAmount = 1;
 		}
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			this.fable.log.warn(`Attempted to increment ProgressTracker ${tmpProgressTrackerHash} but it did not exist.`);
 			return false;
@@ -284,7 +284,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 		// TODO: Is there a pattern to avoid this double call that's worth putting in?
 		this.solveProgressTrackerStatus(tmpProgressTrackerHash);
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			return `ProgressTracker ${tmpProgressTrackerHash} does not exist!  No stats to display.`;
 		}
@@ -325,7 +325,7 @@ class FableServiceProgressTrackerSet extends libFableServiceBase
 		// TODO: Is there a pattern to avoid this double call that's worth putting in?
 		this.solveProgressTrackerStatus(tmpProgressTrackerHash);
 
-		if (!this.progressTrackers.hasOwnProperty(tmpProgressTrackerHash))
+		if (!(tmpProgressTrackerHash in this.progressTrackers))
 		{
 			return `ProgressTracker ${tmpProgressTrackerHash} does not exist!  No stats to display.`;
 		}

package/source/services/Fable-Service-RestClient.js

@@ -36,7 +36,7 @@ class FableServiceRestClient extends libFableServiceBase
 		if (this.cookie)
 		{
 			let tmpCookieObject = this.cookie;
-			if (!pRequestOptions.hasOwnProperty('headers'))
+			if (!('headers' in pRequestOptions))
 			{
 				pRequestOptions.headers = {};
 			}
@@ -56,7 +56,7 @@ class FableServiceRestClient extends libFableServiceBase
 		let tmpOptions = this.prepareCookies(pOptions);
 
 		// Prepend a string to the URL if it exists in the Fable Config
-		if (this.fable.settings.hasOwnProperty('RestClientURLPrefix'))
+		if ('RestClientURLPrefix' in this.fable.settings)
 		{
 			tmpOptions.url = this.fable.settings.RestClientURLPrefix + tmpOptions.url;
 		}
@@ -181,12 +181,12 @@ class FableServiceRestClient extends libFableServiceBase
 
 		let tmpOptions = this.preRequest(pOptions);
 
-		if (!tmpOptions.hasOwnProperty('headers'))
+		if (!('headers' in tmpOptions))
 		{
 			tmpOptions.headers = {};
 		}
 		/* Automated headers break some APIs
-		if (!tmpOptions.headers.hasOwnProperty('Content-Type'))
+		if (!('Content-Type' in tmpOptions.headers))
 		{
 			tmpOptions.headers['Content-Type'] = 'application/json';
 		}