alchemymvc 1.3.19 → 1.3.21

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

@@ -30,7 +30,7 @@ Alchemy.setStatic(function onScene(scene, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.2.7
+ * @version  1.3.21
  *
  * @param    {String|Object}   options
  * @param    {Object}          data
@@ -122,10 +122,14 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 
 		config = this.view.helpers.Router.routeConfig(options.name);
 
-		if (config && config.methods) {
-			if (config.methods.indexOf('get') == -1) {
+		if (config) {
+			if (config.methods && config.methods.indexOf('get') == -1) {
 				method = config.methods[0];
 			}
+
+			if (config.cache != null && options.cache == null) {
+				options.cache = config.cache;
+			}
 		}
 
 		// Get the url to the resource
@@ -150,7 +154,7 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 		options[method] = true;
 	}
 
-	pledge = hawkejs.scene.fetch(options);
+	pledge = this.view.fetch(options);
 	pledge.done(callback);
 
 	return pledge;

package/lib/app/helper_controller/controller.js

@@ -359,6 +359,7 @@ Controller.setMethod(async function doAction(name, args) {
 	if (route) {
 
 		if (route.options?.title) {
+			// @TODO: Add support for objects with language keys
 			let title = route.options.title;
 
 			if (alchemy.settings && alchemy.settings.title_suffix) {

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.21
  *
  * @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.datasource.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/mixed_field.js

@@ -0,0 +1,73 @@
+/**
+ * The Mixed Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ */
+const MixedField = Function.inherits('Alchemy.Field', 'Mixed');
+
+/**
+ * Set the datatype name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ */
+MixedField.setDatatype('object');
+
+/**
+ * This field value is self-contained
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ */
+MixedField.setSelfContained(true);
+
+/**
+ * Store objects as strings, if wanted
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @param    {Mixed}        value       The field's own value
+ * @param    {Object}       data        The main record
+ * @param    {Datasource}   datasource  The datasource instance
+ *
+ * @return   {Mixed}
+ */
+MixedField.setMethod(function _toDatasource(value, data, datasource, callback) {
+
+	if (value && typeof value == 'object' && !Object.isPlainObject(value)) {
+		if (!(value instanceof Date)) {
+			value = JSON.toDryObject(value);
+		}
+	}
+
+	Blast.nextTick(callback, null, null, value);
+});
+
+/**
+ * Convert from database to app
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.21
+ * @version  1.3.21
+ *
+ * @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
+ */
+MixedField.setMethod(function _toApp(query, options, value, callback) {
+
+	if (value && typeof value == 'object' && typeof value.dry == 'string') {
+		value = JSON.unDry(value);
+	}
+
+	callback(null, value);
+});