precedent 1.0.13 → 1.0.14

package/gulpfile-config.json

@@ -5,7 +5,7 @@
 
 	"LibraryOutputFolder": "./dist/",
 
-	"LibraryUniminifiedFileName": "precedent.js",
+	"LibraryUniminifiedFileName": "precedent.compatible.js",
 
-	"LibraryMinifiedFileName": "precedent.min.js"
+	"LibraryMinifiedFileName": "precedent.compatible.min.js"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "precedent",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Precedent Meta-Templating",
   "main": "source/Precedent.js",
   "bin": {
@@ -61,7 +61,5 @@
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },
-  "dependencies": {
-    "async": "^3.2.4"
-  }
+  "dependencies": {}
 }

package/source/Precedent.js

@@ -37,11 +37,6 @@ class Precedent
 		return this.WordTree.addPattern(pPatternStart, pPatternEnd, pParser);
 	}
 
-	addPatternAsync(pPatternStart, pPatternEnd, pParserPromise)
-	{
-		return this.WordTree.addPatternAsync(pPatternStart, pPatternEnd, pParserPromise);
-	}
-
 	/**
 	 * Parse a string with the existing parse tree
 	 * @method parseString
@@ -49,9 +44,9 @@ class Precedent
 	 * @param {object} pData - Data to pass in as the second argument
 	 * @return {string} The result from the parser
 	 */
-	parseString(pString, pData, fCallback)
+	parseString(pString, pData)
 	{
-		return this.StringParser.parseString(pString, this.ParseTree, pData, fCallback);
+		return this.StringParser.parseString(pString, this.ParseTree, pData);
 	}
 }
 

package/source/StringParser.js

@@ -1,15 +1,9 @@
 /**
 * String Parser
-*
-* @license     MIT
-*
 * @author      Steven Velozo <steven@velozo.com>
-*
 * @description Parse a string, properly processing each matched token in the word tree.
 */
 
-let libAsync = require('async');
-
 class StringParser
 {
 	/**
@@ -102,69 +96,15 @@ 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)
-			{
-				console.log(`Precedent ERROR: Async template detected for pattern ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd} but the template engine is being run in non-async mode.`);
-				this.OutputBuffer = '';
-				// Flush the output buffer.
-				this.flushOutputBuffer(pParserState);
-				// End pattern mode
-				pParserState.Pattern = false;
-				pParserState.PatternMatch = false;
-			}
-			else
-			{
-				pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStart.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStart.length+pParserState.Pattern.PatternEnd.length)), pData);
-				// Flush the output buffer.
-				this.flushOutputBuffer(pParserState);
-				// End pattern mode
-				pParserState.Pattern = false;
-				pParserState.PatternMatch = false;
-			}
+			pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStart.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStart.length+pParserState.Pattern.PatternEnd.length)), pData);
+			// Flush the output buffer.
+			this.flushOutputBuffer(pParserState);
+			// End pattern mode
+			pParserState.Pattern = false;
+			pParserState.PatternMatch = false;
 		}
 	}
 
-	checkPatternEndAsync (pParserState, pData, fCallback)
-	{
-		if ((pParserState.OutputBuffer.length >= pParserState.Pattern.PatternEnd.length+pParserState.Pattern.PatternStart.length) &&
-			(pParserState.OutputBuffer.substr(-pParserState.Pattern.PatternEnd.length) === pParserState.Pattern.PatternEnd))
-		{
-			// ... 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)
-			{
-				return pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStart.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStart.length+pParserState.Pattern.PatternEnd.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;
-						// Flush the output buffer.
-						this.flushOutputBuffer(pParserState);
-						// End pattern mode
-						pParserState.Pattern = false;
-						pParserState.PatternMatch = false;
-
-						return fCallback();
-					});
-			}
-			else
-			{
-				pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStart.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStart.length+pParserState.Pattern.PatternEnd.length)), pData);
-				// Flush the output buffer.
-				this.flushOutputBuffer(pParserState);
-				// End pattern mode
-				pParserState.Pattern = false;
-				pParserState.PatternMatch = false;
-			}
-		}
-
-		return fCallback();
-	}
-
 	/**
 	 * Parse a character in the buffer.
 	 * @method parseCharacter
@@ -204,82 +144,25 @@ class StringParser
 		}
 	}
 
-	parseCharacterAsync (pCharacter, pParserState, pData, fCallback)
-	{
-		// (1) If we aren't in a pattern match, and we aren't potentially matching, and this may be the start of a new pattern....
-		if (!pParserState.PatternMatch && pParserState.ParseTree.hasOwnProperty(pCharacter))
-		{
-			// ... assign the node as the matched node.
-			this.assignNode(pParserState.ParseTree[pCharacter], pParserState);
-			this.appendOutputBuffer(pCharacter, pParserState);
-		}
-		// (2) If we are in a pattern match (actively seeing if this is part of a new pattern token)
-		else if (pParserState.PatternMatch)
-		{
-			// If the pattern has a subpattern with this key
-			if (pParserState.PatternMatch.hasOwnProperty(pCharacter))
-			{
-				// Continue matching patterns.
-				this.assignNode(pParserState.PatternMatch[pCharacter], pParserState);
-			}
-			this.appendOutputBuffer(pCharacter, pParserState);
-			if (pParserState.Pattern)
-			{
-				// ... Check if this is the end of the pattern (if we are matching a valid pattern)...
-				return this.checkPatternEndAsync(pParserState, pData, fCallback);
-			}
-		}
-		// (3) If we aren't in a pattern match or pattern, and this isn't the start of a new pattern (RAW mode)....
-		else
-		{
-			pParserState.Output += pCharacter;
-		}
-
-		return fCallback(null);
-	}
-
 	/**
 	 * Parse a string for matches, and process any template segments that occur.
 	 * @method parseString
 	 * @param {string} pString - The string to parse.
 	 * @param {Object} pParseTree - The parse tree to begin parsing from (usually root)
 	 * @param {Object} pData - The data to pass to the function as a second parameter
-	 * @param {function} fCallback - The callback function to call when the parse is complete
 	 */
-	parseString (pString, pParseTree, pData, fCallback)
+	parseString (pString, pParseTree, pData)
 	{
-		if (typeof(fCallback) !== 'function')
-		{
-			let tmpParserState = this.newParserState(pParseTree);
+		let tmpParserState = this.newParserState(pParseTree);
 
-			for (var i = 0; i < pString.length; i++)
-			{
-				// TODO: This is not fast.
-				this.parseCharacter(pString[i], tmpParserState, pData, fCallback);
-			}
-
-			this.flushOutputBuffer(tmpParserState);
-
-			return tmpParserState.Output;
-		}
-		else
+		for (var i = 0; i < pString.length; i++)
 		{
-			// This is the async mode
-			let tmpParserState = this.newParserState(pParseTree);
+			this.parseCharacter(pString[i], tmpParserState, pData);
+		}
 
-			libAsync.eachSeries(pString,
-				(pCharacter, fCharacterCallback) =>
-				{
-					this.parseCharacterAsync(pCharacter, tmpParserState, pData, fCharacterCallback);
-				},
-				(pError) =>
-				{
-					// Flush the remaining data
-					this.flushOutputBuffer(tmpParserState);
-					fCallback(pError, tmpParserState.Output);
-				});
+		this.flushOutputBuffer(tmpParserState);
 
-		}
+		return tmpParserState.Output;
 	}
 }
 

