fable 3.0.97 → 3.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.97",
+    "version": "3.0.98",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -50,14 +50,14 @@
     },
     "homepage": "https://github.com/stevenvelozo/fable",
     "devDependencies": {
-        "quackage": "^1.0.22"
+        "quackage": "^1.0.25"
     },
     "dependencies": {
         "async.eachlimit": "^0.5.2",
         "async.waterfall": "^0.5.2",
         "big.js": "^6.2.1",
         "cachetrax": "^1.0.4",
-        "cookie": "^0.5.0",
+        "cookie": "^0.6.0",
         "data-arithmatic": "^1.0.7",
         "dayjs": "^1.11.10",
         "fable-log": "^3.0.13",

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

@@ -35,6 +35,7 @@ class FableServiceAnticipate extends libFableServiceBase
 			// 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
@@ -46,6 +47,7 @@ class FableServiceAnticipate extends libFableServiceBase
 	// Expects a function fAsynchronousFunction(fCallback)
 	anticipate(fAsynchronousFunction)
 	{
+		this.log.trace('Adding a function...')
 		this.operationQueue.push(fAsynchronousFunction);
 		this.checkQueue();
 	}

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

@@ -9,9 +9,9 @@ class StringParser
 	/**
 	 * StringParser Constructor
 	 */
-	constructor(fEachLimit)
+	constructor(pFable)
 	{
-		this.eachLimit = fEachLimit;
+		this.fable = pFable;
 	}
 
 	/**
@@ -206,7 +206,7 @@ class StringParser
 
 					pParserState.OutputBuffer = pAsyncOutput;
 					this.resetOutputBuffer(pParserState);
-					return setTimeout(fCallback, 0);
+					return fCallback();
 				});
 		}
 		else if (pParserState.Pattern.isAsync && pParserState.Pattern.isBoth)
@@ -222,7 +222,7 @@ class StringParser
 
 					pParserState.OutputBuffer = pAsyncOutput;
 					this.resetOutputBuffer(pParserState);
-					return setTimeout(fCallback, 0);
+					return fCallback();
 				});
 		}
 		else
@@ -230,7 +230,7 @@ class StringParser
 			// 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 setTimeout(fCallback, 0);
+			return fCallback();
 		}
 	}
 
@@ -360,18 +360,25 @@ class StringParser
 			let tmpParserState = this.newParserState(pParseTree);
 			tmpParserState.Asynchronous = true;
 
-			this.eachLimit(pString, 1,
-				(pCharacter, fCharacterCallback) =>
-				{
-					this.parseCharacterAsync(pCharacter, tmpParserState, pData, fCharacterCallback);
-				},
+			let tmpAnticipate = this.fable.instantiateServiceProviderWithoutRegistration('Anticipate');
+
+			for (let i = 0; i < pString.length; i++)
+			{
+				tmpAnticipate.anticipate(
+					(fCallback) =>
+					{
+						console.log(`Running template for character [${pString[i]}] index ${i}`);
+						this.parseCharacterAsync(pString[i], tmpParserState, pData, fCallback);
+					});
+			}
+
+			tmpAnticipate.wait(
 				(pError) =>
 				{
 					// Flush the remaining data
 					this.flushOutputBuffer(tmpParserState);
-					fCallback(pError, tmpParserState.Output);
+					return fCallback(pError, tmpParserState.Output);
 				});
-
 		}
 	}
 }

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

@@ -20,7 +20,7 @@ class FableServiceMetaTemplate extends libFableServiceBase
 		this.WordTree = new libWordTree();
 
 		// In order to allow asynchronous template processing we need to use the async.eachLimit function
-		this.StringParser = new libStringParser(this.fable.services.Utility.eachLimit);
+		this.StringParser = new libStringParser(this.fable);
 
 		this.ParseTree = this.WordTree.ParseTree;
 	}

package/retold-harness/bookstore-serve-api.js

@@ -1,41 +0,0 @@
-const _Settings = require('./configuration-bookstore-serve-api.js');
-
-const libFable = require('fable');
-
-_Fable = new libFable(_Settings);
-_Fable.addServiceType('RetoldDataService', require('retold-data-service'));
-// The RetoldDataService defaults to process.cwd() but we want to run this from wherever.
-_Fable.instantiateServiceProvider('RetoldDataService',
-    {
-        "FullMeadowSchemaPath": `${__dirname}/model/`,
-		"DALMeadowSchemaPath": `${__dirname}/model/meadow/`
-    });
-
-_Fable.MeadowEndpoints.Book.controller.BehaviorInjection.setBehavior('Read-PostOperation',
-    (pRequest, pRequestState, fComplete) =>
-    {
-        // Get the join records
-        _Fable.DAL.BookAuthorJoin.doReads(_Fable.DAL.BookAuthorJoin.query.addFilter('IDBook', pRequestState.Record.IDBook),
-            (pJoinReadError, pJoinReadQuery, pJoinRecords)=>
-            {
-                let tmpAuthorList = [];
-                for (let j = 0; j < pJoinRecords.length; j++)
-                {
-                    tmpAuthorList.push(pJoinRecords[j].IDAuthor);
-                }
-                if (tmpAuthorList.length < 1)
-                {
-                    pRequestState.Record.Authors = [];
-                    return fComplete();
-                }
-                else
-                {
-                    _Fable.DAL.Author.doReads(_Fable.DAL.Author.query.addFilter('IDAuthor', tmpAuthorList, 'IN'),
-                        (pReadsError, pReadsQuery, pAuthors)=>
-                        {
-                            pRequestState.Record.Authors = pAuthors;
-                            return fComplete();
-                        });
-                }
-            });
-    });

package/retold-harness/configuration-bookstore-serve-api.js

@@ -1,30 +0,0 @@
-module.exports = (
-	{
-		"Product": "MeadowEndpointsTestBookStore",
-		"ProductVersion": "1.0.0",
-
-		"UUID":
-			{
-				"DataCenter": 0,
-				"Worker": 0
-			},
-		"LogStreams":
-			[
-				{
-					"streamtype": "console"
-				}
-			],
-
-		"APIServerPort": 8086,
-
-		"MySQL":
-			{
-				"Server": "127.0.0.1",
-				"Port": 3306,
-				"User": "root",
-				"Password": "123456789",
-				"Database": "bookstore",
-				"ConnectionPoolLimit": 20
-			},
-		"MeadowConnectionMySQLAutoConnect": true
-	});

package/retold-harness/docker_scripts/MySQL-Laden-Entry.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-trap 'kill -TERM $PID' TERM INT
-
-/usr/bin/entrypoint.sh --bind-addr "0.0.0.0:8080" . &
-
-PID=$!
-
-sleep 2
-
-sudo service mariadb restart
-
-wait $PID
-trap - TERM INT
-wait $PID
-EXIT_STATUS=$?
-echo "Service exited with status ${EXIT_STATUS}"