meadow-endpoints 3.0.7 → 4.0.2

package/source/Meadow-Endpoints.js

@@ -1,623 +1,234 @@
 /**
-* Meadow Data Broker Library
+* Meadow Endpoints Service Data Broker Library
 *
 * @license MIT
-*
 * @author Steven Velozo <steven@velozo.com>
-* @module Meadow
 */
 
-/**
-* Meadow Data Broker Library
-*
-* @class MeadowEndpoints
-* @constructor
-*/
-var MeadowEndpoints = function()
+const libMeadowEndpointsControllerBase = require('./controller/Meadow-Endpoints-Controller-Base.js');
+const libMeadow = require('meadow');
+
+class MeadowEndpoints
 {
-	function createNew(pMeadow)
+	constructor(pMeadow, pControllerOptions)
 	{
-		// If a valid Fable object isn't passed in, return a constructor
-		if ((typeof(pMeadow) !== 'object') || !('fable' in pMeadow))
-		{
-			return {new: createNew};
-		}
-		var _Meadow = pMeadow;
-		var _Fable = pMeadow.fable;
-
-		var libAsync = require('async');
-		var libRestRouteParse = require('./Restify-RouteParser.js');
+		this._Meadow = pMeadow;
+		// This is for backwards compatibility
+		this.DAL = this._Meadow;
 
-		const _AuthenticationMode = _Fable.settings.MeadowAuthenticationMode || 'Disabled';
+		this._Controller = false;
+		this._ControllerOptions = (typeof(pControllerOptions) == 'object') ? pControllerOptions : {};
 
-		var _CommonServices = require('./Meadow-CommonServices.js').new(pMeadow, _AuthenticationMode);
-
-		// This holds any changed behaviors.
-		var _BehaviorModifications = require('./Meadow-BehaviorModifications.js').new(pMeadow);
-
-		// This holds the authorizers.
-		var _Authorizers = require('./Meadow-Authorizers.js').new(pMeadow);
-
-		// This checks that the user is authenticated.  In the future, it will be overloadable.
-		var _Authenticator = require('./Meadow-Authenticator.js')(_AuthenticationMode);
-
-		// The default endpoints
-		var _Endpoints = (
+		if (typeof(pMeadow) != 'object')
 		{
-			Create: require('./crud/Meadow-Endpoint-Create.js'),
-			Creates: require('./crud/Meadow-Endpoint-BulkCreate.js'),
-
-			Read: require('./crud/Meadow-Endpoint-Read.js'),
-			ReadMax: require('./crud/Meadow-Endpoint-ReadMax.js'),
-
-			Reads: require('./crud/Meadow-Endpoint-Reads.js'),
-			ReadsBy: require('./crud/Meadow-Endpoint-ReadsBy.js'),
-
-			ReadSelectList: require('./crud/Meadow-Endpoint-ReadSelectList.js'),
-			ReadLiteList: require('./crud/Meadow-Endpoint-ReadLiteList.js'),
-			ReadDistinctList: require('./crud/Meadow-Endpoint-ReadDistinctList.js'),
-
-			Update: require('./crud/Meadow-Endpoint-Update.js'),
-			Updates: require('./crud/Meadow-Endpoint-BulkUpdate.js'),
-
-			Upsert: require('./crud/Meadow-Endpoint-Upsert.js'),
-			Upserts: require('./crud/Meadow-Endpoint-BulkUpsert.js'),
-
-			Delete: require('./crud/Meadow-Endpoint-Delete.js'),
-			Undelete: require('./crud/Meadow-Endpoint-Undelete.js'),
-
-			Count: require('./crud/Meadow-Endpoint-Count.js'),
-			CountBy: require('./crud/Meadow-Endpoint-CountBy.js'),
-
-		// Get the JSONSchema spec schema
-		/* http://json-schema.org/examples.html
-		 * http://json-schema.org/latest/json-schema-core.html
-		 */
-			Schema: require('./schema/Meadow-Endpoint-Schema.js'),
-			// Validate a passed-in JSON object for if it matches the schema
-			Validate: require('./schema/Meadow-Endpoint-Validate.js'),
-			// Get an empty initialized JSON object for this.
-			New: require('./schema/Meadow-Endpoint-New.js')
-		});
-
-		/**
-		* Customize a default endpoint (or create more)
-		*
-		* @method setEndpoint
-		*/
-		var setEndpoint = function(pEndpointHash, fEndpoint)
-		{
-			if (typeof(fEndpoint) === 'function')
-			{
-				_Endpoints[pEndpointHash] = fEndpoint;
-			}
-
-			return this;
-		};
-
+			throw new Error('Meadow endpoints requires a valid Meadow DAL object as the first parameter of the constructor.');
+		}
 
-		// The default authenticators
-		var _EndpointAuthenticators = (
+		if (this._ControllerOptions.hasOwnProperty('ControllerInstance'))
 		{
-			Create: _Authenticator,
-			Read: _Authenticator,
-			Reads: _Authenticator,
-			Update: _Authenticator,
-			Delete: _Authenticator,
-			Count: _Authenticator,
-
-			Schema: _Authenticator,
-			Validate: _Authenticator,
-			New: _Authenticator
-		});
-
-		/**
-		* Customize an endpoint Authenticator
-		*
-		* @method setEndpointAuthenticator
-		*/
-		var setEndpointAuthenticator = function(pEndpointHash, fAuthenticator)
+			// Passed in already instantiated controller instance
+			this._Controller = this._ControllerOptions.ControllerInstance;
+		}
+		else if (this._ControllerOptions.hasOwnProperty('ControllerClass'))
 		{
-			if (typeof(fAuthenticator) === 'function')
-			{
-				_EndpointAuthenticators[pEndpointHash] = fAuthenticator;
-			}
-
-			return this;
-		};
-
-
-		// The default endpoint authorization levels
-		var _EndpointAuthorizationLevels = (
+			// Passed in controller class, ready to initialize
+			this._Controller = new this._ControllerOptions.ControllerClass(this);
+		}
+		else
 		{
-			Create: 1,
-			Read: 0,
-			Reads: 0,
-			Update: 1,
-			Delete: 1,
-			Count: 0,
-
-			Schema: 0,
-			Validate: 0,
-			New: 1
-		});
+			this._Controller = new libMeadowEndpointsControllerBase(this);
+		}
 
