alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/class/datasource.js

@@ -3,7 +3,7 @@ var instances = {};
 /**
  * Datasource
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
@@ -27,21 +27,23 @@ Datasource.startNewGroup();
 /**
  * Enable query caching according to settings
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.4.0
  */
-Datasource.setProperty('queryCache', !!alchemy.settings.model_query_cache_duration);
+Datasource.setProperty(function queryCache() {
+	return !!alchemy.settings.data_management.model_query_cache_duration;
+});
 
 /**
  * Set support flag for something
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
- * @param    {String}   name
- * @param    {Boolean}  value
+ * @param    {string}   name
+ * @param    {boolean}  value
  */
 Datasource.setStatic(function setSupport(name, value) {
 	this.constitute(function doSetSupport() {
@@ -57,13 +59,13 @@ Datasource.setStatic(function setSupport(name, value) {
 /**
  * See if this supports the given flag
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
- * @param    {String}   name
+ * @param    {string}   name
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Datasource.setStatic(function supports(name) {
 
@@ -77,13 +79,13 @@ Datasource.setStatic(function supports(name) {
 /**
  * Instance method alias for support flags
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
- * @param    {String}   name
+ * @param    {string}   name
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Datasource.setMethod(function supports(name) {
 	return this.constructor.supports(name);
@@ -92,13 +94,13 @@ Datasource.setMethod(function supports(name) {
 /**
  * Allow a specific action?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Datasource.setMethod(function allows(name) {
 
@@ -119,7 +121,7 @@ Datasource.setMethod(function allows(name) {
 /**
  * Convert the given value to a BigInt (for use in JS)
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.20
  * @version  1.3.20
  *
@@ -139,7 +141,7 @@ Datasource.setMethod(function castToBigInt(value) {
 /**
  * Convert the given value from a BigInt (for use in DB)
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.20
  * @version  1.3.20
  *
@@ -159,7 +161,7 @@ Datasource.setMethod(function convertBigIntForDatasource(value) {
 /**
  * Convert the given value to a Decimal (for use in JS)
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.20
  * @version  1.3.20
  *
@@ -179,11 +181,11 @@ Datasource.setMethod(function castToDecimal(value) {
 /**
  * Convert the given decimal for use in DB
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.20
  * @version  1.3.20
  *
- * @param    {Decimal|String}   value
+ * @param    {Decimal|string}   value
  *
  * @return   {Decimal}
  */
@@ -199,13 +201,13 @@ Datasource.setMethod(function convertDecimalForDatasource(value) {
 /**
  * Hash a string synchronously
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.5
  *
- * @param    {String}   str
+ * @param    {string}   str
  *
- * @return   {String}
+ * @return   {string}
  */
 Datasource.setMethod(function hashString(str) {
 	return alchemy.checksum(str);
@@ -214,7 +216,7 @@ Datasource.setMethod(function hashString(str) {
 /**
  * Get a schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -243,7 +245,7 @@ Datasource.setMethod(function getSchema(schema) {
 /**
  * Prepare record to be stored in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
@@ -268,7 +270,7 @@ Datasource.setMethod(function toDatasource(schema, data, callback) {
 
 	if (!schema) {
 
-		if (alchemy.settings.debug) {
+		if (alchemy.settings.debugging.debug) {
 			alchemy.distinctProblem('schema-not-found', 'Schema not found: not normalizing data');
 		}
 
@@ -334,9 +336,9 @@ Datasource.setMethod(function toDatasource(schema, data, callback) {
 /**
  * Prepare to return the record from the database to the app
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.4.0
  *
  * @param    {Schema|Model}   schema
  * @param    {Object}         query
@@ -347,16 +349,13 @@ Datasource.setMethod(function toDatasource(schema, data, callback) {
  */
 Datasource.setMethod(function toApp(schema, query, options, data, callback) {
 
-	var pledge;
-
 	if (!data) {
-		pledge = Pledge.reject(new Error('Unable to convert data: no data given'));
+		let pledge = Pledge.reject(new Error('Unable to convert data: no data given'));
 		pledge.done(callback);
 		return pledge;
 	}
 
-	let that = this,
-	    tasks;
+	let that = this;
 
 	schema = this.getSchema(schema);
 
@@ -375,6 +374,8 @@ Datasource.setMethod(function toApp(schema, query, options, data, callback) {
 		options._root_data = data;
 	}
 
+	let tasks;
+
 	if (data[schema.name]) {
 		tasks = {};
 
@@ -428,34 +429,32 @@ Datasource.setMethod(function toApp(schema, query, options, data, callback) {
 	data = Object.assign({}, data);
 	tasks = {};
 
-	Object.each(data, function eachField(value, fieldName) {
+	for (let entry of schema.getSortedItems()) {
 
-		var field = schema.get(fieldName);
+		let field_name = entry.key,
+		    field = entry.value,
+		    value = data[field_name];
 
 		if (field != null) {
-			tasks[fieldName] = function doToDatasource(next) {
+			tasks[field_name] = function doToDatasource(next) {
 				that.valueToApp(field, query, options, value, next);
 			};
-		} else {
-			let allow_field = false;
+		}
+	}
 
-			if (options.extraneous) {
-				allow_field = true;
-			} else if (Blast.isBrowser && fieldName[0] == '_' && fieldName[1] == '$') {
+	if (Blast.isBrowser) {
+		for (let key in data) {
+			if (key[0] == '_' && key[1] == '$') {
 				// Certain extra data is stored on the browser as
 				// properties starting with "_$"
-				allow_field = true;
-			}
-
-			if (allow_field) {
-				tasks[fieldName] = function addExtraneous(next) {
-					next(null, value);
+				tasks[key] = function addExtraneous(next) {
+					next(null, data[key]);
 				};
 			}
 		}
-	});
+	}
 
-	pledge = Function.parallel(tasks, callback);
+	let pledge = Function.parallel(tasks, callback);
 
 	return pledge;
 });
@@ -463,7 +462,7 @@ Datasource.setMethod(function toApp(schema, query, options, data, callback) {
 /**
  * Prepare value to be stored in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -484,7 +483,7 @@ Datasource.setMethod(function valueToDatasource(field, value, data, callback) {
 /**
  * Prepare value to be returned to the app
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -506,34 +505,30 @@ Datasource.setMethod(function valueToApp(field, query, options, value, callback)
  * Prepare value to be stored in the database.
  * Should be overridden by extended datasources.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
 Datasource.setMethod(function _valueToDatasource(field, value, data, callback) {
-	Blast.setImmediate(function immediateDelay() {
-		callback(null, value);
-	});
+	callback(null, value);
 });
 
 /**
  * Prepare value to be returned to the app.
  * Should be overridden by extended datasources.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
 Datasource.setMethod(function _valueToApp(field, query, options, value, callback) {
-	Blast.setImmediate(function immediateDelay() {
-		callback(null, value);
-	});
+	callback(null, value);
 });
 
 /**
  * Query the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.16
  *
@@ -657,7 +652,7 @@ Datasource.setMethod(function read(model, criteria, callback) {
 /**
  * Insert new data into the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.6
  *
@@ -701,7 +696,7 @@ Datasource.setMethod(function create(model, data, options, callback) {
 /**
  * Update data
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
@@ -755,7 +750,7 @@ Datasource.setMethod(function update(model, data, options, callback) {
 /**
  * Remove data from the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -766,7 +761,7 @@ Datasource.setMethod(function remove(model, query, options, callback) {
 /**
  * Ensure an index in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.3.0
  */
@@ -782,7 +777,7 @@ Datasource.setMethod(function ensureIndex(model, index, callback) {
 /**
  * Insert new data into the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
@@ -800,7 +795,7 @@ Datasource.setMethod(function _create(model, data, options, callback) {
 /**
  * Query the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -811,7 +806,7 @@ Datasource.setMethod(function _read(model, query, options, callback) {
 /**
  * Update data
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -822,7 +817,7 @@ Datasource.setMethod(function _update(model, data, options, callback) {
 /**
  * Remove data from the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -833,7 +828,7 @@ Datasource.setMethod(function _remove(model, query, options, callback) {
 /**
  * Ensure an index in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -844,7 +839,7 @@ Datasource.setMethod(function _ensureIndex(model, index, callback) {
 /**
  * Return a rejected pledge
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -857,7 +852,7 @@ Datasource.setMethod(function createRejectedPledge(method, callback) {
 /**
  * Setup the datasource
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -904,7 +899,7 @@ Datasource.setMethod(function setup(callback) {
 /**
  * Get all model classes that connect through this datasource
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -937,13 +932,13 @@ Datasource.setMethod(function getModels() {
 /**
  * Is the given model an abstract model?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
  * @param    {Function}   model
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Datasource.setMethod(function isAbstractModel(model) {
 	return !!model.is_abstract;
@@ -952,12 +947,12 @@ Datasource.setMethod(function isAbstractModel(model) {
 /**
  * Create a new datasource
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
- * @param    {String}   type      The type of datasource to create
- * @param    {String}   name      The internal name of the datasource
+ * @param    {string}   type      The type of datasource to create
+ * @param    {string}   name      The internal name of the datasource
  * @param    {Object}   options   Configuration options for the datasource
  *
  * @return   {Datasource}
@@ -979,7 +974,7 @@ Datasource.create = function create(type, name, options) {
 /**
  * Get a datasource instance
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *