fable 3.0.128 → 3.0.130

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

@@ -25,27 +25,19 @@ class FableServiceMetaTemplate extends libFableServiceBase
 	}
 
 
-	/**
-	 * Add a Pattern to the Parse Tree
-	 * @method addPattern
-	 * @param {Object} pTree - A node on the parse tree to push the characters into
-	 * @param {string} pPattern - The string to add to the tree
-	 * @param {number} pIndex - callback function
-	 * @return {bool} True if adding the pattern was successful
-	 */
-	addPattern(pPatternStart, pPatternEnd, pParser)
+	addPattern(pPatternStart, pPatternEnd, pParser, pParserContext)
 	{
-		return this.WordTree.addPattern(pPatternStart, pPatternEnd, pParser);
+		return this.WordTree.addPattern(pPatternStart, pPatternEnd, pParser, pParserContext);
 	}
 
-	addPatternAsync(pPatternStart, pPatternEnd, pParserPromise)
+	addPatternAsync(pPatternStart, pPatternEnd, pParserPromise, pParserContext)
 	{
-		return this.WordTree.addPatternAsync(pPatternStart, pPatternEnd, pParserPromise);
+		return this.WordTree.addPatternAsync(pPatternStart, pPatternEnd, pParserPromise, pParserContext);
 	}
 
-	addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise)
+	addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise, pParserContext)
 	{
-		return this.WordTree.addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise);
+		return this.WordTree.addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise, pParserContext);
 	}
 
 	/**

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';
 		}

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

@@ -105,7 +105,7 @@ class FableServiceUtility extends libFableServiceBase
 	// with ultra limited JS capabilities where those don't work.
 	isoStringToDate (pISOString)
 	{
-		if (!this.fable.hasOwnProperty('Dates'))
+		if (!('Dates' in this.fable))
 		{
 			this.fable.instantiateServiceProvider('Dates');
 		}

package/test/MetaTemplating_tests.js

@@ -21,7 +21,6 @@ const loadMetaTemplateModule = () =>
 const configMetaTemplate = (pModule) =>
 {
 
-
 	pModule.addPattern('<%', '%>', 'JUNKED_THIS_DATA');
 	// This one gets the count of the inner string...
 	pModule.addPattern('<%#', '%>', (pData)=>{return pData.length});
@@ -150,6 +149,27 @@ suite
 					}
 				);
 				test
+				(
+					'Custom this',
+					(fDone) =>
+					{
+						let tmpTestString = 'The [^objective^] pData up in here and a $comment$ as well.';
+						let tmpExpectedResult = 'The This objective is like {\"BigData\":\"is here\"} pData up in here and a comment as well.';
+						let testMetaTemplate = loadMetaTemplateModule();
+						configMetaTemplate(testMetaTemplate);
+
+						testMetaTemplate.addPattern('[^', '^]', 
+							function (pData)
+							{
+								return `This ${pData} is like ${JSON.stringify(this)}`;
+							}, {BigData:'is here'});
+
+						let	tmpResult = testMetaTemplate.parseString(tmpTestString, 'where my big data at');
+						Expect(tmpResult).to.equal(tmpExpectedResult);
+						fDone();
+					}
+				);
+				test
 				(
 					'Leveraging pData a using subobjects...',
 					(fDone) =>