+		// Pull version from the settings; default to 1.0
+		this.EndpointVersion = this._Controller.settings.MeadowEndpointVersion || '1.0';
+		// Pull endpoint name from settings if the user to override the endpoint "name" eventually.
+		this.EndpointName = this.DAL.scope;
+		// This allows a wily developer to change what this prefix is....
+		this.EndpointPrefix = `/${this.EndpointVersion}/${this.EndpointName}`;
 
-		// The default behaviors available.
+		// The default behavior sets available.
 		// Turning these off before wiring the endpoints up will result in their counterpart endpoints not being available.
-		var _EnabledBehaviors = (
+		this._EnabledBehaviorSets = (
 		{
 			Create: true,
-			// POST  [/1.0/SomeEndpoint]
-
 			Read: true,
-			// GET  [/1.0/SomeEndpoint/:IDRecord]
-			// GET  [/1.0/SomeEndpoint/Max/:ColumnName]
-
 			Reads: true,
-			// GET  [/1.0/SomeEndpoints]
-			// GET  [/1.0/SomeEndpoints/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoints/By/:ByField/:ByValue]
-			// GET  [/1.0/SomeEndpoints/By/:ByField/:ByValue/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoints/FilteredTo/:Filter]
-			// GET  [/1.0/SomeEndpoints/FilteredTo/:Filter/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpointSelect]
-			// GET  [/1.0/SomeEndpointSelect/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpointSelect/FilteredTo/:Filter]
-			// GET  [/1.0/SomeEndpointSelect/FilteredTo/:Filter/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/Lite]
-			// GET  [/1.0/SomeEndpoint/Lite/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/Lite/FilteredTo/:Filter]
-			// GET  [/1.0/SomeEndpoint/Lite/FilteredTo/:Filter/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/LiteExtended/:ExtraColumns]
-			// GET  [/1.0/SomeEndpoint/LiteExtended/:ExtraColumns/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/LiteExtended/:ExtraColumns/FilteredTo/:Filter]
-			// GET  [/1.0/SomeEndpoint/LiteExtended/:ExtraColumns/FilteredTo/:Filter/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/Distinct/:Columns]
-			// GET  [/1.0/SomeEndpoint/Distinct/:Columns/:Begin/:Cap]
-			// GET  [/1.0/SomeEndpoint/Distinct/:Columns/FilteredTo/:Filter]
-			// GET  [/1.0/SomeEndpoint/Distinct/:Columns/FilteredTo/:Filter/:Begin/:Cap]
-
 			Update: true,
-			// PUT [/1.0/SomeEndpoint]
-			// PUT  [/1.0/SomeEndpoint/Upsert]
-
 			Delete: true,
-			// DEL  [/1.0/SomeEndpoint]
-			// DEL  [/1.0/SomeEndpoint/:IDRecord]
-			// GET  [/1.0/SomeEndpoint/Undelete/:IDRecord]
-
 			Count: true,
-			// GET  [/1.0/SomeEndpoints/Count]
-			// GET  [/1.0/SomeEndpoints/Count/By/:ByField/:ByValue]
-			// GET  [/1.0/SomeEndpoints/Count/FilteredTo/:Filter]
-
 			Schema: true,
-			// GET  [/1.0/SomeEndpoint/Schema]
-
 			Validate: true,
-			// POST [/1.0/SomeEndpoint/Schema/Validate]
-
 			New: true
-			// GET  [/1.0/SomeEndpoint/Schema/New]
 		});
 
-		/**
-		* Customize an endpoint Authorization Level
-		*
-		* @method setEndpointAuthorization
-		*/
-		var setEndpointAuthorization = function(pEndpointHash, pAuthorizationLevel)
-		{
-			_EndpointAuthorizationLevels[pEndpointHash] = pAuthorizationLevel;
-			return true;
-		};
-
-
-		/**
-		* Add the common services object to the request early in the route chain
-		*/
-		var wireCommonServices = function (pRequest, pResponse, fNext)
+		// The default endpoints
+		this._Endpoints = (
 		{
-			// TODO: There is a shared state issue with using this as the source for the authorization levels.  Fix it.
-			pRequest.CommonServices = _CommonServices;
-			fNext();
-		};
-
+			Create: require('./endpoints/create/Meadow-Endpoint-Create.js'),
+			Creates: require('./endpoints/create/Meadow-Endpoint-BulkCreate.js'),
 
-		/**
-		* Add the explicit state to the request that is coming through this endpoint
-		*/
-		var wireState = function (pRequest, pResponse, fNext)
-		{
-			// TODO: There is a shared state issue with using this as the source for the authorization levels.  Fix it.
-			pRequest.EndpointAuthorizationLevels = _EndpointAuthorizationLevels;
-			pRequest.DAL = _Meadow;
-			pRequest.BehaviorModifications = _BehaviorModifications;
-			pRequest.Authorizers = _Authorizers;
-			pRequest.forEachRecord = function(fIterator)
-			{
-				if (pRequest.Record)
-					return fIterator(pRequest.Record)
-				else if (pRequest.Records)
-					return pRequest.Records.forEach(fIterator);
-			}
+			Read: require('./endpoints/read/Meadow-Endpoint-Read.js'),
+			ReadMax: require('./endpoints/read/Meadow-Endpoint-ReadMax.js'),
 
-			//maximum number of records to return by default on Read queries. Override via "MeadowDefaultMaxCap" fable setting.
-			pRequest.DEFAULT_MAX_CAP = (_Fable.settings['MeadowDefaultMaxCap']) || 250;
+			Reads: require('./endpoints/read/Meadow-Endpoint-Reads.js'),
+			ReadsBy: require('./endpoints/read/Meadow-Endpoint-ReadsBy.js'),
 
-			fNext();
-		};
+			ReadSelectList: require('./endpoints/read/Meadow-Endpoint-ReadSelectList.js'),
+			ReadLiteList: require('./endpoints/read/Meadow-Endpoint-ReadLiteList.js'),
+			ReadDistinctList: require('./endpoints/read/Meadow-Endpoint-ReadDistinctList.js'),
 
-		/**
-		* Reparse route parameters, attach 'formattedParams' to Request obj
-		*/
-		var formatRouteParams = function(pRequest, pResponse, fNext)
-		{
-			if (pRequest.method === 'GET')
-			{
-				var tmpParams = libRestRouteParse(
-					pRequest.route.path,
-					pRequest.url
-				);
+			Update: require('./endpoints/update/Meadow-Endpoint-Update.js'),
+			Updates: require('./endpoints/update/Meadow-Endpoint-BulkUpdate.js'),
 
-				for(var key in tmpParams)
-				{
-					var tmpArray = tmpParams[key].split(',');
-					if (tmpArray.length > 1)
-					{
-						for(var i=0; i<tmpArray.length; i++)
-						{
-							tmpArray[i] = decodeURIComponent(tmpArray[i]);
-						}
+			Upsert: require('./endpoints/upsert/Meadow-Endpoint-Upsert.js'),
+			Upserts: require('./endpoints/upsert/Meadow-Endpoint-BulkUpsert.js'),
 
-						tmpParams[key] = tmpArray;
-					}
-					else
-					{
-						tmpParams[key] = decodeURIComponent(tmpParams[key]);
-					}
-				}
+			Delete: require('./endpoints/delete/Meadow-Endpoint-Delete.js'),
+			Undelete: require('./endpoints/delete/Meadow-Endpoint-Undelete.js'),
 
-				pRequest.formattedParams = tmpParams;
-			}
+			Count: require('./endpoints/count/Meadow-Endpoint-Count.js'),
+			CountBy: require('./endpoints/count/Meadow-Endpoint-CountBy.js'),
 
-			//libRestRouteParse
-			return fNext();
-		};
+			// Get the JSONSchema spec schema
+			/* http://json-schema.org/examples.html
+			 * http://json-schema.org/latest/json-schema-core.html
+			 */
+			Schema: require('./endpoints/schema/Meadow-Endpoint-Schema.js'),
+			// Validate a passed-in JSON object for if it matches the schema
+			Validate: require('./endpoints/schema/Meadow-Endpoint-Validate.js'),
+			// Get an empty initialized JSON object for this.
+			New: require('./endpoints/schema/Meadow-Endpoint-New.js')
+		});
+	}
 
