fable 3.0.131 → 3.0.133

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

@@ -105,25 +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 (('Parse' in pParserState.Pattern) && (!pParserState.Pattern.isAsync || pParserState.Pattern.isBoth))
+					// Run the function
+					let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
+					if (tmpFunctionContext)
 					{
-						// Run the function
-						let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
-						if (tmpFunctionContext)
-						{
-							pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext);
-						}
-						else
-						{
-							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);
-						}
-						return this.resetOutputBuffer(pParserState);
+						pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext);
 					}
 					else
 					{
-						this.fable.log.info(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
-						return this.resetOutputBuffer(pParserState);
+						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);
 					}
+					return this.resetOutputBuffer(pParserState);
 				}
 				else if (pCharacter in pParserState.PatternStartNode.PatternEnd)
 				{
@@ -156,25 +148,17 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if ('Parse' in pParserState.Pattern)
 					{
-						if (pParserState.Pattern.isAsync && !pParserState.Pattern.isBoth)
+						// Run the t*mplate function
+						let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
+						if (tmpFunctionContext)
 						{
-							this.fable.log.info(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
-							this.resetOutputBuffer(pParserState);
+							pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext);
 						}
 						else
 						{
-							// Run the t*mplate function
-							let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
-							if (tmpFunctionContext)
-							{
-								pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext);
-							}
-							else
-							{
-								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);
-							}
-							return this.resetOutputBuffer(pParserState);
+							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);
 						}
+						return this.resetOutputBuffer(pParserState);
 					}
 				}
 			}
@@ -209,46 +193,11 @@ class StringParser
 	{
 		// ... 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)
+		if (pParserState.Pattern.isAsync)
 		{
 			// Run the function
 			let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
 			if (tmpFunctionContext)
-			{
-				return pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
-					(pError, pAsyncOutput) =>
-					{
-						if (pError)
-						{
-							this.fable.log.info(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
-						}
-
-						pParserState.OutputBuffer = pAsyncOutput;
-						this.resetOutputBuffer(pParserState);
-						return fCallback();
-					}, pDataContext);
-			}
-			else
-			{
-				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)
-						{
-							this.fable.log.info(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
-						}
-
-						pParserState.OutputBuffer = pAsyncOutput;
-						this.resetOutputBuffer(pParserState);
-						return fCallback();
-					}, pDataContext);
-			}
-		}
-		else if (pParserState.Pattern.isAsync && pParserState.Pattern.isBoth)
-		{
-			// Run the function when both async and non async were provided with the pattern
-			let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
-			if (tmpFunctionContext)
 			{
 				return pParserState.Pattern.ParseAsync.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData,
 					(pError, pAsyncOutput) =>

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

@@ -52,14 +52,16 @@ class WordTree
 		return pTree.PatternEnd[pPattern];
 	}
 
-	/** Add a Pattern to the Parse Tree
-	 * @method addPattern
+	/** Add a Pattern to the Parse Tree with both function parameter types
+	 * @method addPatternAll
 	 * @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
+	 * @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.
+	 * @param {Object} pParserContext - The context to pass to the parser function
+	 * @return {Object} The leaf parser from the tree
 	 */
-	addPattern (pPatternStart, pPatternEnd, fParser, pParserContext)
+	addPatternBoth (pPatternStart, pPatternEnd, fParser, fParserAsync, pParserContext)
 	{
 		if (pPatternStart.length < 1)
 		{
@@ -93,8 +95,12 @@ class WordTree
 		tmpLeaf.PatternStartString = pPatternStart;
 		tmpLeaf.PatternEndString = tmpPatternEnd;
 		tmpLeaf.Parse = (typeof(fParser) === 'function') ? fParser :
-						(typeof(fParser) === 'string') ? () => { return fParser; } :
-						(pData) => { return pData; };
+						(typeof(fParser) === 'string') ? (pHash, pData) => { return fParser; } :
+						(pHash, pData) => { return pHash; };
+
+		tmpLeaf.ParseAsync = (typeof(fParserAsync) === 'function') ? fParserAsync :
+						(typeof(fParserAsync) === 'string') ? (pHash, pData, fCallback) => { return fCallback(null, fParserAsync); } :
+						(pHash, pData, fCallback) => { return fCallback(null, tmpLeaf.Parse(pHash, pData)); }
 
 		// A "this" for every object
 		if (pParserContext)
@@ -102,43 +108,21 @@ class WordTree
 			tmpLeaf.ParserContext = pParserContext;
 		}
 
-		return tmpLeaf;
-	}
-
+		tmpLeaf.isAsync = true;
 
-	/** Add a Pattern to the Parse Tree
-	 * @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, pParserContext)
-	{
-		let tmpLeaf = this.addPattern(pPatternStart, pPatternEnd, fParserAsync, pParserContext);
-		if (tmpLeaf)
-		{
-			tmpLeaf.isAsync = true;
-		}
+		return tmpLeaf;
 	}
 
-	/** Add a Pattern to the Parse Tree
-	 * @method addPatternBoth
+	/** Add a Pattern to the Parse Tree with both function parameter types
+	 * @method addPatternAll
 	 * @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
+	 * @param {Object} pParserContext - The context to pass to the parser function
 	 */
-	addPatternBoth (pPatternStart, pPatternEnd, fParser, fParserAsync, pParserContext)
+	addPattern (pPatternStart, pPatternEnd, fParser, pParserContext)
 	{
-		let tmpLeaf = this.addPattern(pPatternStart, pPatternEnd, fParser, pParserContext);
-		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;
-		}
+		return this.addPatternBoth(pPatternStart, pPatternEnd, fParser, null, pParserContext);
 	}
 }
 

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

