fable 3.0.103 → 3.0.104

package/package.json

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

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

@@ -15,6 +15,8 @@ class FableServiceAnticipate extends libFableServiceBase
 		this.executingOperationCount = 0;
 		this.completedOperationCount = 0;
 
+		this.callDepth = 0;
+
 		this.maxOperations = 1;
 
 		this.lastError = undefined;
@@ -60,8 +62,8 @@ class FableServiceAnticipate extends libFableServiceBase
 				Called: false,
 				Error: undefined,
 				OperationSet: this
-			});		
-		return hoistedCallback;
+			});
+		return hoistedCallback.bind(this);
 		function hoistedCallback(pError)
 		{
 			if (tmpCallbackState.Called)
@@ -75,7 +77,18 @@ class FableServiceAnticipate extends libFableServiceBase
 			tmpCallbackState.OperationSet.executingOperationCount -= 1;
 			tmpCallbackState.OperationSet.completedOperationCount += 1;
 
-			tmpCallbackState.OperationSet.checkQueue();
+			tmpCallbackState.OperationSet.callDepth++;
+
+			// TODO: Figure out a better pattern for chaining templates so the call stack doesn't get abused.
+			if (tmpCallbackState.OperationSet.callDepth > 400)
+			{
+				tmpCallbackState.OperationSet.callDepth = 0;
+				setTimeout(tmpCallbackState.OperationSet.checkQueue.bind(this), 0);
+			}
+			else
+			{
+				tmpCallbackState.OperationSet.checkQueue();
+			}
 		}
 	}
 

package/test/Anticipate_tests.js

@@ -85,6 +85,30 @@ suite
 									});
 								}
 							);
+						test
+							(
+								'Huge call stack',
+								function (fTestComplete)
+								{
+									this.timeout(10000);
+									let testFable = new libFable();
+									let tmpAnticipate = testFable.instantiateServiceProvider('Anticipate');
+
+									for (let i = 0; i < 50000; i++)
+									{
+										tmpAnticipate.anticipate(function (fCallback)
+										{
+											return fCallback();
+										});
+									}
+
+									tmpAnticipate.wait(function (pError)
+									{
+										testFable.log.info(`Waits completed!`)
+										return fTestComplete();
+									});
+								}
+							);
 					}
 				);
 		}