+	get controller()
+	{
+		return this._Controller;
+	}
+	set controller(pController)
+	{
+		this._Controller = pController;
+	}
 
-		/**
-		* Wire up routes for the API
-		*
-		* @method connectRoutes
-		* @param {Object} pRestServer The Restify server object to add routes to
-		*/
-		var connectRoutes = function(pRestServer)
+	/**
+	* Customize a default endpoint (or create more)
+	*
+	* @method setEndpoint
+	*/
+	setBehaviorEndpoint(pEndpointHash, fEndpoint)
+	{
+		if (typeof(fEndpoint) === 'function')
 		{
-			// TODO: Pull version from the config file.
-			const tmpEndpointVersion = _Fable.settings.MeadowEndpointVersion || '1.0';
-			// TODO: Allow the user to override the endpoint "name" eventually.
-			const tmpEndpointName = _Meadow.scope;
-
-			_Fable.log.trace('Creating endpoint', { Version: tmpEndpointVersion, Name: tmpEndpointName });
-
-			const tmpEndpointPrefix = `/${tmpEndpointVersion}/${tmpEndpointName}`;
-
-			if (!pRestServer._AttachedMeadowEndpointsRequestHandlers)
-			{
-				pRestServer._AttachedMeadowEndpointsRequestHandlers = true;
-				// Connect the common services to the route
-				pRestServer.use(wireCommonServices);
-
-				// Build formattedParams route parameters
-				pRestServer.use(formatRouteParams);
-
-				// Marshall session data in, if needed / configured
-				pRestServer.use(require('./Meadow-MarshallSessionData')(_Fable));
-			}
-
-			// These special schema services must come in the route table before the READ because they
-			// technically block out the routes for the IDRecord 'Schema' (e.g. /1.0/EntityName/Schema)
-			if (_EnabledBehaviors.Schema)
-			{
-				pRestServer.get(`${tmpEndpointPrefix}/Schema`, _EndpointAuthenticators.Schema, wireState, _Endpoints.Schema);
-			}
-			if (_EnabledBehaviors.New)
-			{
-				pRestServer.get(`${tmpEndpointPrefix}/Schema/New`, _EndpointAuthenticators.New, wireState, _Endpoints.New);
-			}
-			if (_EnabledBehaviors.Validate)
-			{
-				pRestServer.post(`${tmpEndpointPrefix}/Schema/Validate`, _CommonServices.bodyParser(), _EndpointAuthenticators.Validate, wireState, _Endpoints.Validate);
-			}
+			this._Endpoints[pEndpointHash] = fEndpoint;
+		}
 
-			// Custom single record endpoints
+		return this;
+	}
 
