fable 3.0.141 → 3.0.143

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.141",
+    "version": "3.0.143",
     "description": "A service dependency injection, configuration and logging library.",
     "main": "source/Fable.js",
     "scripts": {

package/source/Fable.js

@@ -171,13 +171,27 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 	{
 		this.addServiceTypeIfNotExists(pServiceType, pServiceClass);
 
-		if (!(pServiceType in this.servicesMap))
+		if ((!(pServiceType in this.servicesMap)) || (!(pServiceType in this.fable)))
 		{
 			return this.instantiateServiceProvider(pServiceType, {}, `${pServiceType}-Default`);
 		}
 		else
 		{
-			return this.serviceClasses[pServiceType];
+			return this[pServiceType];
+		}
+	}
+
+	addAndInstantiateSingletonService(pServiceType, pOptions, pServiceClass)
+	{
+		this.addServiceTypeIfNotExists(pServiceType, pServiceClass);
+
+		if ((!(pServiceType in this.servicesMap)) || (!(pServiceType in this.fable)))
+		{
+			return this.instantiateServiceProvider(pServiceType, {}, `${pServiceType}-Default`);
+		}
+		else
+		{
+			return this[pServiceType];
 		}
 	}
 

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-SolvePostfixedExpression.js

@@ -106,7 +106,7 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 				{
 					try
 					{
-						this.log.trace(`Solving Function Step ${i} [${tmpStepResultObject.ExpressionStep.VirtualSymbolName}] --> [${tmpStepResultObject.ExpressionStep.Operation.Token}]: ( ${tmpStepResultObject.ExpressionStep.LeftValue.Value} , ${tmpStepResultObject.ExpressionStep.RightValue.Value} )`);
+						//this.log.trace(`Solving Function Step ${i} [${tmpStepResultObject.ExpressionStep.VirtualSymbolName}] --> [${tmpStepResultObject.ExpressionStep.Operation.Token}]: ( ${tmpStepResultObject.ExpressionStep.LeftValue.Value} , ${tmpStepResultObject.ExpressionStep.RightValue.Value} )`);
 						// Build the set of arguments to send to the functions.
 						tmpStepResultObject.ExpressionStep.LeftValue.ArgumentString = '';
 						if (typeof(tmpStepResultObject.ExpressionStep.LeftValue.Value) === 'undefined')
@@ -153,7 +153,7 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 				{
 					try
 					{
-						this.log.trace(`Solving Step ${i} [${tmpStepResultObject.ExpressionStep.VirtualSymbolName}] --> [${tmpStepResultObject.ExpressionStep.Operation.Token}]: ( ${tmpStepResultObject.ExpressionStep.LeftValue.Value} , ${tmpStepResultObject.ExpressionStep.RightValue.Value} )`);
+						//this.log.trace(`Solving Step ${i} [${tmpStepResultObject.ExpressionStep.VirtualSymbolName}] --> [${tmpStepResultObject.ExpressionStep.Operation.Token}]: ( ${tmpStepResultObject.ExpressionStep.LeftValue.Value} , ${tmpStepResultObject.ExpressionStep.RightValue.Value} )`);
 						tmpManifest.setValueAtAddress(tmpResults.VirtualSymbols, tmpStepResultObject.ExpressionStep.VirtualSymbolName, tmpManifest.getValueAtAddress(tmpStepResultObject, `${tmpFunctionAddress}(ExpressionStep.LeftValue.Value,ExpressionStep.RightValue.Value)`));
 						tmpResults.LastResult = tmpManifest.getValueAtAddress(tmpResults.VirtualSymbols, tmpStepResultObject.ExpressionStep.VirtualSymbolName);
 						//this.log.trace(`   ---> Step ${i}: ${tmpResults.VirtualSymbols[tmpStepResultObject.ExpressionStep.VirtualSymbolName]}`)

package/test/FableServiceManager_tests.js

@@ -166,7 +166,24 @@ suite
 									Expect(tmpService).to.be.an('object');
 								}
 							);
+						test
+							(
+								'Add and instantiate a singleton service',
+								function ()
+								{
+									let testFable = new libFable({});
+
+									let tmpService = testFable.addAndInstantiateSingletonService('SimpleService', {}, SimpleService);
 
+									Expect(testFable.SimpleService).to.be.an('object');
+									Expect(tmpService).to.be.an('object');
+
+									let tmpService2 = testFable.addAndInstantiateSingletonService('SimpleService', {}, SimpleService);
+
+									// A second call should not construct another one.
+									Expect(tmpService2.Hash).to.equal(tmpService.Hash);
+								}
+							);
 						test
 							(
 								'Change the default service provider',