alchemymvc 1.4.0-alpha.1 → 1.4.0-alpha.3

package/lib/app/assets/stylesheets/{alchemy-info.less → alchemy-info.scss}

@@ -1,3 +1,5 @@
+@use "alchemy";
+
 html {
 	font-family: sans-serif;
 	text-size-adjust: 100%;

package/lib/app/behaviour/revision_behaviour.js

@@ -12,26 +12,49 @@ var jsondiffpatch = alchemy.use('jsondiffpatch'),
  * @since    0.0.1
  * @version  0.2.0
  */
-var Revision = Function.inherits('Alchemy.Behaviour', function RevisionBehaviour(model, options) {
-	Behaviour.call(this, model, options);
-});
+const Revision = Function.inherits('Alchemy.Behaviour', 'RevisionBehaviour');
 
 /**
- * Get the Revision Model class for the attached model
+ * Get the Revision model class for the given main model
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.1.0
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
  */
-Revision.setProperty(function revision_model_class() {
+Revision.setStatic(function getRevisionModel(model) {
 
-	var class_name = this.model.name + 'DataRevision';
+	if (typeof model == 'function') {
+		model = model.model_name;
+	}
+
+	if (typeof model == 'string') {
+		model = Model.get(model);
+	}
+
+	if (!model) {
+		throw new Error('Unable to add Revision behaviour to undefined model');
+	}
+
+	let revision_model_name = model.model_name + 'DataRevision',
+	    revision_model;
+
+	try {
+		revision_model = Model.get(revision_model_name, false);
+	} catch (err) {
+		// Ignore
+	}
 
-	if (Classes.Alchemy.Model[class_name]) {
-		return Classes.Alchemy.Model[class_name];
+	if (revision_model) {
+		return revision_model;
 	}
+	
+	let namespace = model.constructor.namespace,
+	    class_name = model.name + 'DataRevision';
 
-	let model_class = Function.inherits('Alchemy.Model', Function.create(class_name, function DataRevision(options) {
+	let model_class = Function.inherits('Alchemy.Model', namespace, Function.create(class_name, function DataRevision(options) {
 		Model.call(this, options);
 	}));
 
@@ -48,6 +71,12 @@ Revision.setProperty(function revision_model_class() {
 		if (Classes.Alchemy.Model.User) {
 			this.belongsTo('User');
 		}
+
+		// Add an index on the record_id
+		this.addIndex('record_id', {
+			unique : false,
+			sparse : false,
+		});
 	});
 
 	// Force the constitutors to load now
@@ -56,6 +85,39 @@ Revision.setProperty(function revision_model_class() {
 	return model_class;
 });
 
+/**
+ * Listen to attachments to schema's
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
+ */
+Revision.setStatic(function attached(schema, new_options) {
+
+	const context = schema.model_class;
+
+	// Add the revision number to the main model
+	context.addField('__r', 'Number', {
+		title: 'Revision',
+	});
+
+	Revision.getRevisionModel(schema.model_class);
+});
+
+/**
+ * Get the Revision Model class for the attached model
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ */
+Revision.setProperty(function revision_model_class() {
+	return Revision.getRevisionModel(this.model);
+});
+
 /**
  * Get the revision model for the attached model
  *
@@ -122,24 +184,6 @@ Revision.setProperty(function diff_patcher() {
 	return diff_patch_instance;
 });
 
-/**
- * Listen to attachments to schema's
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.0.3
- *
- * @param    {Schema}    schema
- * @param    {Object}    options
- */
-Revision.setStatic(function attached(schema, new_options) {
-
-	var context = schema.model_class;
-
-	// Add the revision
-	context.addField('__r', 'Number', {title: 'Revision'});
-});
-
 /**
  * Compare 2 objects
  *
@@ -157,14 +201,14 @@ Revision.setMethod(function compare(left, right) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.0.5
+ * @version  1.4.0
  */
 Revision.setMethod(function beforeSave(record, options, creating) {
 
-	let main = record[this.model.name];
+	let main = record.$main;
 
 	if (!main) {
-		throw new Error('Unable to find main "' + this.model.name + '" data');
+		throw new Error('Unable to find main "' + this.model.model_name + '" data');
 	}
 
 	// No revision to save when creating a record
@@ -177,14 +221,12 @@ Revision.setMethod(function beforeSave(record, options, creating) {
 	    next = this.wait('series');
 
 	// Find the original record
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
-
-		var ori;
+	Model.get(this.model.model_name).findById(record.$pk, async function gotRecord(err, result) {
 
 		if (result) {
 
 			// Get the original data
-			ori = await that.model.convertRecordToDatasourceFormat(result);
+			let ori = await that.model.convertRecordToDatasourceFormat(result);
 
 			// Store the original data in a weakmap for later
 			revision_before.set(options, ori);
@@ -206,17 +248,11 @@ Revision.setMethod(function beforeSave(record, options, creating) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.4.0
  */
 Revision.setMethod(function afterSave(record, options, created) {
 
-	var that = this,
-	    earlier_data,
-	    right,
-	    main,
-	    that,
-	    left,
-	    next;
+	let earlier_data;
 
 	if (created) {
 		earlier_data = {};
@@ -229,11 +265,12 @@ Revision.setMethod(function afterSave(record, options, created) {
 		return;
 	}
 
-	next = this.wait();
-	main = record[that.model.name] || record;
+	let doc = this.model.createDocument(record);
+	let next = this.wait();
+	const that = this;
 
 	// Find the complete saved item
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
+	Model.get(this.model.model_name).findByPk(doc.$pk, async function gotRecord(err, result) {
 
 		if (result) {
 
@@ -243,8 +280,8 @@ Revision.setMethod(function afterSave(record, options, created) {
 			if (new_data) {
 
 				// Convert the objects so they can be diffed properly
-				left = JSON.toDryObject(earlier_data);
-				right = JSON.toDryObject(new_data);
+				let left = JSON.toDryObject(earlier_data),
+				    right = JSON.toDryObject(new_data);
 
 				// Diff them
 				let delta = that.compare(left, right);
@@ -267,7 +304,7 @@ Revision.setMethod(function afterSave(record, options, created) {
 
 				// Add the delta information
 				revision_data = {
-					[that.revision_model.name] : revision_data
+					[that.revision_model.model_name] : revision_data
 				};
 
 				// Save the data

package/lib/app/conduit/loopback_conduit.js

@@ -89,7 +89,7 @@ LoopConduit.setMethod(function copyParentProperties(conduit) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.3.0
+ * @version  1.4.0
  *
  * @param    {Object}      options
  * @param    {Function}    callback
@@ -108,17 +108,20 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 	options = JSON.clone(options);
 
 	for (key in options) {
-		let set_method = false;
+
+		// Keep track if a request method has been set
+		let got_method = false;
 
 		info = Classes.Develry.Request.getMethodInfo(key);
 
 		if (info && options[key]) {
 
-			if (info.method == 'get' && set_method) {
-				// Ignore
+			if (info.method == 'get' && got_method) {
+				// If a request method has already been set,
+				// do not let `get` options overwrite it!
 			} else {
 				this.method = key;
-				set_method = true;
+				got_method = true;
 			}
 
 			if (info.has_body && typeof options[key] == 'object') {
@@ -131,6 +134,8 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 		this.method = options.method;
 	}
 
+	let route_params = options.params;
+
 	if (options.name) {
 		// @TODO: what about path sections?
 		route = this.getRouteByName(options.name);
@@ -147,7 +152,7 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 
 		// @WARNING: It's best to just generate the URL
 		// and let it parse all the information that way
-		options.href = this.routeUrl(options.name, options.params, {extra_get_parameters: false});
+		options.href = this.routeUrl(options.name, route_params, {extra_get_parameters: false});
 	}
 
 	if (!this.method) {
@@ -158,6 +163,10 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 
 		this.original_url = RURL.parse(options.href);
 
+		if (options.get && typeof options.get == 'object') {
+			this.original_url.addQuery(options.get);
+		}
+
 		this.url = this.original_url;
 		this.original_path = this.url.path;
 		this.original_pathname = this.url.pathname;
@@ -169,14 +178,20 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 		this.parseSection();
 
 		promise = this.parseRoute();
+	} else if (options.get && typeof options.get == 'object') {
+		if (!this.params) {
+			this.params = {};
+		}
+
+		Object.assign(this.params, options.get);
 	}
 
 	if (options.body) {
 		this.body = options.body;
 	}
 
-	if (options.params) {
-		this.setRouteParameters(options.params);
+	if (route_params) {
+		this.setRouteParameters(route_params);
 	}
 
 	if (options.arguments) {

package/lib/app/datasource/mongo_datasource.js

@@ -659,7 +659,7 @@ Mongo.setMethod(function _remove(model, query, options, callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.4.0
  */
 Mongo.setMethod(function _ensureIndex(model, index, callback) {
 
@@ -696,11 +696,20 @@ Mongo.setMethod(function _ensureIndex(model, index, callback) {
 
 			// Check for IndexOptionsConflict
 			if (err.code === 85) {
+				let index_to_drop;
+
+				if (err.message.includes('already exists with a different name:')) {
+					index_to_drop = err.message.after('different name:').trim();
+				}
+
+				if (!index_to_drop) {
+					index_to_drop = options.name;
+				}
 
 				try {
 
 					// Index already exists, drop it
-					await collection.dropIndex(options.name);
+					await collection.dropIndex(index_to_drop);
 
 					// Try again
 					await collection.createIndex(index_specs, options);

package/lib/app/helper/enum_values.js

@@ -40,7 +40,7 @@ EnumMap.setMethod(function get(name) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.1
- * @version  1.2.1
+ * @version  1.4.0
  *
  * @param    {string}   name
  * @param    {*}        value
@@ -65,18 +65,37 @@ EnumMap.setMethod(function set(name, value) {
 			name  : value,
 			title : value,
 		};
-	} else if (typeof value == 'function') {
-		result = {
-			name  : value.name,
-			title : value.title,
-		};
 	} else {
-		result = {
-			name  : value.name,
-			title : value.title || value.name,
-		};
+		if (typeof value == 'function') {
+			result = {
+				name  : value.name,
+				title : value.title,
+			};
+		} else {
+			result = {
+				name  : value.name,
+				title : value.title || value.name,
+			};
+
+			if (value.icon) {
+				result.icon = value.icon;
+			}
+
+			if (value.color) {
+				result.color = value.color;
+			}
+
+			if (value.text_color) {
+				result.text_color = value.text_color;
+			}
+		}
+
+		if (value.enum_info) {
+			Object.assign(result, value.enum_info);
+		}
 	}
 
+	result.number = this.local.size + 1;
 	result.value = value;
 	result.is_enumified = true;
 

package/lib/app/helper/router_helper.js

@@ -112,7 +112,7 @@ Router.setMethod(function isLocalUrl(url) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.3.1
+ * @version  1.4.0
  *
  * @param    {Element}   element    The element to apply to
  * @param    {string}    name       The route name
@@ -225,6 +225,8 @@ Router.setMethod(function applyDirective(element, name, options) {
 		disable_ajax = true;
 	}
 
+	let method_attribute = false;
+
 	if (element.role == 'link') {
 		attribute_name = 'href';
 	} else {
@@ -232,6 +234,7 @@ Router.setMethod(function applyDirective(element, name, options) {
 		switch (element.nodeName) {
 			case 'FORM':
 				attribute_name = 'action';
+				method_attribute = 'method'; 
 				break;
 
 			case 'AREA':
@@ -260,6 +263,10 @@ Router.setMethod(function applyDirective(element, name, options) {
 		}
 	}
 
+	if (method_attribute && config.methods?.[0]) {
+		element.setAttribute(method_attribute, config.methods[0]);
+	}
+
 	if (disable_ajax) {
 		element.setAttribute('data-he-link', 'false');
 	}
@@ -384,19 +391,13 @@ Router.setMethod(function routeConfig(name, socket_route) {
  */
 Router.setMethod(function routeUrl(name, parameters, options) {
 
-	var base_url,
-	    locales,
-	    config,
-	    url,
-	    key,
-	    i;
-
 	if (!options) {
 		options = {};
 	}
 
-	url = '';
-	config = options.config || this.routeConfig(name);
+	let locales,
+	    config = options.config || this.routeConfig(name),
+	    url = '';
 
 	if (options.locale || options.prefix) {
 		locales = [options.prefix || options.locale];
@@ -417,11 +418,15 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 			// (in case it's a special parameters object, like a Document)
 			parameters = Object.create(parameters);
 		}
+	} else {
+		parameters = {};
 	}
 
 	let chosen_prefix;
 
 	if (config != null) {
+		let i;
+
 		for (i = 0; i < locales.length; i++) {
 			if (config.paths && config.paths[locales[i]]) {
 				chosen_prefix = locales[i];
@@ -435,7 +440,7 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 		}
 
 		if (!url && config.paths) {
-			key = Object.keys(config.paths).first();
+			let key = Object.keys(config.paths).first();
 
 			if (key) {
 				url = '/' + key + config.paths[key];
@@ -520,6 +525,9 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 	}
 
 	if (options.full || options.absolute) {
+
+		let base_url;
+
 		if (this.view) {
 			base_url = this.view.internal('url');
 		}

package/lib/app/helper_field/enum_field.js

@@ -83,4 +83,17 @@ Enum.setMethod(function getClientConfigOptions(wm) {
 	let options = JSON.clone(this.options, 'toHawkejs', wm);
 
 	return options;
+});
+
+/**
+ * Get the configuration entry for the given value
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @return   {Object}
+ */
+Enum.setMethod(function getValueConfiguration(value) {
+	return this.getValues()?.get?.(value);
 });

package/lib/app/helper_model/document.js

@@ -1002,7 +1002,7 @@ Document.setMethod(function recomputeFieldIfNecessary(name, force = false) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.21
- * @version  1.3.21
+ * @version  1.4.0
  *
  * @param    {string|Alchemy.Field}   name
  * @param    {*}                      value
@@ -1018,9 +1018,7 @@ Document.setMethod(function _setComputedFieldValue(name, value) {
 	}
 
 	if (Pledge.isThenable(value)) {
-		value.then(value => {
-			this.$main[name] = value;
-		});
+		value = value.then(value => this.$main[name] = value);
 	} else {
 		this.$main[name] = value;
 	}
@@ -1034,7 +1032,7 @@ Document.setMethod(function _setComputedFieldValue(name, value) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.21
- * @version  1.3.21
+ * @version  1.4.0
  *
  * @return   {Pledge|undefined}
  */
@@ -1089,8 +1087,11 @@ Document.setMethod(function recomputeValues() {
 		}
 
 		let result = compute_method.call(this, this, field);
+		result = this._setComputedFieldValue(key, result);
 
-		this._setComputedFieldValue(key, result);
+		if (Pledge.isThenable(result)) {
+			promises.push(result);
+		}
 	}
 
 	if (promises.length) {

package/lib/app/model/system_task_model.js

@@ -15,7 +15,7 @@ const SystemTask = Function.inherits('Alchemy.Model.System', 'Task');
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.17
- * @version  1.3.17
+ * @version  1.4.0
  */
 SystemTask.constitute(function addTaskFields() {
 
@@ -48,9 +48,18 @@ SystemTask.constitute(function addTaskFields() {
 
 	this.addField('schedule_type', 'Enum', {
 		values: {
-			user            : 'User',
-			system_forced   : 'System (forced)',
-			system_fallback : 'System (fallback)',
+			user            : {
+				title : 'User',
+				icon  : 'user',
+			},
+			system_forced   : {
+				title: 'System (forced)',
+				icon : 'shield-keyhole',
+			},
+			system_fallback : {
+				title: 'System (fallback)',
+				icon : 'shield-halved',
+			}
 		},
 		default: 'user',
 	});

package/lib/bootstrap.js

@@ -7,6 +7,11 @@ const libpath = require('path');
  */
 const Protoblast = require('protoblast')(true);
 
+/**
+ * Require Hawkejs next
+ */
+require('hawkejs');
+
 /**
  * Define shared global constants and require methods
  */

package/lib/class/element.js

@@ -7,6 +7,22 @@
  */
 const Element = Function.inherits('Hawkejs.Element', 'Alchemy.Element', 'Element');
 
+/**
+ * Let Alchemy handle the stylesheets of custom elements
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ */
+Classes.Hawkejs.Element.Element.setStylesheetHandler(function handleStylesheet(path) {
+
+	if (!path || Blast.isBrowser) {
+		return;
+	}
+
+	alchemy.registerRequiredStylesheet(path);
+});
+
 /**
  * The default element prefix (when element contains no hyphen) is "al"
  *

package/lib/class/model.js

@@ -59,11 +59,6 @@ Model.postInherit(function setModelName() {
 		model_name = ns + '_' + model_name;
 	}
 
-	if (model_name[0] == '_') {
-		console.log(ns, model_name)
-		throw new Error('KAK')
-	}
-
 	// The simple name of the model
 	this.model_name = model_name;
 	this.setProperty('model_name', model_name);
@@ -1186,10 +1181,6 @@ Model.setMethod(function auditRecord(document, options, callback) {
  */
 Model.setMethod(function convertRecordToDatasourceFormat(record, options, callback) {
 
-	var that = this,
-	    pledge,
-	    data;
-
 	if (typeof options == 'function') {
 		callback = options;
 		options = {};
@@ -1199,12 +1190,12 @@ Model.setMethod(function convertRecordToDatasourceFormat(record, options, callba
 		options = {};
 	}
 
-	data = record[this.name] || record;
+	let data = record.$main || record[this.model_name] || record;
 
 	// Normalize the data
 	data = this.compose(data, options);
 
-	pledge = this.datasource.toDatasource(this, data);
+	let pledge = this.datasource.toDatasource(this, data);
 
 	pledge.handleCallback(callback);