-			// Standard CRUD and Count endpoints
-			if (_EnabledBehaviors.Create)
-			{
-				pRestServer.post(`${tmpEndpointPrefix}`, _CommonServices.bodyParser(), _EndpointAuthenticators.Create, wireState, _Endpoints.Create);
-				pRestServer.post(`${tmpEndpointPrefix}s`, _CommonServices.bodyParser(), _EndpointAuthenticators.Create, wireState, _Endpoints.Creates);
-			}
-			if (_EnabledBehaviors.Read)
-			{
-				pRestServer.get(`${tmpEndpointPrefix}/Max/:ColumnName`, _EndpointAuthenticators.Read, wireState, _Endpoints.ReadMax);
-				pRestServer.get(`${tmpEndpointPrefix}/:IDRecord`, _EndpointAuthenticators.Read, wireState, _Endpoints.Read);
-			}
-			if (_EnabledBehaviors.Reads)
-			{
-				pRestServer.get(`${tmpEndpointPrefix}s`, _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
-				pRestServer.get(`${tmpEndpointPrefix}s/By/:ByField/:ByValue`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadsBy);
-				pRestServer.get(`${tmpEndpointPrefix}s/By/:ByField/:ByValue/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadsBy);
-				pRestServer.get(`${tmpEndpointPrefix}s/FilteredTo/:Filter`, _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
-				pRestServer.get(`${tmpEndpointPrefix}s/FilteredTo/:Filter/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
-				pRestServer.get(`${tmpEndpointPrefix}Select`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
-				pRestServer.get(`${tmpEndpointPrefix}Select/FilteredTo/:Filter`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
-				pRestServer.get(`${tmpEndpointPrefix}Select/FilteredTo/:Filter/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
-				pRestServer.get(`${tmpEndpointPrefix}Select/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Lite`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Lite/FilteredTo/:Filter`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Lite/FilteredTo/:Filter/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Lite/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/LiteExtended/:ExtraColumns`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/LiteExtended/:ExtraColumns/FilteredTo/:Filter`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/LiteExtended/:ExtraColumns/FilteredTo/:Filter/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/LiteExtended/:ExtraColumns/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Distinct/:Columns`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadDistinctList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Distinct/:Columns/FilteredTo/:Filter`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadDistinctList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Distinct/:Columns/FilteredTo/:Filter/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadDistinctList);
-				pRestServer.get(`${tmpEndpointPrefix}s/Distinct/:Columns/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadDistinctList);
-				pRestServer.get(`${tmpEndpointPrefix}s/:Begin/:Cap`, _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
-			}
-			if (_EnabledBehaviors.Update)
-			{
-				pRestServer.put(`${tmpEndpointPrefix}`, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Update);
-				pRestServer.put(`${tmpEndpointPrefix}s`, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Updates);
-				pRestServer.put(`${tmpEndpointPrefix}/Upsert`, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upsert);
-				pRestServer.put(`${tmpEndpointPrefix}/Upserts`, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upserts);
-			}
-			if (_EnabledBehaviors.Delete)
-			{
-				pRestServer.del(`${tmpEndpointPrefix}`, _CommonServices.bodyParser(), _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
-				pRestServer.del(`${tmpEndpointPrefix}/:IDRecord`, _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
-				pRestServer.get(`${tmpEndpointPrefix}/Undelete/:IDRecord`, _EndpointAuthenticators.Delete, wireState, _Endpoints.Undelete);
-			}
-			if (_EnabledBehaviors.Count)
-			{
-				pRestServer.get(`${tmpEndpointPrefix}s/Count`, _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
-				pRestServer.get(`${tmpEndpointPrefix}s/Count/By/:ByField/:ByValue`, _EndpointAuthenticators.Count, wireState, _Endpoints.CountBy);
-				pRestServer.get(`${tmpEndpointPrefix}s/Count/FilteredTo/:Filter`, _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
-			}
-		};
+	connectRoute(pServiceServer, pRequestMethod, pRoutePartial, pEndpointProcessingFunction, pBehaviorName)
+	{
+		let tmpRoute = `${this.EndpointPrefix}${pRoutePartial}`;
+		let tmpBehaviorName = (typeof(pBehaviorName) == 'string') ? pBehaviorName : 'an unnamed custom behavior'
 
+		this._Controller.log.trace(`...meadow-endpoints mapping a ${pRequestMethod} endpoint for scope ${this.DAL.scope} on route [${tmpRoute}] which runs ${tmpBehaviorName}.`);
 
-		/**
-		* Emulate a response object
-		*/
-		var wireResponse = function(pResponse, fCallback)
+		try
 		{
-			pResponse.send = function(data)
-			{
-				this.body = data;
-
-				if (!data.Error)
-				{
-					if (data.constructor === Array)
-					{
-						this.Records = data;
-					}
-					else
-					{
-						this.Record = data;
-					}
-				}
-			};
-
-			Object.defineProperty(pResponse, 'text',
-			{
-				get: function() { return JSON.stringify(pResponse.body); },
-				enumerable: true
-			});
+			(pServiceServer[pRequestMethod])(tmpRoute, pEndpointProcessingFunction.bind(this._Controller));
+		}
+		catch (pServiceServerRouteConnectError)
+		{
+			this._Controller.log.error(`...error mapping ${pBehaviorName} to method ${pRequestMethod} for scope ${this.DAL.scope} to route [${tmpRoute}]: ${pServiceServerRouteConnectError}`, pServiceServerRouteConnectError.stack);
+		}
+		return true;
+	}
 
-			return fCallback();
-		};
+	connectRoutes(pServiceServer)
+	{
+		this._Controller.log.trace(`Creating automatic meadow endpoints at prefix [${this.EndpointPrefix}] for scope ${this.DAL.scope}...`);
 
-		var _InvokeSetupCallback;
-		var getInvokeSetupCallback = function()
+		// These special schema services must come in the route table before the READ because they
+		// technically block out the routes for the IDRecord 'Schema' (e.g. GET[/1.0/EntityName/Schema] ==NEEDS=> GET[/1.0/EntityName/100])
+		if (this._EnabledBehaviorSets.Schema)
 		{
-			return _InvokeSetupCallback;
-		};
-
-		var setInvokeSetupCallback = function(fCallback)
+			this.connectRoute(pServiceServer, 'get', `/Schema`, this._Endpoints.Schema, `the internal behavior _Endpoints.Schema`);
+		}
+		if (this._EnabledBehaviorSets.New)
 		{
-			_InvokeSetupCallback = fCallback;
-		};
-
-		/**
-		* Invoke a meadow endpoint programmatically
-		*
-		* @method invokeEndpoint
-		*/
-		var invokeEndpoint = function(pMethod, pData, pOptions, fCallback)
+			this.connectRoute(pServiceServer, 'get', `/Schema/New`, this._Endpoints.New, `the internal behavior _Endpoints.New`);
+		}
+		if (this._EnabledBehaviorSets.Validate)
 		{
-			var tmpCallback = (typeof(pOptions) === 'function') ? pOptions : fCallback;
-
-			if (!_Endpoints[pMethod])
-			{
-				_CommonServices.log.error('Endpoint \'' + pMethod + '\' does not exist!');
-				return tmpCallback('Endpoint \'' + pMethod + '\' does not exist!'); //might be better as an exception
-			}
-
-			// TODO: should switch depending on type
-			// TODO: should we keep this around, just make a deep copy of 'pOptions'
-			var pRequest = {params: pData, formattedParams: pData, body: pData};
-			if (typeof(pOptions) === 'object' && typeof(pOptions.header) === 'function') {
-				// carry over header function
-				pRequest.header = pOptions.header.bind(pOptions);
-			}
-			var pResponse = {};
-
-			libAsync.waterfall([
-				function(fStageComplete)
-				{
-					return wireResponse(pResponse, fStageComplete);
-				},
-				function(fStageComplete)
-				{
-					//allow consumer to specify user session data
-					if (pOptions.UserSession)
-					{
-						//make a copy of the UserSession
-						pRequest.UserSession = JSON.parse(JSON.stringify(pOptions.UserSession));
-					}
-					else
-					{
-						//else fill in default user session data
-						pRequest.EndpointInvoked = true; //bypass session auth check
-						pRequest.UserSession = { UserID: 0, UserRoleIndex: 0 };
-					}
-
-					// The Satchel is a workaround to pass state between query invocation and query decoration
-					// Unfortunately, it has other uses, so we can't safely remove it here; this creates a risk of
-					// cross-request state contamination (which we have seen cause issues).
-					//FIXME: We should rework invokeEndpoint to make this state management unnecessary
-					pRequest.Satchel = pOptions.Satchel;
-					//internal invoke mark as authenticated (because this is not called via webservice)
-					pRequest.EndpointAuthenticated = true;
-
-					if (_InvokeSetupCallback && typeof(_InvokeSetupCallback) == 'function')
-					{
-						_InvokeSetupCallback(pRequest, pResponse, typeof(pOptions) === 'object' && pOptions);
-					}
-					return fStageComplete();
-				},
-				function(fStageComplete)
-				{
-					return wireCommonServices(pRequest, pResponse, fStageComplete);
-				},
-				function(fStageComplete)
-				{
-					return wireState(pRequest, pResponse, fStageComplete);
-				},
-				function(fStageComplete)
-				{
-					//Invoke the endpoint method
-					_Endpoints[pMethod](pRequest, pResponse, function(err)
-						{
-							return fStageComplete(err, pResponse);
-						});
-				}
-			],
-			function complete(err)
-			{
-				return tmpCallback(err, pResponse);
-			});
-		};
-
+			this.connectRoute(pServiceServer, 'postWithBodyParser', `/Schema/Validate`, this._Endpoints.Validate, `the internal behavior _Endpoints.Validate`);
+		}
 
-		/**
-		* Container Object for our Factory Pattern
-		*/
-		var tmpNewMeadowEndpointObject = (
+		// Standard CRUD and Count endpoints
+		if (this._EnabledBehaviorSets.Create)
 		{
-			setEndpoint: setEndpoint,
-			setEndpointAuthenticator: setEndpointAuthenticator,
-			setEndpointAuthorization: setEndpointAuthorization,
-
-			wireState: wireState,
-
-			connectRoutes: connectRoutes,
-
-			parseFilter: require('meadow-filter').parse,
-
-			// Expose the DAL
-			DAL: _Meadow,
-
-			getInvokeSetupCallback: getInvokeSetupCallback,
-			setInvokeSetupCallback: setInvokeSetupCallback,
-			invokeEndpoint: invokeEndpoint,
-
-			// Factory
-			new: createNew
-		});
-
-		/**
-		 * Endpoint Authorization Levels
-		 *
-		 * @property endpointAuthorizationLevels
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'endpointAuthorizationLevels',
-			{
-				get: function() { return _EndpointAuthorizationLevels; },
-				enumerable: true
-			});
-
-		/**
-		 * Endpoints
-		 *
-		 * @property endpoints
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'endpoints',
-			{
-				get: function() { return _Endpoints; },
-				enumerable: true
-			});
-
-		/**
-		 * EndpointAuthenticators
-		 *
-		 * @property endpointAuthorizers
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'endpointAuthorizers',
-			{
-				get: function() { return _Authorizers; },
-				enumerable: true
-			});
-
-		/**
-		 * EndpointAuthenticators
-		 *
-		 * @property endpointAuthenticators
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'endpointAuthenticators',
-			{
-				get: function() { return _EndpointAuthenticators; },
-				enumerable: true
-			});
-
-		/**
-		 * EnabledBehaviors
-		 *
-		 * @property enabledBehaviors
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'enabledBehaviors',
-			{
-				get: function() { return _EnabledBehaviors; },
-				enumerable: true
-			});
+			this.connectRoute(pServiceServer, 'postWithBodyParser', ``, this._Endpoints.Create, `the internal behavior _Endpoints.Create`);
+			this.connectRoute(pServiceServer, 'postWithBodyParser', `s`, this._Endpoints.Creates, `the internal behavior _Endpoints.Creates`);
+		}
+		if (this._EnabledBehaviorSets.Read)
+		{
+			this.connectRoute(pServiceServer, 'get', `/Max/:ColumnName`, this._Endpoints.ReadMax, `the internal behavior _Endpoints.ReadMax`);
+			this.connectRoute(pServiceServer, 'get', `/:IDRecord`, this._Endpoints.Read, `the internal behavior _Endpoints.Read`);
+		}
+		if (this._EnabledBehaviorSets.Reads)
+		{
+			this.connectRoute(pServiceServer, 'get', `s`, this._Endpoints.Reads, `the internal behavior _Endpoints.Reads`);
+			this.connectRoute(pServiceServer, 'get', `s/By/:ByField/:ByValue`, this._Endpoints.ReadsBy, `the internal behavior _Endpoints.ReadsBy`);
+			this.connectRoute(pServiceServer, 'get', `s/By/:ByField/:ByValue/:Begin/:Cap`, this._Endpoints.ReadsBy, `the internal behavior _Endpoints.ReadsBy`);
+			this.connectRoute(pServiceServer, 'get', `s/FilteredTo/:Filter`, this._Endpoints.Reads, `the internal behavior _Endpoints.Reads`);
+			this.connectRoute(pServiceServer, 'get', `s/FilteredTo/:Filter/:Begin/:Cap`, this._Endpoints.Reads, `the internal behavior _Endpoints.Reads`);
+			this.connectRoute(pServiceServer, 'get', `Select`, this._Endpoints.ReadSelectList, `the internal behavior _Endpoints.ReadSelectList`);
+			this.connectRoute(pServiceServer, 'get', `Select/FilteredTo/:Filter`, this._Endpoints.ReadSelectList, `the internal behavior _Endpoints.ReadSelectList`);
+			this.connectRoute(pServiceServer, 'get', `Select/FilteredTo/:Filter/:Begin/:Cap`, this._Endpoints.ReadSelectList, `the internal behavior _Endpoints.ReadSelectList`);
+			this.connectRoute(pServiceServer, 'get', `Select/:Begin/:Cap`, this._Endpoints.ReadSelectList, `the internal behavior _Endpoints.ReadSelectList`);
+			this.connectRoute(pServiceServer, 'get', `s/Lite`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/Lite/FilteredTo/:Filter`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/Lite/FilteredTo/:Filter/:Begin/:Cap`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/Lite/:Begin/:Cap`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/LiteExtended/:ExtraColumns`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/LiteExtended/:ExtraColumns/FilteredTo/:Filter`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/LiteExtended/:ExtraColumns/FilteredTo/:Filter/:Begin/:Cap`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/LiteExtended/:ExtraColumns/:Begin/:Cap`, this._Endpoints.ReadLiteList, `the internal behavior _Endpoints.ReadLiteList`);
+			this.connectRoute(pServiceServer, 'get', `s/Distinct/:Columns`, this._Endpoints.ReadDistinctList, `the internal behavior _Endpoints.ReadDistinctList`);
+			this.connectRoute(pServiceServer, 'get', `s/Distinct/:Columns/FilteredTo/:Filter`, this._Endpoints.ReadDistinctList, `the internal behavior _Endpoints.ReadDistinctList`);
+			this.connectRoute(pServiceServer, 'get', `s/Distinct/:Columns/FilteredTo/:Filter/:Begin/:Cap`, this._Endpoints.ReadDistinctList, `the internal behavior _Endpoints.ReadDistinctList`);
+			this.connectRoute(pServiceServer, 'get', `s/Distinct/:Columns/:Begin/:Cap`, this._Endpoints.ReadDistinctList, `the internal behavior _Endpoints.ReadDistinctList`);
+			this.connectRoute(pServiceServer, 'get', `s/:Begin/:Cap`, this._Endpoints.Reads, `the internal behavior _Endpoints.Reads`);
+		}
+		if (this._EnabledBehaviorSets.Update)
+		{
+			this.connectRoute(pServiceServer, 'putWithBodyParser', ``, this._Endpoints.Update, `the internal behavior _Endpoints.Update`);
+			this.connectRoute(pServiceServer, 'putWithBodyParser', `s`, this._Endpoints.Updates, `the internal behavior _Endpoints.Updates`);
+			this.connectRoute(pServiceServer, 'putWithBodyParser', `/Upsert`, this._Endpoints.Upsert, `the internal behavior _Endpoints.Upsert`);
+			this.connectRoute(pServiceServer, 'putWithBodyParser', `/Upserts`, this._Endpoints.Upserts, `the internal behavior _Endpoints.Upserts`);
+		}
+		if (this._EnabledBehaviorSets.Delete)
+		{
+			this.connectRoute(pServiceServer, 'del', ``, this._Endpoints.Delete, `the internal behavior _Endpoints.Delete`);
+			this.connectRoute(pServiceServer, 'del', `/:IDRecord`, this._Endpoints.Delete, `the internal behavior _Endpoints.Delete`);
+			this.connectRoute(pServiceServer, 'get', `/Undelete/:IDRecord`, this._Endpoints.Undelete, `the internal behavior _Endpoints.Undelete`);
+		}
+		if (this._EnabledBehaviorSets.Count)
+		{
+			this.connectRoute(pServiceServer, 'get', `s/Count`, this._Endpoints.Count, `the internal behavior _Endpoints.Count`);
+			this.connectRoute(pServiceServer, 'get', `s/Count/By/:ByField/:ByValue`, this._Endpoints.CountBy, `the internal behavior _Endpoints.CountBy`);
+			this.connectRoute(pServiceServer, 'get', `s/Count/FilteredTo/:Filter`, this._Endpoints.Count, `the internal behavior _Endpoints.Count`);
+		}
+	}
+}
 
-		/**
-		 * Behavior Modifications
-		 *
-		 * @property behaviorModifications
-		 * @type object
-		 */
-		Object.defineProperty(tmpNewMeadowEndpointObject, 'behaviorModifications',
-			{
-				get: function() { return _BehaviorModifications; },
-				enumerable: true
-			});
 
-		return tmpNewMeadowEndpointObject;
-	}
+// This is for backwards compatibility
+function autoConstruct(pMeadow, pControllerOptions)
+{
+	return new MeadowEndpoints(pMeadow, pControllerOptions);
+}
 
-	return createNew();
-};
+module.exports = MeadowEndpoints;
+module.exports.new = autoConstruct;
 
-module.exports = new MeadowEndpoints();
+module.exports.Meadow = libMeadow;
+module.exports.BaseController = libMeadowEndpointsControllerBase;