fable 3.0.91 → 3.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.91",
+    "version": "3.0.93",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {

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

@@ -105,12 +105,17 @@ class StringParser
 					// 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 (pParserState.Pattern.hasOwnProperty('Parse') && (!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);
 						return this.resetOutputBuffer(pParserState);
 					}
+					else
+					{
+						console.log(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
+						return this.resetOutputBuffer(pParserState);
+					}
 				}
 				else if (pParserState.PatternStartNode.PatternEnd.hasOwnProperty(pCharacter))
 				{
@@ -143,9 +148,9 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if (pParserState.Pattern.hasOwnProperty('Parse'))
 					{
-						if (pParserState.Pattern.isAsync)
+						if (pParserState.Pattern.isAsync && !pParserState.Pattern.isBoth)
 						{
-							this.log.error(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
+							console.log(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
 							this.resetOutputBuffer(pParserState);
 						}
 						else
@@ -184,6 +189,52 @@ class StringParser
 		return false;
 	}
 
+    executePatternAsync(pParserState, pData, fCallback)
+    {
+        // ... this is the end of a pattern, cut off the end tag and parse it.
+        // Trim the start and end tags off the output buffer now
+        if (pParserState.Pattern.isAsync && !pParserState.Pattern.isBoth)
+        {
+            // Run the function
+            return pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
+                (pError, pAsyncOutput) =>
+                {
+                    if (pError)
+                    {
+                        console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
+                    }
+
+                    pParserState.OutputBuffer = pAsyncOutput;
+                    this.resetOutputBuffer(pParserState);
+                    return fCallback();
+                });
+        }
+        else if (pParserState.Pattern.isAsync && pParserState.Pattern.isBoth)
+        {
+            // Run the function when both async and non async were provided with the pattern
+            return pParserState.Pattern.ParseAsync(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
+                (pError, pAsyncOutput) =>
+                {
+                    if (pError)
+                    {
+                        console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
+                    }
+
+                    pParserState.OutputBuffer = pAsyncOutput;
+                    this.resetOutputBuffer(pParserState);
+                    return fCallback();
+                });
+        }
+        else
+        {
+            // Run the t*mplate 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);
+            this.resetOutputBuffer(pParserState);
+            return fCallback();
+        }
+    }
+
+
 	/**
 	 * Parse a character in the buffer.
 	 * @method parseCharacter
@@ -213,31 +264,7 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if (pParserState.Pattern.hasOwnProperty('Parse'))
 					{
-						// ... this is the end of a pattern, cut off the end tag and parse it.
-						// Trim the start and end tags off the output buffer now
-						if (pParserState.Pattern.isAsync)
-						{
-							// Run the function
-							return pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
-								(pError, pAsyncOutput) =>
-								{
-									if (pError)
-									{
-										console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
-									}
-
-									pParserState.OutputBuffer = pAsyncOutput;
-									this.resetOutputBuffer(pParserState);
-									return fCallback();
-								});
-						}
-						else
-						{
-							// Run the t*mplate 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);
-							this.resetOutputBuffer(pParserState);
-							return fCallback();
-						}
+						return this.executePatternAsync(pParserState, pData, fCallback);
 					}
 				}
 				else if (pParserState.PatternStartNode.PatternEnd.hasOwnProperty(pCharacter))
@@ -271,31 +298,7 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if (pParserState.Pattern.hasOwnProperty('Parse'))
 					{
-						// ... this is the end of a pattern, cut off the end tag and parse it.
-						// Trim the start and end tags off the output buffer now
-						if (pParserState.Pattern.isAsync)
-						{
-							// Run the function
-							return pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
-								(pError, pAsyncOutput) =>
-								{
-									if (pError)
-									{
-										console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
-									}
-
-									pParserState.OutputBuffer = pAsyncOutput;
-									this.resetOutputBuffer(pParserState);
-									return fCallback();
-								});
-						}
-						else
-						{
-							// Run the t*mplate 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);
-							this.resetOutputBuffer(pParserState);
-							return fCallback();
-						}
+						return this.executePatternAsync(pParserState, pData, fCallback);
 					}
 				}
 			}
@@ -303,11 +306,10 @@ class StringParser
 			{
 				// We are in a pattern start but didn't match one; reset and start trying again from this character.
 				this.resetOutputBuffer(pParserState);
-				return fCallback();
 			}
 		}
 		// If we aren't in a pattern match or pattern, and this isn't the start of a new pattern (RAW mode)....
-		if (!pParserState.PatternMatch)
+		else
 		{
 			// This may be the start of a new pattern....
 			if (pParserState.ParseTree.hasOwnProperty(pCharacter))

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

@@ -101,18 +101,37 @@ class WordTree
 
 
 	/** Add a Pattern to the Parse Tree
-	 * @method addPattern
+	 * @method addPatternAsync
+	 * @param {Object} pPatternStart - The starting string for the pattern (e.g. "${")
+	 * @param {string} pPatternEnd - The ending string for the pattern (e.g. "}")
+	 * @param {function} fParserAsync - The function to parse if this is the matched pattern, once the Pattern End is met.  If this is a string, a simple replacement occurs.
+	 * @return {bool} True if adding the pattern was successful
+	 */
+	addPatternAsync (pPatternStart, pPatternEnd, fParserAsync)
+	{
+		let tmpLeaf = this.addPattern(pPatternStart, pPatternEnd, fParserAsync);
+		if (tmpLeaf)
+		{
+			tmpLeaf.isAsync = true;
+		}
+	}
+
+	/** Add a Pattern to the Parse Tree
+	 * @method addPatternBoth
 	 * @param {Object} pPatternStart - The starting string for the pattern (e.g. "${")
 	 * @param {string} pPatternEnd - The ending string for the pattern (e.g. "}")
 	 * @param {function} fParser - The function to parse if this is the matched pattern, once the Pattern End is met.  If this is a string, a simple replacement occurs.
 	 * @return {bool} True if adding the pattern was successful
 	 */
-	addPatternAsync (pPatternStart, pPatternEnd, fParser)
+	addPatternBoth (pPatternStart, pPatternEnd, fParser, fParserAsync)
 	{
 		let tmpLeaf = this.addPattern(pPatternStart, pPatternEnd, fParser);
 		if (tmpLeaf)
 		{
 			tmpLeaf.isAsync = true;
+			tmpLeaf.isBoth = true;
+			// When a leaf has both async and non-async versions of the functions, we store the async in fParserAsync.
+			tmpLeaf.ParseAsync = fParserAsync;
 		}
 	}
 }

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

@@ -44,6 +44,11 @@ class FableServiceMetaTemplate extends libFableServiceBase
 		return this.WordTree.addPatternAsync(pPatternStart, pPatternEnd, pParserPromise);
 	}
 
