alchemymvc 1.2.6 → 1.2.7

package/lib/app/conduit/loopback_conduit.js

@@ -78,7 +78,7 @@ LoopConduit.setMethod(function copyParentProperties(conduit) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.7
+ * @version  1.2.7
  *
  * @param    {Object}      options
  * @param    {Function}    callback
@@ -136,8 +136,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 = alchemy.routeUrl(options.name, options.params, {extra_get_parameters: false});
-		// @TODO: alchemy.routeUrl will ignore the `keep_get_parameters` option
+		options.href = this.routeUrl(options.name, options.params, {extra_get_parameters: false});
 	}
 
 	if (!this.method) {

package/lib/app/element/time_ago.js

@@ -1,13 +1,11 @@
 /**
- * The custom time-ago element
+ * The custom al-time-ago element
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.1.0
  * @version  0.1.0
  */
-var TimeAgo = Function.inherits('Alchemy.Element', function TimeAgo() {
-	return TimeAgo.super.call(this);
-});
+const TimeAgo = Function.inherits('Alchemy.Element', 'TimeAgo');
 
 /**
  * Set the time

package/lib/app/helper/alchemy_helper.js

@@ -28,9 +28,9 @@ Alchemy.setStatic(function onScene(scene, options) {
 /**
  * Perform a resource request
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {String|Object}   options
  * @param    {Object}          data
@@ -40,11 +40,7 @@ Alchemy.setStatic(function onScene(scene, options) {
  */
 Alchemy.setMethod(function getResource(options, data, callback) {
 
-	var that = this,
-	    conduit,
-	    config,
-	    pledge,
-	    url;
+	const that = this;
 
 	if (typeof options == 'string') {
 
@@ -70,6 +66,8 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 		options.params = data;
 	}
 
+	let pledge;
+
 	if (!options.name && !options.href) {
 		pledge = Classes.Pledge.reject(new Error('Unable to get alchemy resource, a `name` or `href` option is required'));
 		pledge.done(callback);
@@ -86,7 +84,7 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 	}
 
 	if (Blast.isNode) {
-		conduit = this.view.server_var('conduit');
+		const conduit = this.view.server_var('conduit');
 
 		if (!conduit) {
 			pledge = Classes.Pledge.reject(new Error('Could not find conduit, alchemy resource will not be fetched'));
@@ -102,12 +100,15 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 		return pledge;
 	}
 
+	let method = 'get',
+	    url;
+
 	if (options.href) {
 		url = options.href;
 	} else {
 
 		// See if this is a socket route
-		config = this.view.helpers.Router.routeConfig(options.name, true);
+		let config = this.view.helpers.Router.routeConfig(options.name, true);
 
 		if (config && config.socket_route) {
 			pledge = new Classes.Pledge();
@@ -119,10 +120,18 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 			return pledge;
 		}
 
+		config = this.view.helpers.Router.routeConfig(options.name);
+
+		if (config && config.methods) {
+			if (config.methods.indexOf('get') == -1) {
+				method = config.methods[0];
+			}
+		}
+
 		// Get the url to the resource
 		url = hawkejs.scene.helpers.Router.routeUrl(options.name, options.params);
 
-		if (!url && typeof name == 'string') {
+		if (!url && typeof options.name == 'string') {
 			url = hawkejs.scene.helpers.Router.routeUrl('APIResource', {name: options.name});
 		}
 
@@ -136,7 +145,9 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 	options.href = url;
 
 	if (data) {
-		options.get = data;
+		options[method] = data;
+	} else if (method != 'get') {
+		options[method] = true;
 	}
 
 	pledge = hawkejs.scene.fetch(options);

package/lib/app/helper/router_helper.js

@@ -51,7 +51,7 @@ Router.setProperty(function current_url() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.5
+ * @version  1.2.7
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    name       The route name
@@ -69,7 +69,6 @@ Router.setMethod(function applyDirective(element, name, options) {
 	}
 
 	let attribute_name,
-	    param_source,
 	    params = {},
 	    url;
 
@@ -77,6 +76,10 @@ Router.setMethod(function applyDirective(element, name, options) {
 		Object.assign(params, element.parameters);
 	}
 
+	if (options.parameters) {
+		Object.assign(params, options.parameters);
+	}
+
 	if (config.keys && config.keys.length) {
 
 		let key,
@@ -99,12 +102,13 @@ Router.setMethod(function applyDirective(element, name, options) {
 	}
 
 	if (config.breadcrumb) {
-		element.setAttribute('data-breadcrumb', this.getTrail(name, params));
+		let link_breadcrumb = this.getTrail(name, params);
+		element.setAttribute('data-breadcrumb', link_breadcrumb);
 
-		if (this.renderer) {
+		if (this.renderer && link_breadcrumb) {
 			let page_breadcrumb = this.renderer.internal('breadcrumb');
 
-			if (page_breadcrumb) {
+			if (page_breadcrumb && page_breadcrumb.startsWith(link_breadcrumb)) {
 
 				if (element.parentElement) {
 					// @TODO: We need to make sure the options (classnames & such)
@@ -112,7 +116,13 @@ Router.setMethod(function applyDirective(element, name, options) {
 					this.renderer.ensureElementOptions(element.parentElement);
 				}
 
-				alchemy.markLinkElement(element, 1);
+				let level = 2;
+
+				if (page_breadcrumb == link_breadcrumb) {
+					level = 1;
+				}
+
+				alchemy.markLinkElement(element, level);
 			}
 		}
 	}
@@ -167,7 +177,7 @@ Router.setMethod(function applyDirective(element, name, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {String}   name
  * @param    {Boolean}  socket_route   Look in the socket routes
@@ -244,6 +254,9 @@ Router.setMethod(function routeConfig(name, socket_route) {
 			result.breadcrumb = route.breadcrumb;
 			result.has_breadcrumb_assignments = route.has_breadcrumb_assignments;
 			result.keys = route.keys;
+			result.methods = route.methods;
+			result.permission = route.permission;
+			result.has_permission_assignments = route.has_permission_assignments;
 		}
 
 		let router_options;

package/lib/app/helper_model/criteria.js

@@ -659,13 +659,18 @@ Criteria.setMethod(function augment(type) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Number}   amount
  *
  * @return   {Criteria}
  */
 Criteria.setMethod(function limit(amount) {
+
+	if (typeof amount != 'number') {
+		amount = parseInt(amount);
+	}
+
 	this.options.limit = amount;
 	return this;
 });
@@ -675,13 +680,18 @@ Criteria.setMethod(function limit(amount) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Number}   amount
  *
  * @return   {Criteria}
  */
 Criteria.setMethod(function skip(amount) {
+
+	if (typeof amount != 'number') {
+		amount = parseInt(amount);
+	}
+
 	this.options.skip = amount;
 	return this;
 });
@@ -691,7 +701,7 @@ Criteria.setMethod(function skip(amount) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {Number}   page        A 1-indexed page number
  * @param    {Number}   page_size
@@ -700,6 +710,14 @@ Criteria.setMethod(function skip(amount) {
  */
 Criteria.setMethod(function page(page, page_size) {
 
+	if (typeof page != 'number') {
+		page = parseInt(page);
+	}
+
+	if (page_size && typeof page_size != 'number') {
+		page_size = parseInt(page_size);
+	}
+
 	if (!page) {
 		throw new Error('A page number is required');
 	}

package/lib/app/helper_model/field_config.js

@@ -161,7 +161,7 @@ FieldConfig.setMethod(function getModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.5
+ * @version  1.2.7
  *
  * @return   {Field}
  */
@@ -178,7 +178,7 @@ FieldConfig.setMethod(function getFieldDefinition() {
 		let constructor = Classes.Alchemy.Field.Field.getMember(this.options.type);
 
 		if (constructor) {
-			result = new constructor(null, this.name);
+			result = new constructor(null, this.name, this.options);
 		}
 	}
 

package/lib/app/helper_model/model.js

@@ -188,7 +188,7 @@ Model.prepareStaticProperty('Document', function getDocumentClass() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {String}   model_name
  * @param    {Boolean}  allow_create
@@ -237,8 +237,9 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 
 			if (config && config.super) {
 				config = {
-					parent      : config.super.name,
-					primary_key : config.prototype.primary_key
+					parent        : config.super.name,
+					primary_key   : config.prototype.primary_key,
+					display_field : config.prototype.display_field,
 				};
 			}
 		}
@@ -252,8 +253,14 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 
 		ModelClass.setProperty('$model_name', model_name);
 
-		if (config && config.primary_key) {
-			ModelClass.setProperty('primary_key', config.primary_key);
+		if (config) {
+			if (config.primary_key) {
+				ModelClass.setProperty('primary_key', config.primary_key);
+			}
+
+			if (config.display_field) {
+				ModelClass.setProperty('display_field', config.display_field);
+			}
 		}
 
 		if (Blast.isBrowser) {
@@ -414,6 +421,66 @@ Model.setMethod(function getFindOptions(options) {
 	return Object.assign({}, def_options, options);
 });
 
+
+/**
+ * Get the title to display for this record
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.0.1
+ * @version  1.2.7
+ *
+ * @param    {Object}        item       The record item of this model
+ * @param    {String|Array}  fallbacks  Extra fallbacks to use
+ * 
+ * @return   {String}        The display title to use
+ */
+Model.setMethod(function getDisplayTitle(item, fallbacks) {
+
+	if (!item) {
+		return 'Undefined item';
+	}
+
+	let main;
+
+	if (item[this.modelName]) {
+		main = item[this.modelName];
+	} else {
+		main = item;
+	}
+
+	if (!main) {
+		return 'Undefined item';
+	}
+
+	let field,
+	    val,
+	    i;
+
+	let fields = Array.cast(this.display_field);
+
+	if (fallbacks) {
+		fields = fields.concat(fallbacks);
+	}
+
+	for (i = 0; i < fields.length; i++) {
+		val = main[fields[i]];
+
+		if (Object.isObject(val)) {
+			field = this.getField(fields[i]);
+
+			if (field && field.isTranslatable) {
+				val = alchemy.pickTranslation(this.conduit, val).result;
+			}
+		}
+
+		if (val && typeof val == 'string') {
+			return val;
+		}
+	}
+
+	return main[this.primary_key] || '';
+});
+
 /**
  * Return association configuration
  *

package/lib/class/conduit.js

@@ -2277,6 +2277,23 @@ Conduit.setMethod(function session(name, value) {
 	this.sessionData[name] = value;
 });
 
+/**
+ * Get a route URL
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.7
+ * @version  1.2.7
+ *
+ * @param    {String}   name
+ * @param    {Object}   parameters
+ * @param    {Object}   options
+ *
+ * @return   {String}
+ */
+Conduit.setMethod(function routeUrl(name, parameters, options) {
+	return this.renderer.helpers.Router.routeUrl(name, parameters, options);
+});
+
 /**
  * Get a parameter from the route
  *

package/lib/class/document.js

@@ -300,7 +300,7 @@ Document.setProperty(function $model() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.3.3
- * @version  1.0.3
+ * @version  1.2.7
  */
 Document.setProperty(function conduit() {
 	if (this.$conduit) {
@@ -314,6 +314,10 @@ Document.setProperty(function conduit() {
 	}
 }, function setConduit(conduit) {
 	this.$conduit = conduit;
+
+	if (this.$options.model) {
+		this.$options.model.conduit = conduit;
+	}
 });
 
 /**
@@ -384,9 +388,9 @@ Document.setMethod(function toDry() {
 /**
  * Simplify the object for Hawkejs
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.2.7
  *
  * @param    {WeakMap}   wm
  *
@@ -410,7 +414,7 @@ Document.setMethod(function toHawkejs(wm) {
 	record = JSON.clone(this.$record, 'toHawkejs', wm);
 
 	// Sometimes we get an EMPTY $record value,
-	// this is probably because it's already in the process of being clones
+	// this is probably because it's already in the process of being cloned
 	if (!Object.isEmpty(record)) {
 		// Get clean options
 		let options = JSON.clone(this.getCleanOptions(), 'toHawkejs', wm);
@@ -425,6 +429,16 @@ Document.setMethod(function toHawkejs(wm) {
 		result.$_hold = JSON.clone(this.$_hold, 'toHawkejs', wm);
 	}
 
+	const conduit = this.conduit;
+
+	if (conduit) {
+		result.conduit = conduit;
+
+		if (result.$options?.model) {
+			result.$options.model.conduit = conduit;
+		}
+	}
+
 	return result;
 });
 

package/lib/class/inode_file.js

@@ -39,29 +39,53 @@ File.setProperty('is_file', true);
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.2.0
+ * @version  1.2.7
  */
 File.setStatic(function from(obj) {
 
-	let path;
+	if (!obj) {
+		return;
+	}
+
+	let path,
+	    name,
+	    type,
+	    hash,
+		size;
 
 	if (typeof obj == 'string') {
 		path = obj;
-		obj = null;
+	} else if (obj.originalFilename) {
+		// Formidable 2.0
+		path = obj.filepath;
+		name = obj.originalFilename;
+		type = obj.mimetype;
+		hash = obj.hash;
+		size = obj.size;
 	} else {
 		path = obj.path;
+		name = obj.name;
+		type = obj.type;
+		hash = obj.hash;
+		size = obj.size;
 	}
 
 	let file = new File(path);
 
-	if (obj) {
-		file.stat = {
-			size : obj.size
-		};
+	if (size != null) {
+		file.stat = {size};
+	}
+
+	if (name != null) {
+		file.name = name;
+	}
+
+	if (type != null) {
+		file.type = type;
+	}
 
-		file.name = obj.name;
-		file.type = obj.type;
-		file.hash = obj.hash;
+	if (hash != null) {
+		file.hash = hash;
 	}
 
 	return file;

package/lib/class/model.js

@@ -201,6 +201,7 @@ Model.staticCompose('schema', function createSchema(doNext) {
 
 Model.setDeprecatedProperty('modelName', 'model_name');
 Model.setDeprecatedProperty('blueprint', 'schema');
+Model.setDeprecatedProperty('displayField', 'display_field');
 
 /**
  * The default database config to use
@@ -214,7 +215,7 @@ Model.setProperty('dbConfig', 'default');
  *
  * @type {String}
  */
-Model.setProperty('displayField', 'title');
+Model.setProperty('display_field', 'title');
 
 /**
  * Translate is on by default
@@ -506,16 +507,17 @@ Model.setStatic(function getField(name) {
  * Get the model's public configuration
  * (This is used to create the client-side Model instances)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.7
  */
 Model.setStatic(function getClientConfig() {
 
-	var result = {
-		name        : this.model_name,
-		schema      : this.schema,
-		primary_key : this.prototype.primary_key
+	const result = {
+		name          : this.model_name,
+		schema        : this.schema,
+		primary_key   : this.prototype.primary_key,
+		display_field : this.prototype.display_field,
 	};
 
 	if (this.super.name != 'Model') {
@@ -641,7 +643,7 @@ Model.setMethod(function aggregate(pipeline, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.6
+ * @version  1.2.7
  *
  * @param    {Array}    items
  * @param    {Object}   options   Optional options object
@@ -686,9 +688,15 @@ Model.setMethod(function translateItems(items, options, callback) {
 	// Get the (optional) attached conduit
 	let conduit = this.conduit;
 
+	// Should we use fallback translations?
+	const allow_fallbacks = options.allow_fallback_translations ?? alchemy.settings.allow_fallback_translations ?? false;
+
+	let use_predefined_prefixes = false;
+
 	// If prefixes are given as an option, only use those
 	if (options.prefixes) {
 		prefix = options.prefixes;
+		use_predefined_prefixes = true;
 	} else {
 		// Possible prefixes
 		prefix = [];
@@ -698,14 +706,22 @@ Model.setMethod(function translateItems(items, options, callback) {
 			prefix.include(options.locale);
 		}
 
-		// Append the visited prefix after that (if there is one)
-		if (conduit && conduit.prefix) {
-			prefix.include(conduit.prefix);
-		}
+		if (conduit) {
+
+			// Append the visited prefix after that (if there is one)
+			if (conduit.prefix) {
+				prefix.include(conduit.prefix);
+			}
+
+			// Add the active prefix
+			if (conduit.active_prefix) {
+				prefix.include(conduit.active_prefix);
+			}
 
-		// Append all the allowed locales after that
-		if (conduit && conduit.locales) {
-			prefix.include(conduit.locales);
+			// Append all the allowed locales after that
+			if (conduit.locales) {
+				prefix.include(conduit.locales);
+			}
 		}
 
 		// Add all available prefixes last
@@ -718,8 +734,15 @@ Model.setMethod(function translateItems(items, options, callback) {
 
 		// @DEPRECATED: empty keys should no longer be allowed
 		prefix.push('');
+
+		if (!allow_fallbacks) {
+			prefix = [prefix[0]];
+		}
 	}
 
+	// Deduplicate the prefixes
+	prefix = Array.from(new Set(prefix));
+
 	for (i = 0; i < items.length; i++) {
 		item = items[i];
 
@@ -743,6 +766,10 @@ Model.setMethod(function translateItems(items, options, callback) {
 			prefixes.unshift(items.item_prefixes[i]);
 		}
 
+		if (!allow_fallbacks && !use_predefined_prefixes) {
+			prefixes = [prefixes[0]];
+		}
+
 		let field;
 
 		for (j = 0; j < collection.length; j++) {
@@ -1147,65 +1174,6 @@ Model.setMethod(function processDatasourceFormat(ds_data, options, callback) {
 	return pledge;
 });
 
-/**
- * Get the title to display for this record
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.0.1
- * @version  0.1.0
- *
- * @param    {Object}        item       The record item of this model
- * @param    {String|Array}  fallbacks  Extra fallbacks to use
- * 
- * @return   {String}        The display title to use
- */
-Model.setMethod(function getDisplayTitle(item, fallbacks) {
-
-	var fields,
-	    field,
-	    main,
-	    val,
-	    i;
-
-	if (!item) {
-		return 'Undefined item';
-	}
-
-	if (item[this.modelName]) {
-		main = item[this.modelName];
-	} else {
-		main = item;
-	}
-
-	if (!main) {
-		return 'Undefined item';
-	}
-
-	fields = Array.cast(this.displayField);
-
-	if (fallbacks) {
-		fields = fields.concat(fallbacks);
-	}
-
-	for (i = 0; i < fields.length; i++) {
-		val = main[fields[i]];
-
-		if (Object.isObject(val)) {
-			field = this.getField(fields[i]);
-
-			if (field && field.isTranslatable) {
-				val = alchemy.pickTranslation(this.conduit, val).result;
-			}
-		}
-
-		if (val && typeof val == 'string') {
-			return val;
-		}
-	}
-
-	return main[this.primary_key] || '';
-});
-
 /**
  * Clear the cache of this and all associated models
  *

package/lib/class/router.js

@@ -1145,9 +1145,9 @@ RouterClass.setMethod(function getOptions(result) {
 /**
  * Get an object of all the routes in this router and its children
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1190,7 +1190,10 @@ RouterClass.setMethod(function getRoutes(result) {
 			controller                 : route.controller,
 			action                     : route.action,
 			keys                       : route.keys,
-			has_breadcrumb_assignments : route.has_breadcrumb_assignments
+			has_breadcrumb_assignments : route.has_breadcrumb_assignments || undefined,
+			methods                    : route.methods,
+			permission                 : route.permission || undefined,
+			has_permission_assignments : route.has_permission_assignments || undefined,
 		};
 	}
 

package/lib/core/base.js

@@ -179,24 +179,6 @@ Base.setStatic(function createClassTitle(suggested_root) {
 	return suggested_root.titleize();
 });
 
-/**
- * Make this an abstract class
- *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    1.0.0
- * @version  1.0.0
- *
- * @param    {Boolean}   value
- */
-Base.setStatic(function makeAbstractClass(value) {
-
-	if (value == null) {
-		value = true;
-	}
-
-	this.setStatic('is_abstract_class', value, false);
-});
-
 /**
  * Make this start a new group
  *

package/lib/core/client_alchemy.js

@@ -403,8 +403,6 @@ Alchemy.setMethod(function checksum(value) {
  */
 Alchemy.setMethod(function markLinkElement(element, active_nr) {
 
-	var mark_wrapper;
-
 	// Always remove the current classes
 	element.classList.remove('active-link');
 	element.classList.remove('active-sublink');
@@ -424,6 +422,30 @@ Alchemy.setMethod(function markLinkElement(element, active_nr) {
 	}
 });
 
+/**
+ * Get the configuration for the given route
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.2.7
+ * @version   1.2.7
+ *
+ * @param     {String}   name         The route name
+ *
+ * @return    {Object}
+ */
+Alchemy.setMethod(function routeConfig(name) {
+
+	let result;
+
+	if (Blast.isNode) {
+		result = Classes.Alchemy.Helper.Router.prototype.routeConfig.call({}, name);
+	} else {
+		result = hawkejs.scene.general_renderer.helpers.Router.routeConfig(name);
+	}
+
+	return result;
+});
+
 const markLinkElement = Alchemy.prototype.markLinkElement;
 
 // From here on, only client-side code is added
@@ -1112,4 +1134,28 @@ Alchemy.setMethod(function createSchema(parent) {
  */
 Alchemy.setMethod(function getClientModel(name, init, options) {
 	return Classes.Alchemy.Client.Base.prototype.getModel.call(this, name, init, options);
+});
+
+/**
+ * Check if the current client-side user has a certain permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.7
+ * @version  1.2.7
+ *
+ * @param   {String}   permission
+ *
+ * @return  {Boolean}
+ */
+Alchemy.setMethod(function hasPermission(permission) {
+
+	let user_data = hawkejs.scene.exposed['acl-user-data'];
+
+	if (user_data && user_data.permissions) {
+		if (user_data.permissions.hasPermission?.(permission)) {
+			return true;
+		}
+	}
+
+	return false;
 });

package/lib/core/middleware.js

@@ -128,7 +128,7 @@ function getMiddlePaths(paths, ext, new_ext) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.5.0
+ * @version  1.2.7
  */
 Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
 
@@ -243,7 +243,7 @@ Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
 		}
 
 		if (!compiled || !compiled.path) {
-			return req.conduit.notFound();
+			return nextMiddleware();
 		}
 
 		return req.conduit.serveFile(compiled.path, {onError: function onError(err) {
@@ -306,7 +306,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.4
+ * @version  1.2.7
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -414,6 +414,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 				compress: {
 					keep_fargs   : true,
 					keep_fnames  : true,
+					keep_classnames : true,
 					hoist_funs   : false,
 					drop_console : !alchemy.settings.debug,
 					dead_code    : true,
@@ -423,7 +424,8 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 					}
 				},
 				mangle: {
-					keep_fnames  : true
+					keep_fnames     : true,
+					keep_classnames : true,
 				}
 			};
 

package/lib/init/alchemy.js

@@ -216,7 +216,7 @@ Alchemy.setProperty(function environment() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.5.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {Object}   options
  */
@@ -257,6 +257,8 @@ Alchemy.setMethod(function startJaneway(options) {
 		// Don't mess with the indentation
 		options.change_indent = false;
 
+		options.extra_output = out;
+
 		this.on('janeway_propose_geometry', function onProposeGeometry(data) {
 			out.columns = data.cols || data.width;
 			out.rows = data.rows || data.height;
@@ -268,7 +270,7 @@ Alchemy.setMethod(function startJaneway(options) {
 		});
 
 		this.on('janeway_redraw', function onRedrawRequest() {
-			that.Janeway.redraw();
+			that.Janeway.reloadScreen();
 		});
 	}
 
@@ -877,7 +879,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.2
+ * @version  1.2.7
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -953,24 +955,47 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 			internal = false;
 
 			let last_piece = moduleName.split(libpath.sep).last(),
-			    package_path;
+			    package_path,
+				package_base;
 			
 			let module_dir = libpath.dirname(module_path);
 			result.module_dir = module_dir;
 
 			// If the path doesn't end with the module name, look for it
 			if (!module_path.endsWith(last_piece)) {
-				package_path = module_path.beforeLast(last_piece) + last_piece;
-				package_path = libpath.resolve(package_path, 'package.json');
+				package_base = (module_path.beforeLast(last_piece) + last_piece).split(libpath.sep);
 			} else {
-				package_path = libpath.resolve(module_dir, 'package.json');
-			}	
+				package_base = module_dir.split(libpath.sep);
+			}
+
+			//package_path = libpath.resolve(package_path, 'package.json');
+
+			while (package_base.length) {
+
+				package_path = libpath.resolve(package_base.join(libpath.sep), 'package.json');
+
+				try {
+					package_json = require(package_path);
+				} catch (err) {
+					package_json = false;
+				}
 
-			try {
-				package_json = require(package_path);
-			} catch (err) {
-				package_json = false;
+				if (package_json) {
+					if (package_json.name != moduleName) {
+						package_json = false;
+					}
+
+					break;
+				}
+
+				package_base.pop();
 			}
+
+			if (package_json) {
+				module_dir = package_base.join(libpath.sep);
+				result.module_dir = module_dir;
+			}
+
 		} else {
 			internal = true;
 			package_json = {
@@ -1357,7 +1382,7 @@ Alchemy.setMethod(function addAppcacheEntry(entry) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.2.6
+ * @version  1.2.7
  *
  * @param    {IncomingMessage}   req
  * @param    {OutgoingMessage}   res       Optional
@@ -1383,10 +1408,10 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	// Multipart data is handled by "formidable"
 	if (req.headers['content-type'] && req.headers['content-type'].startsWith('multipart/form-data')) {
 
-		let form = new formidable.IncomingForm({multiples: true});
-
-		// md5 hash by default
-		form.hash = 'md5';
+		let form = new formidable.IncomingForm({
+			multiples     : true,
+			hashAlgorithm : 'md5',
+		});
 
 		form.parse(req, function parsedMultipart(err, form_fields, form_files) {
 

package/lib/stages.js

@@ -120,11 +120,19 @@ alchemy.sputnik.add(function datasources() {
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.0.1
- * @version       1.1.0
+ * @version       1.2.7
  */
 alchemy.sputnik.add(function plugins() {
 	// Load in the plugins
-	alchemy.startPlugins();
+	try {
+		alchemy.startPlugins();
+	} catch (err) {
+		// Constitutors sometimes throw errors during this stage.
+		// Not sure yet why they don't get caught by sputnik
+		// @TODO: refactor!
+		log.error('Caught error during "plugins" stage:', err);
+		throw err;
+	}
 });
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.2.6",
+	"version": "1.2.7",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~2.0.1",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.2.10",
+		"hawkejs"          : "~2.2.18",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.7.21",
+		"protoblast"       : "~0.7.24",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",
@@ -45,7 +45,7 @@
 		"index.js"
 	],
 	"optionalDependencies": {
-		"janeway"          : "~0.3.5",
+		"janeway"          : "~0.3.6",
 		"less"             : "~4.1.1",
 		"sass"             : "~1.53.0",
 		"sass-embedded"    : "~1.53.0",