fable 3.0.109 → 3.0.111

package/package.json

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

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

@@ -25,8 +25,21 @@ class FableServiceAnticipate extends libFableServiceBase
 
 	checkQueue()
 	{
+		// This could be combined with the last else if stanza but the logic for errors and non-errors would be blended and more complex to follow so keeping it unrolled.
+		if (this.lastError)
+		{
+			// If there are no operations left, and we have waiting functions, call them.
+			for (let i = 0; i < this.waitingFunctions.length; i++)
+			{
+				//this.log.trace('Calling waiting function.')
+				this.waitingFunctions[i](this.lastError);
+			}
+			// Reset our state
+			this.lastError = undefined;
+			this.waitingFunctions = [];
+		}
 		// This checks to see if we need to start any operations.
-		if (this.operationQueue.length > 0 && this.executingOperationCount < this.maxOperations)
+		else if (this.operationQueue.length > 0 && this.executingOperationCount < this.maxOperations)
 		{
 			let tmpOperation = this.operationQueue.shift();
 			this.executingOperationCount += 1;
@@ -72,7 +85,7 @@ class FableServiceAnticipate extends libFableServiceBase
 				throw new Error("Anticipation async callback called twice...");
 			}
 			tmpCallbackState.Called = true;
-			tmpCallbackState.error = pError;
+			this.lastError = pError;
 
 			tmpCallbackState.OperationSet.executingOperationCount -= 1;
 			tmpCallbackState.OperationSet.completedOperationCount += 1;

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

@@ -113,7 +113,7 @@ class StringParser
 					}
 					else
 					{
-						console.log(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
+						this.fable.log.info(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
 						return this.resetOutputBuffer(pParserState);
 					}
 				}
@@ -150,7 +150,7 @@ class StringParser
 					{
 						if (pParserState.Pattern.isAsync && !pParserState.Pattern.isBoth)
 						{
-							console.log(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
+							this.fable.log.info(`MetaTemplate: The pattern ${pParserState.Pattern.PatternStartString} is asynchronous and cannot be used in a synchronous parser.`);
 							this.resetOutputBuffer(pParserState);
 						}
 						else
@@ -201,7 +201,7 @@ class StringParser
 				{
 					if (pError)
 					{
-						console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
+						this.fable.log.info(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
 					}
 
 					pParserState.OutputBuffer = pAsyncOutput;
@@ -217,7 +217,7 @@ class StringParser
 				{
 					if (pError)
 					{
-						console.log(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
+						this.fable.log.info(`Precedent ERROR: Async template error happened parsing ${pParserState.Pattern.PatternStart} ... ${pParserState.Pattern.PatternEnd}: ${pError}`);
 					}
 
 					pParserState.OutputBuffer = pAsyncOutput;

package/test/Anticipate_tests.js

@@ -85,6 +85,60 @@ suite
 									});
 								}
 							);
+						test
+							(
+								'Error bailout',
+								function (fTestComplete)
+								{
+									let testFable = new libFable();
+									let tmpAnticipate = testFable.newAnticipate();
+									let tmpPostErrorMethodCalled = false;
+									tmpAnticipate.anticipate(function (fCallback)
+									{
+										testFable.log.info('Operation First test timeout entered...');
+										setTimeout(function ()
+										{
+											testFable.log.info(`Operation First test timeout done!`);
+											fCallback();
+										}, 500);
+									});
+									tmpAnticipate.anticipate(function (fCallback)
+									{
+										testFable.log.info('Operation Second test timeout entered...');
+										setTimeout(function ()
+										{
+											testFable.log.info(`Operation Second test timeout done!`);
+											fCallback();
+										}, 50);
+									});
+									tmpAnticipate.anticipate(function (fCallback)
+									{
+										testFable.log.info('Operation Second test timeout entered...');
+										setTimeout(function ()
+										{
+											testFable.log.info(`Operation Second test timeout done!`);
+											fCallback(new Error('Bail out or else!'));
+										}, 50);
+									});
+									tmpAnticipate.anticipate(function (fCallback)
+									{
+										testFable.log.info('Operation Third test timeout entered...');
+										setTimeout(function ()
+										{
+											tmpPostErrorMethodCalled = true;
+											testFable.log.info(`Operation Third test timeout done!`);
+											fCallback();
+										}, 50);
+									});
+									tmpAnticipate.wait(function (pError)
+									{
+										Expect(pError).to.be.an('error');
+										Expect(tmpPostErrorMethodCalled).to.equal(false);
+										testFable.log.info(`Wait 1 completed: ${pError}`)
+										return fTestComplete();
+									});
+								}
+							);
 						test
 							(
 								'Huge call stack',