meadow 2.0.1 → 2.0.3

package/.config/configstore/update-notifier-npm.json

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1677436103169
+	"lastUpdateCheck": 1677869923810
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -52,6 +52,7 @@
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-terser": "^2.1.0",
+    "fable": "^3.0.11",
     "gulp-util": "^3.0.8",
     "mocha": "10.2.0",
     "nyc": "^15.1.0",
@@ -61,8 +62,8 @@
   },
   "dependencies": {
     "async": "3.2.4",
-    "fable": "^3.0.4",
     "foxhound": "^2.0.2",
-    "is-my-json-valid": "2.20.6"
+    "is-my-json-valid": "2.20.6",
+    "simple-get": "^4.0.1"
   }
 }

package/source/Meadow-Package.json

@@ -2,7 +2,7 @@
 	"Scope": "Package",
 
 	"DefaultIdentifier": "IDPackage",
-	
+
 	"Domain": "Domain",
 
 	"Schema": [],

package/source/Meadow.js

@@ -130,6 +130,13 @@ var Meadow = function()
 		* @param {String} pProviderName The provider for query generation.
 		* @return {Object} Returns the current Meadow for chaining.
 		*/
+		var _PROVIDERS = (
+		{
+			'ALASQL': require(`./providers/Meadow-Provider-ALASQL.js`),
+			'MeadowEndpoints': require(`./providers/Meadow-Provider-MeadowEndpoints.js`),
+			'MySQL': require(`./providers/Meadow-Provider-MySQL.js`),
+			'None': require(`./providers/Meadow-Provider-None.js`),
+		});
 		var setProvider = function(pProviderName)
 		{
 			if (typeof(pProviderName) !== 'string')
@@ -137,13 +144,9 @@ var Meadow = function()
 				pProviderName = 'None';
 			}
 
-			var tmpProviderModuleFile = './providers/Meadow-Provider-'+pProviderName+'.js';
-
 			try
 			{
-				var tmpProviderModule = require(tmpProviderModuleFile).new(_Fable);
-				_Provider = tmpProviderModule;
-
+				_Provider = _PROVIDERS[pProviderName].new(_Fable);
 				// Give the provider access to the schema object
 				updateProviderState();
 
@@ -151,8 +154,8 @@ var Meadow = function()
 			}
 			catch (pError)
 			{
-				_Fable.log.error('Provider not set - require load problem', {ProviderModuleFile:tmpProviderModuleFile, InvalidProvider:pProviderName, error:pError});
-				//setProvider('None');
+				_Fable.log.error('Provider not set - require load problem', {InvalidProvider:pProviderName, error:pError});
+				setProvider('None');
 			}
 
 			return this;

package/source/behaviors/Meadow-Read.js

@@ -41,7 +41,6 @@ var meadowBehaviorRead = function(pMeadow, pQuery, fCallBack)
 		],
 		(pError, pQuery, pRecord)=>
 		{
-			console.log('b')
 			if (pError)
 			{
 				pMeadow.fable.log.warn('Error during the read waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});