alchemymvc 1.2.4 → 1.2.5

package/lib/app/helper/router_helper.js

@@ -29,14 +29,19 @@ var Route = Function.inherits('Alchemy.Helper.Router', function Route(renderer)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @type     {RURL}
  */
 Router.setProperty(function current_url() {
-	if (this.view && this.view.variables && this.view.variables.__url) {
-		return this.view.variables.__url.clone();
+	if (this.view_render?.variables?.__url) {
+		return this.view_render.variables.__url.clone();
 	} else if (Blast.isBrowser) {
+
+		if (hawkejs?.scene?.opening_url?.url) {
+			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
+		}
+
 		return Blast.Classes.RURL.parse(window.location);
 	}
 });
@@ -580,6 +585,129 @@ Router.setMethod(function getAnchor(name, parameters, options) {
 	return anchor;
 });
 
+/**
+ * Get the current route variables
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @return   {Object}
+ */
+Router.setMethod(function getRouteVariables() {
+
+	let params,
+	    route,
+	    url;
+	
+	if (this.view_render?.variables?.__route) {
+		route = this.view_render.variables.__route;
+		params = this.view_render.variables.__urlparams;
+		url = this.view_render.variables.__url;
+	} else if (Blast.isBrowser) {
+		route = alchemy.current_route;
+		params = alchemy.current_url_params;
+		url = alchemy.current_url;
+	}
+
+	return {route, params, url};
+});
+
+/**
+ * Update language switcher info
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Element}   element    The element to apply to
+ */
+Router.setMethod(function updateLanguageSwitcher(element) {
+
+	let language = element.getAttribute('data-alchemy-language-switch');
+
+	if (!language) {
+		return;
+	}
+
+	let url = this.translateCurrentRoute(language);
+
+	if (!url) {
+		url = '/' + language;
+	}
+
+	element.setAttribute('href', url);
+});
+
+/**
+ * Get a translated URL for the current route
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}   prefix    The prefix to use
+ */
+Router.setMethod(function translateCurrentRoute(prefix) {
+
+	let info = this.getRouteVariables();
+
+	if (!info.route) {
+		return;
+	}
+
+	let config = this.routeConfig(info.route);
+
+	if (!config) {
+		return;
+	}
+
+	// Get the url string
+	let url = this.routeUrl(info.route, info.params, {locale: prefix});
+
+	// Turn it into an RURL object
+	url = RURL.parse(url);
+
+	if (url && url.pathname == '/') {
+		url.pathname = '/' + prefix + url.pathname;
+	}
+
+	// Add the get queries
+	if (info.url && info.url.search) {
+		for (key in info.url.query) {
+
+			if (key == 'hajax' || key == 'h_diversion' || key == 'htop') {
+				continue;
+			}
+
+			url.addQuery(key, info.url.query[key]);
+		}
+	}
+
+	return url;
+});
+
+/**
+ * Turn the given element into a language switcher
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Element}   element    The element to apply to
+ * @param    {String}    language   The actual language
+ * @param    {Object}    options
+ */
+Router.setMethod(function languageSwitcherDirective(element, language, options) {
+
+	element.setAttribute('hreflang', language);
+	element.setAttribute('data-he-link', 'false');
+	element.setAttribute('data-alchemy-language-switch', language);
+	element.setAttribute('rel', 'nofollow');
+
+	this.updateLanguageSwitcher(element);
+});
+
 /**
  * The switch language element
  *
@@ -589,6 +717,10 @@ Router.setMethod(function getAnchor(name, parameters, options) {
  */
 Router.setMethod(function languageSwitcher(options) {
 
+	if (arguments.length == 3) {
+		return this.languageSwitcherDirective(...arguments);
+	}
+
 	var prefixes = this.view.expose('prefixes'),
 	    prefix,
 	    config,

package/lib/app/helper_component/paginate_component.js

@@ -15,7 +15,7 @@ const Paginate = Function.inherits('Alchemy.Client.Component', 'Paginate');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.2.2
+ * @version  1.2.5
  *
  * @param   {Model}     model
  * @param   {Criteria}  criteria
@@ -26,6 +26,8 @@ Paginate.setMethod(function find(model, criteria) {
 
 	const conduit = this.controller.conduit;
 
+	criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria);
+
 	// Get the model if a name has been given
 	if (typeof model == 'string') {
 		model = this.getModel(model);

package/lib/app/helper_controller/conduit.js

@@ -405,6 +405,26 @@ Conduit.setMethod(function chooseBestLocale(locales) {
 	return 'en';
 });
 
+/**
+ * Check if this request has a permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}    permission
+ *
+ * @return   {Boolean}   True if the user has the permission, false otherwise
+ */
+Conduit.setMethod(function hasPermission(permission) {
+
+	if (alchemy.permission_checker != null) {
+		return alchemy.permission_checker.conduitHasPermission(this, permission);
+	}
+
+	return false;
+});
+
 if (Blast.isNode) {
 	return;
 }

package/lib/app/helper_model/criteria.js

@@ -53,6 +53,31 @@ Criteria.setStatic(function isCriteria(instance) {
 	return false;
 });
 
+/**
+ * Make sure to get a criteria
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Object}   obj
+ *
+ * @return   {Criteria}
+ */
+Criteria.setStatic(function cast(obj) {
+
+	if (Criteria.isCriteria(obj)) {
+		return obj;
+	}
+
+	let instance = new Criteria();
+
+	if (obj) {
+		instance.applyOldOptions(obj);
+	}
+
+	return instance;
+});
 
 /**
  * Undry the given object
@@ -81,7 +106,7 @@ Criteria.setStatic(function unDry(data) {
 	// Revive the group instance
 	criteria.group = Group.revive(data.group, criteria);
 
-	if(!data.options) {
+	if (!data.options) {
 		data.options = {};
 	}
 

package/lib/app/helper_model/document.js

@@ -305,7 +305,7 @@ Document.setStatic(function getDocumentClass(model) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.2.4
+ * @version  1.2.5
  *
  * @param    {Object}           obj
  * @param    {Boolean|String}   cloned
@@ -365,6 +365,7 @@ Document.setStatic(function unDry(obj, cloned) {
 			}
 
 			model.schema.addField(field.name, field.constructor.type_name, field.options);
+			model.constructor.Document.setFieldGetter(field.name);
 		}
 	}
 
@@ -638,9 +639,9 @@ Document.setMethod(function toDry() {
 /**
  * Actually initialize this instance
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.2.4
+ * @version  1.2.5
  *
  * @param    {Object}   record
  * @param    {Object}   options
@@ -680,9 +681,13 @@ Document.setMethod(function setDataRecord(record, options) {
 	// The original record
 	this.$record = record;
 
+	// @TODO: Find a cleaner way of setting these values
+	if (record[name].$translated_fields) {
+		this.$hold.translated_fields = record[name].$translated_fields;
+	}
+
 	if (Blast.isNode && this.constructor.namespace.indexOf('Alchemy.Document') == -1) {
-		let delete_field = false,
-		    added_private_field_info = false,
+		let delete_field,
 		    field,
 		    key;
 
@@ -696,20 +701,23 @@ Document.setMethod(function setDataRecord(record, options) {
 
 				if (options.keep_private_fields) {
 					delete_field = false;
-
-					if (!added_private_field_info) {
-						added_private_field_info = true;
-
-						let fields = this.$model.schema.getPrivateFields();
-						options.private_fields = JSON.clone(fields, 'toHawkejs');
-					}
 				}
+			} else {
+				delete_field = false;
 			}
 
 			if (delete_field) {
 				delete this.$main[key];
 			}
 		}
+
+		if (options?.keep_private_fields) {
+			let fields = this.$model.schema.getPrivateFields();
+
+			if (fields?.length) {
+				options.private_fields = JSON.clone(fields, 'toHawkejs');
+			}
+		}
 	}
 
 	// If this has object fields we need to clone the document already

package/lib/app/helper_model/field_config.js

@@ -131,7 +131,7 @@ FieldConfig.setMethod(function getContextModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.2
+ * @version  1.2.5
  */
 FieldConfig.setMethod(function getModel() {
 
@@ -142,13 +142,15 @@ FieldConfig.setMethod(function getModel() {
 	}
 
 	if (this.association) {
-		let config = model.getAssociation(this.association);
+		try {
+			let config = model.getAssociation(this.association);
 
-		if (config) {
-			model = alchemy.getModel(config.modelName);
-		} else {
-			model = null;
-		}
+			if (config) {
+				model = alchemy.getModel(config.modelName);
+			} else {
+				model = null;
+			}
+		} catch (ignored_error) {}
 	}
 
 	return model;
@@ -159,17 +161,28 @@ FieldConfig.setMethod(function getModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.2
+ * @version  1.2.5
+ *
+ * @return   {Field}
  */
 FieldConfig.setMethod(function getFieldDefinition() {
 
-	let model = this.getModel();
+	let model = this.getModel(),
+	    result;
 
-	if (!model) {
-		return;
+	if (model) {
+		result = model.getField(this.local_path);
 	}
 
-	return model.getField(this.local_path);
+	if (!result && this.options?.type) {
+		let constructor = Classes.Alchemy.Field.Field.getMember(this.options.type);
+
+		if (constructor) {
+			result = new constructor(null, this.name);
+		}
+	}
+
+	return result;
 });
 
 /**

package/lib/app/helper_model/field_set.js

@@ -65,7 +65,7 @@ FieldSet.setStatic(function fromArray(fields) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @type    {Deck}
  */
@@ -88,6 +88,14 @@ FieldSet.enforceProperty(function fields(new_value, old_value) {
 				};
 			}
 
+			if (!entry.options) {
+				entry.options = {};
+			}
+
+			if (entry.type) {
+				entry.options.type = entry.type;
+			}
+
 			field = new Classes.Alchemy.Criteria.FieldConfig(entry.name, entry.options);
 			deck.set(entry.name, field);
 		}
@@ -205,4 +213,17 @@ FieldSet.setMethod(function addField(name, options) {
 	this.fields.set(name, config);
 
 	return config;
+});
+
+/**
+ * Get a fieldconfig by its field name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @return   {Alchemy.Form.FieldConfig}
+ */
+FieldSet.setMethod(function get(name) {
+	return this.fields.get(name);
 });

package/lib/app/helper_model/model.js

@@ -32,7 +32,7 @@ if (Blast.isBrowser) {
  *
  * @param    {Object}   options
  */
-var Model = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Model', function Model(options) {
+const Model = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Model', function Model(options) {
 	this.init(options);
 });
 
@@ -49,6 +49,22 @@ Model.constitute(function setModelName() {
 	this.table = this.model_name.tableize();
 });
 
+/**
+ * Map these events to methods
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ */
+Model.mapEventToMethod({
+	saved          : 'afterSave',
+	finding        : 'beforeFind',
+	queried        : 'afterQuery',
+	associated     : 'afterAssociated',
+	found          : 'afterData',
+	foundDocuments : 'afterFind',
+});
+
 /**
  * Is the given action enabled on the server?
  *
@@ -485,7 +501,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -530,14 +546,10 @@ Model.setMethod(function find(type, criteria, callback) {
 		error = new TypeError('Find type should be a string');
 	}
 
-	if (!Blast.Classes.Alchemy.Criteria.Criteria.isCriteria(criteria)) {
-		try {
-			let options = criteria;
-			criteria = new Blast.Classes.Alchemy.Criteria();
-			criteria.applyOldOptions(options);
-		} catch (err) {
-			error = err;
-		}
+	try {
+		criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria);
+	} catch (err) {
+		error = err;
 	}
 
 	if (error != null) {

package/lib/class/conduit.js

@@ -5,6 +5,7 @@ var fileCache  = alchemy.shared('files.fileCache'),
     libua   = alchemy.use('useragent'),
     zlib    = alchemy.use('zlib'),
     BODY    = Symbol('body'),
+	TESTED_ROUTES = Symbol('tested_routes'),
     magic,
     fs = alchemy.use('fs'),
     prefixes = alchemy.shared('Routing.prefixes');
@@ -265,6 +266,62 @@ Conduit.setMethod(function setRequestBody(body) {
 	Object.assign(this.body, body);
 });
 
+/**
+ * Has the given route been tested yet?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Route}
+ */
+Conduit.setMethod(function hasRouteBeenTested(route) {
+
+	if (!route || !this[TESTED_ROUTES]) {
+		return false;
+	}
+
+	return this[TESTED_ROUTES].has(route);
+});
+
+/**
+ * Mark this route as having been tested
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Route}
+ */
+Conduit.setMethod(function markRouteAsTested(route) {
+
+	if (!this[TESTED_ROUTES]) {
+		this[TESTED_ROUTES] = new Set();
+	}
+
+	this[TESTED_ROUTES].add(route);
+});
+
+/**
+ * Rewrite a certain URL parameter
+ * (Causing some kind of redirect)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}   route_param
+ * @param    {*}        new_value
+ */
+Conduit.setMethod(function rewriteRequestRouteParam(route_param, new_value) {
+
+	if (!this.rewritten_request_route_param) {
+		this.rewritten_request_route_param = {};
+	}
+
+	this.rewritten_request_route_param[route_param] = new_value;
+});
+
 /**
  * Set the request files
  *
@@ -426,7 +483,7 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.2.5
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -457,6 +514,12 @@ Conduit.setMethod(async function parseRequest() {
 		this.encrypted = this.request.connection.encrypted;
 	}
 
+	if (this.rewritten_request_route_param) {
+		let params = Object.assign({}, this.route_string_parameters, this.rewritten_request_route_param);
+		let new_url = this.route.generateUrl(params, this);
+		this.overrideResponseUrl(new_url);
+	}
+
 	// If the url has already been parsed, return early
 	if (this.url) {
 		return;
@@ -1170,7 +1233,7 @@ Conduit.setMethod(function callHandler() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String|Object}   options   Options or url
  */
@@ -1214,11 +1277,27 @@ Conduit.setMethod(function postpone(options) {
 	// Nullify the response
 	this.response = null;
 
-	let old_url = String(this.url);
-
 	// Set the original url
-	this.setHeader('x-history-url', old_url);
-	this.expose('redirected_to', old_url);
+	this.overrideResponseUrl(this.url)
+});
+
+/**
+ * Set the response url
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|RURL}   url
+ */
+Conduit.setMethod(function overrideResponseUrl(url) {
+
+	if (typeof url != 'string') {
+		url = String(url);
+	}
+
+	this.setHeader('x-history-url', url);
+	this.expose('redirected_to', url);
 });
 
 /**
@@ -1226,7 +1305,7 @@ Conduit.setMethod(function postpone(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
  * @param    {String|Object}   options   Options or url
@@ -1283,8 +1362,7 @@ Conduit.setMethod(function redirect(status, options) {
 				}
 
 				// Register the new url as the one to use for the history
-				this.setHeader('x-history-url', url);
-				this.expose('redirected_to', url);
+				this.overrideResponseUrl(url);
 
 				this.original_path = url;
 

package/lib/class/element.js

@@ -21,21 +21,12 @@ Function.getNamespace('Alchemy.Element').setStatic('default_element_prefix', 'al
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.2.1
+ * @version  1.2.5
  *
  * @return  {RURL}
  */
 Element.setMethod(function getCurrentUrl() {
-	if (Blast.isBrowser) {
-
-		if (hawkejs.scene.opening_url && hawkejs.scene.opening_url.url) {
-			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
-		}
-		
-		return Blast.Classes.RURL.parse(window.location);
-	} else if (this.hawkejs_renderer && this.hawkejs_renderer.variables && this.hawkejs_renderer.variables.__url) {
-		return this.hawkejs_renderer.variables.__url.clone();
-	}
+	return this.hawkejs_renderer?.helpers?.Router?.current_url;
 });
 
 /**

package/lib/class/field.js

@@ -1049,7 +1049,7 @@ Field.setMethod(function getRules() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.4
- * @version  1.1.4
+ * @version  1.2.5
  */
 Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 
@@ -1058,4 +1058,10 @@ Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 	// Use the final result, if we found something or not
 	record[this.name] = found.result;
 	record['_prefix_' + this.name] = found.prefix;
+
+	if (!record.$translated_fields) {
+		record.$translated_fields = {};
+	}
+
+	record.$translated_fields[this.name] = found.prefix;
 });