alchemymvc 1.3.19 → 1.3.21

package/lib/class/datasource.js

@@ -116,6 +116,86 @@ Datasource.setMethod(function allows(name) {
 	return true;
 });
 
+/**
+ * Convert the given value to a BigInt (for use in JS)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {*}   value
+ *
+ * @return   {BigInt}
+ */
+Datasource.setMethod(function castToBigInt(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	return BigInt(value);
+});
+
+/**
+ * Convert the given value from a BigInt (for use in DB)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {BigInt}   value
+ *
+ * @return   {BigInt}
+ */
+Datasource.setMethod(function convertBigIntForDatasource(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	return BigInt(value);
+});
+
+/**
+ * Convert the given value to a Decimal (for use in JS)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {*}   value
+ *
+ * @return   {BigInt}
+ */
+Datasource.setMethod(function castToDecimal(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	return new Blast.Classes.Develry.Decimal(value);
+});
+
+/**
+ * Convert the given decimal for use in DB
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Decimal|String}   value
+ *
+ * @return   {Decimal}
+ */
+Datasource.setMethod(function convertDecimalForDatasource(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	return new Blast.Classes.Develry.Decimal(value);
+});
+
 /**
  * Hash a string synchronously
  *

package/lib/class/document.js

@@ -178,6 +178,33 @@ Document.setStatic(function unDry(obj, cloned) {
 	return result;
 });
 
+/**
+ * Set the getter for this computed field
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @param    {String}     name     Name of the property
+ * @param    {Function}   getter   Optional getter function
+ * @param    {Function}   setter   Optional setter function
+ */
+Document.setStatic(function setComputedFieldGetter(name) {
+	this.setProperty(name, function getComputedFieldValue() {
+		this.recomputeFieldIfNecessary(name);
+		return this.$main[name];
+	}, function setComputedFieldValue(value) {
+
+		const field = this.$model.schema.getField(name);
+
+		if (field?.options?.allow_manual_set) {
+			return this.$main[name] = value;
+		}
+
+		console.error('Can not set computed field "' + name + '" to', value);
+	});
+});
+
 /**
  * Set the getter for this field
  *

package/lib/class/field.js

@@ -207,6 +207,116 @@ Field.setProperty(function is_array() {
 	return !!result;
 });
 
+/**
+ * Does this field have a computed value?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @type     {Boolean}
+ */
+Field.setProperty(function is_computed() {
+	return !!this.options.is_computed;
+});
+
+/**
+ * Get the required related fields
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @type     {Field[]}
+ */
+Field.enforceProperty(function required_fields(new_value) {
+
+	if (!new_value) {
+		new_value = resolveFieldPaths(this, this.options.required_fields);
+	}
+
+	return new_value;
+});
+
+/**
+ * Get the optional related fields
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @type     {Field[]}
+ */
+Field.enforceProperty(function optional_fields(new_value) {
+
+	if (!new_value) {
+		new_value = resolveFieldPaths(this, this.options.optional_fields);
+	}
+
+	return new_value;
+});
+
+/**
+ * Get all the dependency fields
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @type     {Field[]}
+ */
+Field.enforceProperty(function dependency_fields(new_value) {
+
+	if (!new_value) {
+		let required_fields = this.required_fields,
+		    optional_fields = this.optional_fields;
+
+		new_value = [];
+
+		if (required_fields) {
+			new_value = new_value.concat(required_fields);
+		}
+
+		if (optional_fields) {
+			new_value = new_value.concat(optional_fields);
+		}
+	}
+
+	return new_value;
+});
+
+/**
+ * Resolve a field path to a field instance
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ */
+function resolveFieldPaths(field, field_paths) {
+	
+	let result = [],
+	    i;
+
+	if (!field_paths) {
+		return result;
+	}
+
+	for (i = 0; i < field_paths.length; i++) {
+
+		if (!field.parent_schema) {
+			continue
+		}
+
+		let other_field = field.parent_schema.getField(field_paths[i]);
+
+		if (other_field && result.indexOf(other_field) == -1) {
+			result.push(other_field);
+		}
+	}
+
+	return result;
+}
+
 /**
  * The datasource this field is used in
  *

package/lib/class/model.js

@@ -366,24 +366,49 @@ Model.setStatic(async function checkPathValue(value, name, field_name, conduit)
 	return result;
 });
 
+/**
+ * Add a computed field to this model's schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @return   {Alchemy.Field}
+ */
+Model.setStatic(function addComputedField(name, type, options) {
+	let is_new = !this.schema.has(name);
+
+	// Add it to the schema
+	let field = this.schema.addComputedField(name, type, options);
+
+	if (is_new) {
+		// Add it to the Document class
+		this.Document.setComputedFieldGetter(name);
+
+		// False means it should not be set on the server implementation
+		// (because that's where it's coming from)
+		// Yes, this also sets private fields on the server-side client document.
+		this.ClientDocument.setComputedFieldGetter(name, null, null, false);
+	}
+
+	return field;
+});
+
 /**
  * Add a field to this model's schema
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.2.21
  *
  * @return   {Alchemy.Field}
  */
 Model.setStatic(function addField(name, type, options) {
 
-	var field,
-	    is_new;
-
-	is_new = !this.schema.has(name);
+	let is_new = !this.schema.has(name);
 
 	// Add it to the schema
-	field = this.schema.addField(name, type, options);
+	let field = this.schema.addField(name, type, options);
 
 	if (is_new) {
 		// Add it to the Document class
@@ -845,7 +870,7 @@ Model.setMethod(function ensureIds(list, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.3.16
+ * @version  1.3.20
  *
  * @param    {Document}   document
  * @param    {Object}     options
@@ -895,21 +920,8 @@ Model.setMethod(function saveRecord(document, options, callback) {
 			creating = options.create || doc[that.primary_key] == null;
 			next();
 		});
-	}, function doBeforeSave(next) {
-
-		if (typeof that.beforeSave == 'function') {
-			let promise = that.beforeSave(document, options, next);
-
-			if (promise) {
-				Pledge.done(promise, next);
-			} else if (that.beforeSave.length < 3) {
-				// If the method accepts no `next` callback, call it now
-				next();
-			}
-		} else {
-			next();
-		}
-
+	}, function doBeforeNormalize(next) {
+		that.callOrNext('beforeNormalize', [document, options], next);
 	}, function emitSavingEvent(next) {
 		that.emit('saving', document, options, creating, function afterSavingEvent(err, stopped) {
 			return next(err);
@@ -1275,7 +1287,7 @@ Model.setMethod(async function executeMongoPipeline(pipeline) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.0.7
+ * @version  1.3.21
  *
  * @param   {String}     id        The object id
  * @param   {Function}   callback
@@ -1304,14 +1316,24 @@ Model.setMethod(function remove(id, callback) {
 	let query = {};
 	query[this.primary_key] = id;
 
-	this.datasource.remove(this, query, {}, function afterRemove(err, result) {
+	Function.series(function recompute(next) {
+		that.callOrNext('beforeRemove', [id], next);
+	}, function done(err) {
 
-		if (err != null) {
-			return pledge.reject(err);
+		if (err) {
+			pledge.reject(err);
+			return;
 		}
 
-		that.emit('removed', result, {}, false, function afterRemovedEvent() {
-			pledge.resolve(result);
+		that.datasource.remove(that, query, {}, function afterRemove(err, result) {
+
+			if (err != null) {
+				return pledge.reject(err);
+			}
+	
+			that.emit('removed', result, {}, false, function afterRemovedEvent() {
+				pledge.resolve(result);
+			});
 		});
 	});
 

package/lib/class/path_evaluator.js

@@ -4,14 +4,18 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.20
  *
  * @param    {String}   path
  */
 const PathEvaluator = Function.inherits(null, 'Alchemy', function PathEvaluator(path) {
 
+	if (!(this instanceof PathEvaluator)) {
+		return new PathEvaluator(path);
+	}
+
 	if (typeof path == 'string') {
 		path = path.split('.');
 	}
@@ -22,7 +26,7 @@ const PathEvaluator = Function.inherits(null, 'Alchemy', function PathEvaluator(
 /**
  * Undry the value
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -33,7 +37,7 @@ PathEvaluator.setStatic(function unDry(value) {
 /**
  * Create a dry object
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -48,14 +52,17 @@ PathEvaluator.setMethod(function toDry() {
 /**
  * Get the actual value
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.20
  */
-PathEvaluator.setMethod(function getValue() {
+PathEvaluator.setMethod(function getValue(context) {
+
+	if (arguments.length == 0) {
+		context = Blast.Globals;
+	}
 
-	var context = Blast.Globals,
-	    result = Object.path(context, this.path);
+	let result = Object.path(context, this.path);
 
 	if (typeof result == 'function') {
 		result = result();

package/lib/class/route.js

@@ -3,7 +3,7 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.16
+ * @version  1.3.21
  */
 const Route = Function.inherits('Alchemy.Base', function Route(router, paths, options) {
 
@@ -62,6 +62,9 @@ const Route = Function.inherits('Alchemy.Base', function Route(router, paths, op
 	// All routes can be postponed by default
 	this.can_be_postponed = true;
 
+	// Possible cache instructions
+	this.cache = null;
+
 	this.setPaths(paths);
 });
 

package/lib/class/router.js

@@ -767,7 +767,7 @@ RouterClass.setMethod(function setOption(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.16
+ * @version  1.3.21
  *
  * @param    {Object}   args
  * @param    {String}   args.name            Optional route name
@@ -819,6 +819,7 @@ RouterClass.setMethod(function add(args) {
 	route.setBreadcrumb(args.breadcrumb);
 	route.sitemap = args.sitemap;
 	route.title = args.title;
+	route.cache = args.cache;
 
 	if (args.visible_location != null) {
 		route.visible_location = args.visible_location;
@@ -1167,7 +1168,7 @@ RouterClass.setMethod(function getOptions(result) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.16
+ * @version  1.3.21
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1219,6 +1220,7 @@ RouterClass.setMethod(function getRoutes(result) {
 			is_system_route            : route.is_system_route,
 			schema                     : route.schema,
 			param_definitions          : route.param_definitions,
+			cache                      : route.cache,
 		};
 	}