@@ -30,11 +30,6 @@ class FableServiceMetaTemplate extends libFableServiceBase
 		return this.WordTree.addPattern(pPatternStart, pPatternEnd, pParser, pParserContext);
 	}
 
-	addPatternAsync(pPatternStart, pPatternEnd, pParserPromise, pParserContext)
-	{
-		return this.WordTree.addPatternAsync(pPatternStart, pPatternEnd, pParserPromise, pParserContext);
-	}
-
 	addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise, pParserContext)
 	{
 		return this.WordTree.addPatternBoth(pPatternStart, pPatternEnd, pParser, pParserPromise, pParserContext);

package/test/ExpressionParser_tests.js

@@ -162,6 +162,8 @@ suite
 
 						Expect(_Parser.solve('5 ^ 2')).to.equal('25');
 
+						Expect(_Parser.solve('Result = sqrt(100 * (C + 30)) + sin(Depth - Width) / 10', { "PR": 1.5, "Z": "20.036237", "C": -13, Depth: 100.203, Width: 10.5})).to.equal('41.32965489638783839821');
+
 						Expect(_Parser.solve('((15000 * 2) / 4)^2 + 100 - 10 * (35 + 5)')).to.equal("56249700");
 
 						Expect(_Parser.solve('1.5 * sqrt(8 * 2.423782342^2) / 10')).to.equal('1.02832375808904701855')
@@ -170,7 +172,7 @@ suite
 						Expect(_Parser.solve('sin(rad(60))')).to.equal('0.8660254037844386');
 
 						Expect(_Parser.solve('Result = 5+3 - sqrt(75 / (3 + Depth) * Width)^ 3', { "PR": 1.5, "Z": "20.036237", "C": -13, Depth: 100.203, Width: 10.5}))
-							.to.equal('-436.298371634749698156043404501049817281022489463053365091209703125')
+							.to.equal('-13.078386362213538715906797395732300153182132216343566001917247')
 
 						let tmpResult = _Parser.solve('Result = (160 * PR * Z) / (C / 100) * PR * Z + (160 * (1 - C / 100))', {C:-13,PR:1.5,Z:20.03})
 						Expect(tmpResult).to.equal("-1110837.0769230769230769230307");

package/test/MetaTemplating_tests.js

@@ -31,7 +31,11 @@ const configMetaTemplate = (pModule) =>
 	pModule.addPattern('<^', '^>', (pHash, pData)=>{return `hash of [${pHash}] from pData is ${pData[pHash]}`});
 	// This just escapes out pairs of $
 	pModule.addPattern('$');
-	pModule.addPatternAsync('<%Async', '%>',
+	pModule.addPatternBoth('<%Async', '%>',
+		(pHash, pData) =>
+		{
+			return `NONASYNC DATA IS [${pHash}]`;
+		},
 		(pHash, pData, fCallback)=>
 		{
 			return fCallback(null, `ASYNC DATA IS [${pHash}]`);
@@ -207,7 +211,7 @@ suite
 					{
 						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 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 NONASYNC DATA IS [The Funny String] up in here and a comment as well.';
 						let testMetaTemplate = loadMetaTemplateModule();
 						configMetaTemplate(testMetaTemplate);
 						let tmpNonAsyncResult = testMetaTemplate.parseString(tmpTestString, {SomeValue:'AirbornLight'});