fable 3.0.63 → 3.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.63",
+    "version": "3.0.65",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -58,7 +58,7 @@
         "cookie": "^0.5.0",
         "data-arithmatic": "^1.0.7",
         "fable-log": "^3.0.10",
-        "fable-serviceproviderbase": "^3.0.6",
+        "fable-serviceproviderbase": "^3.0.7",
         "fable-settings": "^3.0.6",
         "fable-uuid": "^3.0.5",
         "manyfest": "^1.0.24",

package/source/Fable-ServiceManager.js

@@ -30,11 +30,19 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 
 	addServiceType(pServiceType, pServiceClass)
 	{
-		// Add the type to the list of types
-		this.serviceTypes.push(pServiceType);
+		if (this.serviceMap.hasOwnProperty(pServiceType))
+		{
+			// TODO: Check if any services are running?
+			this.fable.log.warn(`Adding a service type [${pServiceType}] that already exists.`);
+		}
+		else
+		{
+			// Add the container for instantiated services to go in
+			this.serviceMap[pServiceType] = {};
 
-		// Add the container for instantiated services to go in
-		this.serviceMap[pServiceType] = {};
+			// Add the type to the list of types
+			this.serviceTypes.push(pServiceType);
+		}
 
 		// Using the static member of the class is a much more reliable way to check if it is a service class than instanceof
 		if ((typeof(pServiceClass) == 'function') && (pServiceClass.isFableService))
@@ -54,7 +62,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 	addAndInstantiateServiceType(pServiceType, pServiceClass)
 	{
 		this.addServiceType(pServiceType, pServiceClass);
-		this.instantiateServiceProvider(pServiceType, {}, `${pServiceType}-Default`);
+		return this.instantiateServiceProvider(pServiceType, {}, `${pServiceType}-Default`);
 	}
 
 	// Some services expect to be overloaded / customized class.
@@ -123,7 +131,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		{
 			// If the core service hasn't registered itself yet, create the service container for it.
 			// This means you couldn't register another with this type unless it was later registered with a constructor class.
-			this.services[tmpServiceType] = {};
+			this.serviceMap[tmpServiceType] = {};
 		}
 		// Add the service to the service map
 		this.serviceMap[tmpServiceType][tmpServiceHash] = pServiceInstance;

package/source/Fable.js

@@ -82,9 +82,9 @@ class Fable
 		return this._coreServices.ServiceManager.services;
 	}
 
-	get defaultServices()
+	get serviceMap()
 	{
-		return this._coreServices.ServiceManager.services;
+		return this._coreServices.ServiceManager.serviceMap;
 	}
 
 	getUUID()

package/test/FableServiceManager_tests.js

@@ -90,7 +90,7 @@ suite
 									testFable.serviceManager.addServiceType('SimpleService');
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.services['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-123']).to.be.an('object');
 								}
 							);
 						test
@@ -121,7 +121,7 @@ suite
 									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.services['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-123']).to.be.an('object');
 
 									Expect(testFable.serviceManager.services['SimpleService']).to.be.an('object');
 
@@ -141,9 +141,9 @@ suite
 
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-13');
 
-									testFable.serviceManager.services['SimpleService']['SimpleService-13'].doSomething();
+									testFable.serviceManager.serviceMap['SimpleService']['SimpleService-13'].doSomething();
 
-									Expect(testFable.serviceManager.services['SimpleService']['SimpleService-13']).to.be.an('object');
+									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-13']).to.be.an('object');
 								}
 							);