package/source/WordTree.js

@@ -1,10 +1,6 @@
 /**
 * Word Tree
-*
-* @license     MIT
-*
 * @author      Steven Velozo <steven@velozo.com>
-*
 * @description Create a tree (directed graph) of Javascript objects, one character per object.
 */
 
@@ -61,38 +57,6 @@ class WordTree
 		tmpLeaf.Parse = (typeof(pParser) === 'function') ? pParser :
 						(typeof(pParser) === 'string') ? () => { return pParser; } :
 						(pData) => { return pData; };
-		tmpLeaf.isPromise = false;
-
-		return true;
-	}
-
-	/** Add a Pattern to the Parse Tree (asynchronous)
-	 * @method addPattern
-	 * @param {Object} pPatternStart - The starting string for the pattern (e.g. "${")
-	 * @param {string} pPatternEnd - The ending string for the pattern (e.g. "}")
-	 * @param {number} pParserAsync - The function (with an asynchronous callback) 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, pParserAsync)
-	{
-		if (pPatternStart.length < 1)
-			return false;
-
-		if ((typeof(pPatternEnd) === 'string') && (pPatternEnd.length < 1))
-			return false;
-
-		let tmpLeaf = this.ParseTree;
-
-		// Add the tree of leaves iteratively
-		for (var i = 0; i < pPatternStart.length; i++)
-			tmpLeaf = this.addChild(tmpLeaf, pPatternStart, i);
-
-		tmpLeaf.PatternStart = pPatternStart;
-		tmpLeaf.PatternEnd = ((typeof(pPatternEnd) === 'string') && (pPatternEnd.length > 0)) ? pPatternEnd : pPatternStart;
-		tmpLeaf.Parse = (typeof(pParserAsync) === 'function') ? pParserAsync :
-						(typeof(pParserAsync) === 'string') ? (pHash, pData, fCallback) => { fCallback(pParserPromise); } :
-						(pHash, pData, fCallback) => { return fCallback(pHash); };
-		tmpLeaf.isAsync = true;
 
 		return true;
 	}

package/test/Precedent_tests.js

@@ -30,12 +30,6 @@ var configPrecedent = (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', '%>', 
-		(pHash, pData, fCallback)=>
-		{
-			return fCallback(null, `ASYNC DATA IS [${pHash}]`);
-		});
 };
 
 suite
@@ -159,23 +153,6 @@ suite
 					}
 				);
 				test
-				(
-					'Async Function',
-					(fDone) =>
-					{
-						var tmpTestString = 'The <^SomeValue^> pData and Async <%AsyncThe Funny String%> up in here and a $comment$ as well.';
-						var tmpExpectedResult = 'The hash of [SomeValue] from pData is AirbornLight pData up in here and a comment as well.';
-						var testPrecedent = loadPrecedentModule();
-						configPrecedent(testPrecedent);
-						var	tmpResult = testPrecedent.parseString(tmpTestString, {SomeValue:'AirbornLight'}, 
-							(pError, pValue) =>
-							{
-								Expect(pValue).to.equal('The hash of [SomeValue] from pData is AirbornLight pData and Async ASYNC DATA IS [The Funny String] up in here and a comment as well.');
-								return fDone();
-							});
-					}
-				);
-				test
 				(
 					'Bad pattern start parameter...',
 					(fDone) =>