+	addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise)
+	{
+		return this.WordTree.addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise);
+	}
+
 	/**
 	 * Parse a string with the existing parse tree
 	 * @method parseString

package/test/MetaTemplating_tests.js

@@ -37,6 +37,16 @@ const configMetaTemplate = (pModule) =>
 		{
 			return fCallback(null, `ASYNC DATA IS [${pHash}]`);
 		});
+	
+	pModule.addPatternBoth('<~', '~>',
+		(pHash, pData) =>
+		{
+			return `Non-Async Jellyfish called for pData which is [${pData}] with a hash of [${pHash}]`
+		},
+		(pHash, pData, fCallback)=>
+		{
+			return fCallback(null, `Async Jellyfish called for pData which is [${pData}] with a hash of [${pHash}]`);
+		});
 
 };
 
@@ -160,6 +170,25 @@ suite
 					}
 				);
 				test
+				(
+					'Passing both Async and Non-async Function',
+					(fDone) =>
+					{
+						let tmpTestString = 'The <^SomeValue^> and <~JELLY FISH~> pData and Async <%AsyncThe Funny String%> up in here and a $comment$ as well.';
+						let tmpExpectedResultAsync = 'The hash of [SomeValue] from pData is AirbornLight and Async Jellyfish called for pData which is [[object Object]] with a hash of [JELLY FISH] pData and Async ASYNC DATA IS [The Funny String] up in here and a comment as well.';
+						let tmpExpectedResult = 'The hash of [SomeValue] from pData is AirbornLight and Non-Async Jellyfish called for pData which is [[object Object]] with a hash of [JELLY FISH] pData and Async <%AsyncThe Funny String%> up in here and a comment as well.';
+						let testMetaTemplate = loadMetaTemplateModule();
+						configMetaTemplate(testMetaTemplate);
+						let tmpNonAsyncResult = testMetaTemplate.parseString(tmpTestString, {SomeValue:'AirbornLight'});
+						Expect(tmpNonAsyncResult).to.equal(tmpExpectedResult);
+						let	tmpResult = testMetaTemplate.parseString(tmpTestString, {SomeValue:'AirbornLight'},
+							(pError, pValue) =>
+							{
+								Expect(pValue).to.equal(tmpExpectedResultAsync);
+								return fDone();
+							});
+					}
+				);				test
 				(
 					'Bad pattern start parameter...',
 					(fDone) =>