fable 3.0.27 → 3.0.29

package/gulpfile-config.json

@@ -5,7 +5,7 @@
 
 	"LibraryOutputFolder": "./dist/",
 
-	"LibraryUniminifiedFileName": "fable.js",
+	"LibraryUniminifiedFileName": "fable.compatible.js",
 
-	"LibraryMinifiedFileName": "fable.min.js"
+	"LibraryMinifiedFileName": "fable.compatible.min.js"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "description": "An entity behavior management and API bundling library.",
   "main": "source/Fable.js",
   "scripts": {
@@ -65,6 +65,7 @@
     "async.waterfall": "^0.5.2",
     "data-arithmatic": "^1.0.4",
     "fable-log": "^3.0.7",
+    "fable-serviceproviderbase": "^3.0.2",
     "fable-settings": "^3.0.3",
     "fable-uuid": "^3.0.2",
     "precedent": "^1.0.10",

package/source/Fable-ServiceManager.js

@@ -4,7 +4,7 @@
 * @author <steven@velozo.com>
 */
 
-const libFableServiceBase = require('./Fable-ServiceProviderBase.js');
+const libFableServiceBase = require('fable-serviceproviderbase');
 
 class FableService
 {
@@ -32,7 +32,8 @@ class FableService
 		// Add the container for instantiated services to go in
 		this.services[pServiceType] = {};
 
-		if ((typeof(pServiceClass) == 'function') && (pServiceClass.prototype instanceof libFableServiceBase))
+		// 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))
 		{
 			// Add the class to the list of classes
 			this.serviceClasses[pServiceType] = pServiceClass;
@@ -40,6 +41,7 @@ class FableService
 		else
 		{
 			// Add the base class to the list of classes
+			this.fable.log.error(`Attempted to add service type [${pServiceType}] with an invalid class.  Using base service class, which will not crash but won't provide meaningful services.`);
 			this.serviceClasses[pServiceType] = libFableServiceBase;
 		}
 	}
@@ -110,4 +112,5 @@ class FableService
 
 module.exports = FableService;
 
-module.exports.ServiceProviderBase = libFableServiceBase;
+module.exports.ServiceProviderBase = libFableServiceBase;
+module.exports.CoreServiceProviderBase = libFableServiceBase.CoreServiceProviderBase;

package/source/Fable.js

@@ -8,7 +8,6 @@ const libFableSettings = require('fable-settings');
 const libFableUUID = require('fable-uuid');
 const libFableLog = require('fable-log');
 
-const libFablePreinitServiceProviderBase = require('./Fable-PreinitServiceProviderBase.js');
 const libFableServiceManager = require('./Fable-ServiceManager.js');
 
 // Services
@@ -125,6 +124,6 @@ module.exports.new = autoConstruct;
 
 module.exports.LogProviderBase = libFableLog.LogProviderBase;
 module.exports.ServiceProviderBase = libFableServiceManager.ServiceProviderBase;
-module.exports.PreinitServiceProviderBase = libFablePreinitServiceProviderBase;
+module.exports.CoreServiceProviderBase = libFableServiceManager.CoreServiceProviderBase;
 
 module.exports.precedent = libFableSettings.precedent;

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

@@ -1,4 +1,4 @@
-const libFableServiceBase = require('../Fable-ServiceProviderBase.js');
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
 const libDataArithmatic = require('data-arithmatic');
 

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

@@ -1,4 +1,4 @@
-const libFableServiceBase = require('../Fable-ServiceProviderBase.js');
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
 const libPrecedent = require('precedent');
 

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

@@ -1,4 +1,4 @@
-const libFableServiceBase = require('../Fable-ServiceProviderBase.js');
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
 const libSimpleGet = require('simple-get');
 

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

@@ -1,4 +1,4 @@
-const libFableServiceBase = require('../Fable-ServiceProviderBase.js');
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
 class FableServiceTemplate extends libFableServiceBase
 {

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

@@ -1,5 +1,4 @@
-const libFableServiceBase = require('../Fable-ServiceProviderBase.js');
-
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
 // TODO: These are still pretty big -- consider the smaller polyfills
 const libAsyncWaterfall = require('async.waterfall');

package/test/FableServiceManager_tests.js

@@ -46,7 +46,7 @@ class MockDatabaseService extends libFable.ServiceProviderBase
     }
 }
 
-class MockCoreService extends libFable.PreinitServiceProviderBase
+class MockCoreService extends libFable.CoreServiceProviderBase
 {
     constructor(pOptions, pServiceHash)
     {

package/source/Fable-PreinitServiceProviderBase.js

@@ -1,36 +0,0 @@
-/**
-* Fable Core Pre-initialization Service Base
-*
-* For a couple services, we need to be able to instantiate them before the Fable object is fully initialized.
-* This is a base class for those services.
-*
-* @license MIT
-* @author <steven@velozo.com>
-*/
-
-class FablePreinitServiceProviderBase
-{
-	constructor(pOptions, pServiceHash)
-	{
-		this.fable = false;
-
-		this.options = (typeof(pOptions) === 'object') ? pOptions : {};
-
-        this.serviceType = 'Unknown';
-
-		// The hash will be a non-standard UUID ... the UUID service uses this base class!
-        this.UUID = `CORESVC-${Math.floor((Math.random() * (99999 - 10000)) + 10000)}`;
-
-        this.Hash = (typeof(pServiceHash) === 'string') ? pServiceHash : `${this.UUID}`;
-	}
-
-	// After fable is initialized, it would be expected to be wired in as a normal service.
-	connectFable(pFable)
-	{
-		this.fable = pFable;
-
-		return true;
-	}
-}
-
-module.exports = FablePreinitServiceProviderBase;

package/source/Fable-ServiceProviderBase.js

@@ -1,23 +0,0 @@
-/**
-* Fable Service Base
-* @license MIT
-* @author <steven@velozo.com>
-*/
-
-class FableServiceProviderBase
-{
-	constructor(pFable, pOptions, pServiceHash)
-	{
-		this.fable = pFable;
-
-		this.options = (typeof(pOptions) === 'object') ? pOptions : {};
-
-        this.serviceType = 'Unknown';
-
-        this.UUID = pFable.getUUID();
-
-        this.Hash = (typeof(pServiceHash) === 'string') ? pServiceHash : `${this.UUID}`;
-	}
-}
-
-module.exports = FableServiceProviderBase;