alchemymvc 1.3.19 → 1.3.20

package/lib/app/datasource/mongo_datasource.js

@@ -1,4 +1,5 @@
-var MongoClient = alchemy.use('mongodb').MongoClient;
+const mongo = alchemy.use('mongodb'),
+      MongoClient = mongo.MongoClient;
 
 /**
  * MongoDb Datasource
@@ -102,6 +103,98 @@ Mongo.setProperty('allowed_find_options', [
 	'session'
 ]);
 
+/**
+ * Convert the given value to a BigInt
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {*}   value
+ *
+ * @return   {BigInt}
+ */
+Mongo.setMethod(function castToBigInt(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	if (typeof value == 'object') {
+		return value.toBigInt();
+	}
+
+	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   {Mongo.Long}
+ */
+Mongo.setMethod(function convertBigIntForDatasource(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	return mongo.Long.fromBigInt(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}
+ */
+Mongo.setMethod(function castToDecimal(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	if (typeof value == 'object') {
+		value = value.toString();
+	}
+
+	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   {Mongo.Decimal128}
+ */
+Mongo.setMethod(function convertDecimalForDatasource(value) {
+
+	if (value == null) {
+		return value;
+	}
+
+	if (!(value instanceof Blast.Classes.Develry.Decimal)) {
+		value = new Blast.Classes.Develry.Decimal(value);
+	}
+
+	return mongo.Decimal128.fromString(value.toString());
+});
+
 /**
  * Get find options for the MongoDB server
  *

package/lib/app/helper_field/{date_field.js → 11-date_field.js}

@@ -7,9 +7,7 @@
  * @since    0.2.0
  * @version  1.1.0
  */
-var DateField = Function.inherits('Alchemy.Field', function Date(schema, name, options) {
-	Date.super.call(this, schema, name, options);
-});
+const DateField = Function.inherits('Alchemy.Field', 'Date');
 
 /**
  * Set the datatype name

package/lib/app/helper_field/15-local_temporal_field.js

@@ -0,0 +1,100 @@
+/**
+ * The abstract LocalTemporal Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const LocalTemporal = Function.inherits('Alchemy.Field.Date', 'LocalTemporal');
+
+/**
+ * Mark this class as being abstract
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+LocalTemporal.makeAbstractClass();
+
+/**
+ * Cast the given value to this field's type for search in a db
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ * @param    {Array}   field_paths   The path to the field
+ *
+ * @return   {Mixed}
+ */
+LocalTemporal.setMethod(function _castCondition(value, field_paths) {
+
+	if (value == null) {
+		return value;
+	}
+
+	value = this.cast(value);
+	value = value.toNumericRepresentation();
+
+	if (typeof value == 'bigint') {
+		value = this.datasource.convertBigIntForDatasource(value);
+	}
+
+	return value;
+});
+
+/**
+ * Prepare the value to be stored in the database
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}        value       The field's own value
+ * @param    {Object}       data        The main record
+ * @param    {Datasource}   datasource  The datasource instance
+ *
+ * @return   {Mixed}
+ */
+LocalTemporal.setMethod(function _toDatasource(value, data, datasource, callback) {
+
+	value = this.cast(value);
+
+	if (value) {
+		value = value.toNumericRepresentation();
+	}
+
+	if (typeof value == 'bigint') {
+		value = this.datasource.convertBigIntForDatasource(value);
+	}
+
+	Blast.nextTick(() => callback(null, value));
+});
+
+/**
+ * Convert from database to app
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Object}   query     The original query
+ * @param    {Object}   options   The original query options
+ * @param    {Mixed}    value     The field value, as stored in the DB
+ * @param    {Function} callback
+ */
+LocalTemporal.setMethod(function _toApp(query, options, value, callback) {
+
+	if (value && typeof value == 'object') {
+		if (typeof value.getUTCDate != 'function') {
+			value = this.datasource.castToBigInt(value);
+		}
+	}
+
+	value = this.cast(value);
+
+	callback(null, value);
+});

package/lib/app/helper_field/20-decimal_field.js

@@ -0,0 +1,105 @@
+/**
+ * The Decimal Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const DecimalField = Function.inherits('Alchemy.Field.Number', 'Decimal');
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Decimal}
+ */
+DecimalField.setMethod(function cast(value) {
+
+	// Allow null
+	if (value == null) {
+		return value;
+	}
+
+	if (value instanceof Classes.Develry.Decimal) {
+		value = value.toImmutable();
+	} else {
+		value = new Classes.Develry.Decimal(value);
+	}
+
+	return value;
+});
+
+/**
+ * Cast the given value to this field's type for search in a db
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ * @param    {Array}   field_paths   The path to the field
+ *
+ * @return   {Mixed}
+ */
+DecimalField.setMethod(function _castCondition(value, field_paths) {
+
+	if (value == null) {
+		return value;
+	}
+
+	value = this.cast(value);
+	value = this.datasource.convertDecimalForDatasource(value);
+
+	return value;
+});
+
+/**
+ * Prepare the value to be stored in the database
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}        value       The field's own value
+ * @param    {Object}       data        The main record
+ * @param    {Datasource}   datasource  The datasource instance
+ *
+ * @return   {Mixed}
+ */
+DecimalField.setMethod(function _toDatasource(value, data, datasource, callback) {
+
+	value = this.cast(value);
+	value = this.datasource.convertDecimalForDatasource(value);
+
+	Blast.nextTick(() => callback(null, value));
+});
+
+/**
+ * Convert from database to app
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Object}   query     The original query
+ * @param    {Object}   options   The original query options
+ * @param    {Mixed}    value     The field value, as stored in the DB
+ * @param    {Function} callback
+ */
+DecimalField.setMethod(function _toApp(query, options, value, callback) {
+
+	if (value && typeof value == 'object') {
+		value = value.toString();
+	}
+
+	value = this.cast(value);
+
+	callback(null, value);
+});

package/lib/app/helper_field/big_int_field.js

@@ -50,7 +50,7 @@ BigIntField.setMethod(function cast(value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.6
- * @version  1.3.6
+ * @version  1.3.20
  *
  * @param    {Mixed}   value
  * @param    {Array}   field_paths   The path to the field
@@ -60,10 +60,7 @@ BigIntField.setMethod(function cast(value) {
 BigIntField.setMethod(function _castCondition(value, field_paths) {
 
 	value = this.cast(value);
-
-	if (mongo) {
-		value = mongo.Long.fromBigInt(value);
-	}
+	value = this.convertBigIntForDatasource(value);
 
 	return value;
 });
@@ -73,7 +70,7 @@ BigIntField.setMethod(function _castCondition(value, field_paths) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.6
- * @version  1.3.6
+ * @version  1.3.20
  *
  * @param    {Mixed}        value       The field's own value
  * @param    {Object}       data        The main record
@@ -84,10 +81,7 @@ BigIntField.setMethod(function _castCondition(value, field_paths) {
 BigIntField.setMethod(function _toDatasource(value, data, datasource, callback) {
 
 	value = this.cast(value);
-
-	if (mongo) {
-		value = mongo.Long.fromBigInt(value);
-	}
+	value = this.datasource.convertBigIntForDatasource(value);
 
 	callback(null, value);
 });
@@ -97,7 +91,7 @@ BigIntField.setMethod(function _toDatasource(value, data, datasource, callback)
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.6
- * @version  1.3.6
+ * @version  1.3.20
  *
  * @param    {Object}   query     The original query
  * @param    {Object}   options   The original query options
@@ -106,8 +100,8 @@ BigIntField.setMethod(function _toDatasource(value, data, datasource, callback)
  */
 BigIntField.setMethod(function _toApp(query, options, value, callback) {
 
-	if (mongo && value && value.toBigInt) {
-		value = value.toBigInt();
+	if (value) {
+		value = this.datasource.castToBigInt(value);
 	}
 
 	value = this.cast(value);

package/lib/app/helper_field/fixed_decimal_field.js

@@ -0,0 +1,44 @@
+/**
+ * The FixedDecimal Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const FixedDecimalField = Function.inherits('Alchemy.Field.Decimal', function FixedDecimal(schema, name, options) {
+
+	if (options?.scale == null) {
+		throw new Error('FixedDecimal fields require a scale option');
+	}
+
+	FixedDecimal.super.call(this, schema, name, options);
+});
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Decimal}
+ */
+FixedDecimalField.setMethod(function cast(value) {
+
+	// Allow null
+	if (value == null) {
+		return value;
+	}
+
+	if (value instanceof Classes.Develry.Decimal) {
+		value = value.toImmutable().toScale(this.options.scale);
+	} else {
+		value = new Classes.Develry.FixedDecimal(value, this.options.scale);
+	}
+
+	return value;
+});

package/lib/app/helper_field/local_date_field.js

@@ -0,0 +1,39 @@
+/**
+ * The LocalDate Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const LocalDate = Function.inherits('Alchemy.Field.LocalTemporal', 'LocalDate');
+
+/**
+ * Set the datatype name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+LocalDate.setDatatype('date');
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Develry.LocalDate}
+ */
+LocalDate.setMethod(function cast(value) {
+
+	if (value == null || value === '') {
+		return null;
+	}
+
+	return Classes.Develry.LocalDate.create(value);
+});

package/lib/app/helper_field/local_date_time_field.js

@@ -0,0 +1,39 @@
+/**
+ * The LocalDateTime Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const LocalDateTime = Function.inherits('Alchemy.Field.LocalTemporal', 'LocalDateTime');
+
+/**
+ * Set the datatype name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+LocalDateTime.setDatatype('datetime');
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Develry.LocalDateTime}
+ */
+LocalDateTime.setMethod(function cast(value) {
+
+	if (value == null || value === '') {
+		return null;
+	}
+
+	return Classes.Develry.LocalDateTime.create(value);
+});

package/lib/app/helper_field/local_time_field.js

@@ -0,0 +1,39 @@
+/**
+ * The LocalTime Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+const LocalTime = Function.inherits('Alchemy.Field.LocalTemporal', 'LocalTime');
+
+/**
+ * Set the datatype name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+LocalTime.setDatatype('time');
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Develry.LocalTime}
+ */
+LocalTime.setMethod(function cast(value) {
+
+	if (value == null || value === '') {
+		return null;
+	}
+
+	return Classes.Develry.LocalTime.create(value);
+});

package/lib/app/helper_field/schema_field.js

@@ -414,6 +414,17 @@ SchemaField.setMethod(function _toAppFromValue(query, options, value, callback)
 		record = {
 			[this.schema.name] : options.parent_value
 		};
+	} else if (options._root_data) {
+
+		let root_data = options._root_data;
+
+		if (root_data[this.schema.name]) {
+			root_data = root_data[this.schema.name];
+		}
+
+		record = {
+			[this.schema.name] : root_data
+		};
 	} else {
 		record = {
 			[this.schema.name] : {

package/lib/app/helper_model/model.js

@@ -1626,7 +1626,7 @@ Hawkejs.Model = Model;
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.1
+ * @version  1.3.20
  *
  * @param    {Document}   document
  * @param    {Object}     options
@@ -1675,9 +1675,9 @@ Model.setMethod(function saveRecord(document, options, callback) {
 			creating = options.create || doc.$pk == null;
 			next();
 		});
-	}, function doBeforeSave(next) {
+	}, function doBeforeNormalize(next) {
 		// @TODO: make "beforeSave" only use promises
-		that.callOrNext('beforeSave', [document, options], next);
+		that.callOrNext('beforeNormalize', [document, options], next);
 	}, function emitSavingEvent(next) {
 		// @TODO: Should this be able to stop the saving without throwing an error?
 		that.issueEvent('saving', [document, options, creating], next);
@@ -1771,28 +1771,35 @@ Model.setMethod(function compose(data, options) {
 /**
  * Create a record in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.20
  *
- * @param    {Object}     data       The record data to check
+ * @param    {Document}   document
  * @param    {Object}     options
  * @param    {Function}   callback
  */
-Model.setMethod(function createRecord(data, options, callback) {
+Model.setMethod(function createRecord(document, options, callback) {
 
 	const that = this;
 
 	// Normalize & clone the data, set default values, ...
-	data = this.compose(data, options);
+	let data = this.compose(document, options);
 
-	Function.series(function validate(next) {
+	// Turn it into a new document
+	document = this.createDocument(data);
+
+	Function.series(function doBeforeValidate(next) {
+		that.callOrNext('beforeValidate', [document, options], next);
+	}, function validate(next) {
 
 		if (options.validate === false || !that.schema) {
 			return next();
 		}
 
-		Pledge.done(that.schema.validate(that.createDocument(data)), next);
+		Pledge.done(that.schema.validate(document), next);
+	}, function doBeforeSave(next) {
+		that.callOrNext('beforeSave', [document, options], next);
 	}, function done(err) {
 
 		if (err) {
@@ -1819,29 +1826,36 @@ Model.setMethod(function createRecord(data, options, callback) {
 /**
  * Update a record in the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.20
  *
- * @param    {Object}     data       The record data to check
+ * @param    {Document}   document
  * @param    {Object}     options
  * @param    {Function}   callback
  */
-Model.setMethod(function updateRecord(data, options, callback) {
+Model.setMethod(function updateRecord(document, options, callback) {
 
 	const that = this;
 
 	// Normalize the data, but no default values should be set (skip non present items)
-	data = this.compose(data, Object.assign({update: true}, options));
+	let data = this.compose(document, Object.assign({update: true}, options));
+
+	// Turn it into a new document
+	document = this.createDocument(data);
 
-	Function.series(function validate(next) {
+	Function.series(function doBeforeValidate(next) {
+		that.callOrNext('beforeValidate', [document, options], next);
+	}, function validate(next) {
 
 		if (options.validate === false || !that.schema) {
 			return next();
 		}
 
-		Pledge.done(that.schema.validate(that.createDocument(data)), next);
+		Pledge.done(that.schema.validate(document), next);
 
+	}, function doBeforeSave(next) {
+		that.callOrNext('beforeSave', [document, options], next);
 	}, function done(err) {
 
 		if (err) {

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/model.js

@@ -845,7 +845,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 +895,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);

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/task_service.js

@@ -105,7 +105,7 @@ Service.setMethod(function checksumSystemSchedule(type_path, cron, settings) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.17
- * @version  1.3.17
+ * @version  1.3.20
  */
 Service.setMethod(async function initSchedules() {
 
@@ -179,6 +179,7 @@ Service.setMethod(async function initSchedules() {
 			// If this checksum has already been seen, also remove it
 			if (existing_system_records.has(checksum)) {
 				await record.remove();
+				continue;
 			}
 
 			// Update the record
@@ -188,6 +189,8 @@ Service.setMethod(async function initSchedules() {
 
 			await record.save();
 
+			existing_system_records.set(checksum, record);
+
 		} catch (err) {
 			alchemy.registerError(err);
 		}
@@ -526,12 +529,15 @@ class TaskSchedules {
 	 *
 	 * @author   Jelle De Loecker   <jelle@elevenways.be>
 	 * @since    1.3.17
-	 * @version  1.3.17
+	 * @version  1.3.20
 	 */
-	#startFromMenu(task_record) {
+	async #startFromMenu(task_record) {
 		console.log('Manually starting', task_record.type, 'task:', task_record);
 		let schedule = new TaskSchedule(this, null, task_record.settings, task_record);
-		schedule.startManually();
+		let task_instance = await schedule.startManually();
+		console.log(' -- Started:', task_instance);
+
+		return task_instance;
 	}
 
 	/**
@@ -579,6 +585,7 @@ class TaskSchedule {
 	janeway_menu_item = null;
 
 	#change_counter = 0;
+	#instance_pledge = null;
 
 	/**
 	 * Initialize the instance
@@ -845,10 +852,22 @@ class TaskSchedule {
 	 *
 	 * @author   Jelle De Loecker   <jelle@elevenways.be>
 	 * @since    1.3.17
-	 * @version  1.3.17
+	 * @version  1.3.20
+	 *
+	 * @return   {Task}
 	 */
 	async startManually() {
-		return this.#run(true);
+
+		if (this.is_running) {
+			return false;
+		}
+
+		let pledge = new Pledge();
+		this.#instance_pledge = pledge;
+
+		this.#run(true);
+
+		return pledge;
 	}
 
 	/**
@@ -856,7 +875,7 @@ class TaskSchedule {
 	 *
 	 * @author   Jelle De Loecker   <jelle@elevenways.be>
 	 * @since    1.3.17
-	 * @version  1.3.17
+	 * @version  1.3.20
 	 */
 	async #run(started_manually = false) {
 
@@ -889,6 +908,12 @@ class TaskSchedule {
 			if (started_manually || await this.ownsScheduledTask()) {
 				let instance = this.createInstance();
 				this.task_instance = instance;
+
+				if (this.#instance_pledge) {
+					this.#instance_pledge.resolve(instance);
+					this.#instance_pledge = null;
+				}
+
 				await instance.start();
 			}
 		} catch (err) {

package/lib/core/base.js

@@ -471,7 +471,11 @@ Base.setMethod(function getClassPathAfter(after) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.2.2
+ * @version  1.3.20
+ *
+ * @param    {String}   name   The name of the method to call
+ * @param    {Array}    args   The arguments to pass
+ * @param    {Function} next   The callback to call afterwards
  */
 Base.setMethod(function callOrNext(name, args, next) {
 
@@ -480,14 +484,25 @@ Base.setMethod(function callOrNext(name, args, next) {
 		args = [];
 	}
 
-	if (typeof this[name] == 'function') {
+	const fnc = this[name];
+
+	if (typeof fnc == 'function') {
+
+		let has_callback = false,
+		    promise;
 
-		if (next) {
+		if (next && fnc.length > args.length) {
+			has_callback = true;
 			args.push(next);
 		}
 
 		try {
-			this[name].apply(this, args);
+			promise = this[name].apply(this, args);
+
+			if (!has_callback) {
+				Pledge.done(promise, next);
+			}
+
 		} catch (err) {
 			next(err);
 		}

package/lib/core/client_alchemy.js

@@ -635,6 +635,13 @@ function getRoutesDict() {
 
 // From here on, only client-side code is added
 if (Blast.isBrowser) {
+	window.LocalDateTime = Blast.Classes.Develry.LocalDateTime;
+	window.LocalDate = Blast.Classes.Develry.LocalDate;
+	window.LocalTime = Blast.Classes.Develry.LocalTime;
+	window.Decimal = Blast.Classes.Develry.Decimal;
+	window.MutableDecimal = Blast.Classes.Develry.MutableDecimal;
+	window.FixedDecimal = Blast.Classes.Develry.FixedDecimal;
+	window.MutableFixedDecimal = Blast.Classes.Develry.MutableFixedDecimal;
 	window.alchemy = new Alchemy();
 } else {
 	return;

package/lib/init/constants.js

@@ -59,6 +59,29 @@ DEFINE('Classes', Blast.Classes);
  */
 DEFINE('Types', Blast.Types);
 
+/**
+ * The new Local Date/Time classes
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+DEFINE('LocalDateTime', Blast.Classes.Develry.LocalDateTime);
+DEFINE('LocalDate', Blast.Classes.Develry.LocalDate);
+DEFINE('LocalTime', Blast.Classes.Develry.LocalTime);
+
+/**
+ * The new Decimal classes
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.20
+ * @version  1.3.20
+ */
+DEFINE('Decimal', Blast.Classes.Develry.Decimal);
+DEFINE('MutableDecimal', Blast.Classes.Develry.MutableDecimal);
+DEFINE('FixedDecimal', Blast.Classes.Develry.FixedDecimal);
+DEFINE('MutableFixedDecimal', Blast.Classes.Develry.MutableFixedDecimal);
+
 /**
  * Path to the directory of the server.js file
  *

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.19",
+	"version": "1.3.20",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.31",
-		"protoblast"       : "~0.8.12",
+		"protoblast"       : "~0.8.14",
 		"semver"           : "~7.5.4",
 		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",