alchemymvc 1.2.8 → 1.3.1

package/lib/app/behaviour/sluggable_behaviour.js

@@ -79,7 +79,7 @@ Sluggable.setStatic(function getSource(source, schema) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.0
  *
  * @param    {Schema}    schema
  * @param    {Object}    options
@@ -113,7 +113,9 @@ Sluggable.setStatic(function attached(schema, new_options) {
 	// Create the target if it doesn't exist yet
 	if (!target) {
 
-		field_options = {};
+		field_options = {
+			description: 'A human-readable yet unique identifier'
+		};
 
 		// See if the target field we're adding needs to be translatable
 		if (options.translatable || (options.translatable == null && source && source.is_translatable)) {

package/lib/app/conduit/http_conduit.js

@@ -105,9 +105,9 @@ HttpConduit.enforceProperty(function fingerprint() {
 /**
  * Init
  *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.3.3
- * @version  1.2.0
+ * @version  1.3.1
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -139,6 +139,11 @@ HttpConduit.setMethod(async function initHttp(req, res, router) {
 
 	this.debugMark(false);
 
+	if (this.shouldBePostponed()) {
+		this.postponeAndQueue();
+		return;
+	}
+
 	// Call the middleware, which will call the handler afterwards
 	this.callMiddleware();
 });

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.2.7
+ * @version  1.3.0
  *
  * @param    {Object}      options
  * @param    {Function}    callback
@@ -165,7 +165,7 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 	}
 
 	if (options.params) {
-		this.params = options.params;
+		this.setRouteParameters(options.params);
 	}
 
 	if (options.arguments) {

package/lib/app/conduit/socket_conduit.js

@@ -102,19 +102,34 @@ var SocketConduit = Function.inherits('Alchemy.Conduit', function Socket(socket,
 /**
  * Return the client IP address
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.1
- * @version  0.2.1
+ * @version  1.3.1
  */
 SocketConduit.setProperty(function ip() {
 
-	var sock = this.socket;
+	let handshake = this.socket?.handshake;
 
-	if (!sock) {
+	if (!handshake) {
 		return null;
 	}
 
-	return sock.conn.remoteAddress || null;
+	if (handshake.headers) {
+		let forwarded_for = handshake.headers['x-forwarded-for'] || handshake.headers['x-real-ip'];
+
+		if (forwarded_for) {
+
+			// Forwarded for can contain multiple ip addresses,
+			// return the first one
+			if (forwarded_for.indexOf(',') > -1) {
+				forwarded_for = forwarded_for.before(',');
+			}
+
+			return forwarded_for;
+		}
+	}
+
+	return handshake.address || null;
 });
 
 /**

package/lib/app/controller/alchemy_info_controller.js

@@ -130,20 +130,16 @@ Info.setAction(async function appcache(conduit) {
  *
  * @author   Jelle De Loecker       <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.1
  */
 Info.setAction(function postponed(conduit, id) {
 
 	var session = conduit.getSession(),
-	    postponed_conduit = session.postponed.get(id);
+	    postponement = session.getPostponement(id);
 
-	if (!postponed_conduit) {
+	if (!postponement) {
 		return conduit.notFound();
 	}
 
-	postponed_conduit.response = conduit.response;
-
-	postponed_conduit._end(...postponed_conduit._end_arguments);
-
-	session.postponed.remove(id);
+	postponement.handleRequest(conduit);
 });

package/lib/app/helper/backed_map.js

@@ -77,12 +77,12 @@ Backed.enforceProperty(function backing(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.1
- * @version  1.2.1
+ * @version  1.3.1
  *
  * @return   {Backed}
  */
 Backed.setMethod(function clone() {
-	let result = new Backed(this.backing);
+	let result = new this.constructor(this.backing);
 	result.local = new Map(this.local);
 	return result;
 });

package/lib/app/helper/router_helper.js

@@ -46,12 +46,49 @@ Router.setProperty(function current_url() {
 	}
 });
 
+/**
+ * Check if the given URL is a local one
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @param    {String|RURL}    url
+ *
+ * @return   {Boolean}
+ */
+Router.setMethod(function isLocalUrl(url) {
+
+	url = RURL.parse(url);
+
+	if (!url.hostname) {
+		return true;
+	}
+
+	if (Blast.isNode && alchemy.settings.url) {
+		// @TODO: Would be nice to not have to parse this every time
+		let server_url = RURL.parse(alchemy.settings.url);
+
+		if (server_url.hostname == url.hostname) {
+			return true;
+		}
+	}
+
+	let current_url = this.current_url;
+
+	if (current_url && current_url.hostname == url.hostname) {
+		return true;
+	}
+
+	return false;
+});
+
 /**
  * Apply directive to an element
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.2.7
+ * @version  1.3.1
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    name       The route name
@@ -83,14 +120,23 @@ Router.setMethod(function applyDirective(element, name, options) {
 	if (config.keys && config.keys.length) {
 
 		let key,
-		    val,
-		    i;
+		    val;
 
-		for (i = 0; i < config.keys.length; i++) {
-			key = config.keys[i];
+		for (key of config.keys) {
 
 			if (params[key] == null) {
-				if ((val = element['route_' + key]) == null) {
+
+				val = element['route_' + key];
+
+				if (val == null) {
+					let variables = element[Hawkejs.VARIABLES];
+
+					if (variables) {
+						val = variables[key];
+					}
+				}
+
+				if (val == null) {
 					val = element[key];
 				}
 
@@ -284,14 +330,14 @@ Router.setMethod(function routeConfig(name, socket_route) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.1
+ * @version  1.3.0
  *
  * @param    {String}   name
  * @param    {Object}   parameters
  *
  * @return   {RURL}
  */
-Router.setMethod(function routeUrl(name, _parameters, options) {
+Router.setMethod(function routeUrl(name, parameters, options) {
 
 	var parameters,
 	    base_url,
@@ -307,10 +353,9 @@ Router.setMethod(function routeUrl(name, _parameters, options) {
 
 	url = '';
 	config = options.config || this.routeConfig(name);
-	parameters = Blast.Bound.Object.assign({}, _parameters);
 
-	if (options.locale) {
-		locales = [options.locale];
+	if (options.locale || options.prefix) {
+		locales = [options.prefix || options.locale];
 	} else if (options.locales) {
 		locales = options.locales;
 	} else if (this.view) {
@@ -393,11 +438,24 @@ Router.setMethod(function routeUrl(name, _parameters, options) {
 	}
 
 	if (options.full || options.absolute) {
-		base_url = this.view.internal('url') || RURL.parse(window.location);
-		url.protocol = base_url.protocol;
-		url.host = base_url.host;
-		url.hostname = base_url.hostname;
-		url.port = base_url.port;
+		if (this.view) {
+			base_url = this.view.internal('url');
+		}
+
+		if (!base_url) {
+			if (Blast.isBrowser) {
+				base_url = RURL.parse(window.location);
+			} else {
+				base_url = RURL.parse(alchemy.settings.url);
+			}
+		}
+
+		if (base_url) {
+			url.protocol = base_url.protocol;
+			url.host = base_url.host;
+			url.hostname = base_url.hostname;
+			url.port = base_url.port;
+		}
 	}
 
 	url._locales = locales;
@@ -631,11 +689,12 @@ Router.setMethod(function getRouteVariables() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {Element}   element    The element to apply to
+ * @param    {Object}    variables
  */
-Router.setMethod(function updateLanguageSwitcher(element) {
+Router.setMethod(function updateLanguageSwitcher(element, variables) {
 
 	let language = element.getAttribute('data-alchemy-language-switch');
 
@@ -643,7 +702,7 @@ Router.setMethod(function updateLanguageSwitcher(element) {
 		return;
 	}
 
-	let url = this.translateCurrentRoute(language);
+	let url = this.translateCurrentRoute(language, variables);
 
 	if (!url) {
 		url = '/' + language;
@@ -657,11 +716,21 @@ Router.setMethod(function updateLanguageSwitcher(element) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {String}   prefix    The prefix to use
+ * @param    {Object}   variables
  */
-Router.setMethod(function translateCurrentRoute(prefix) {
+Router.setMethod(function translateCurrentRoute(prefix, variables) {
+
+	let current_route_translations = variables?.__current_route_translations,
+	    current_route_translation = current_route_translations?.[prefix] ?? null;
+	
+	if (current_route_translation) {
+		return current_route_translation;
+	} else if (current_route_translation === false) {
+		return false;
+	}
 
 	let info = this.getRouteVariables();
 
@@ -685,6 +754,11 @@ Router.setMethod(function translateCurrentRoute(prefix) {
 		url.pathname = '/' + prefix + url.pathname;
 	}
 
+	// Don't return urls with missing parameters
+	if (url.pathname.indexOf('{') > -1) {
+		return false;
+	}
+
 	// Add the get queries
 	if (info.url && info.url.search) {
 		for (key in info.url.query) {
@@ -705,7 +779,7 @@ Router.setMethod(function translateCurrentRoute(prefix) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    language   The actual language
@@ -718,7 +792,7 @@ Router.setMethod(function languageSwitcherDirective(element, language, options)
 	element.setAttribute('data-alchemy-language-switch', language);
 	element.setAttribute('rel', 'nofollow');
 
-	this.updateLanguageSwitcher(element);
+	this.updateLanguageSwitcher(element, element.hawkejs_renderer?.variables);
 });
 
 /**

package/lib/app/helper_controller/controller.js

@@ -159,6 +159,22 @@ Controller.setMethod(function addComponent(name, options) {
 	this.components[underscored] = new Blast.Classes.Alchemy.Client.Component[name](this, options);
 }, false);
 
+/**
+ * Change the response URL (or disable it)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @param    {String|RURL|Boolean}   new_url
+ */
+Controller.setMethod(function setResponseUrl(new_url) {
+
+	// @TODO: will only work when called on the server-side
+	if (this.conduit) {
+		this.conduit.setResponseUrl(new_url);
+	}
+});
 
 /**
  * Set a variable for ViewRender, through conduit
@@ -308,12 +324,12 @@ Controller.setMethod(function end(message) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param   {String}   name   The name of the action to execute
  * @param   {Array}    args   Arguments to apply to the action
  */
-Controller.setMethod(function doAction(name, args) {
+Controller.setMethod(async function doAction(name, args) {
 
 	var that = this;
 
@@ -338,43 +354,42 @@ Controller.setMethod(function doAction(name, args) {
 		this.initial_action_arguments = args;
 	}
 
-	if (this.conduit && this.conduit.route && this.conduit.route.options && this.conduit.route.options.title) {
+	const route = this.conduit?.route;
 
-		let title = this.conduit.route.options.title;
+	if (route) {
 
-		if (alchemy.settings && alchemy.settings.title_suffix) {
-			title += alchemy.settings.title_suffix;
-		}
+		if (route.options?.title) {
+			let title = route.options.title;
 
-		this.setTitle(title);
-	}
+			if (alchemy.settings && alchemy.settings.title_suffix) {
+				title += alchemy.settings.title_suffix;
+			}
 
-	Function.series(function initializing(next) {
-		that.issueEvent('initializing', next);
-	}, function filtering(next) {
-		that.issueEvent('filtering', next);
-	}, function starting(next) {
-		that.issueEvent('starting', [name], next);
-	}, function actioning(next) {
-
-		var result = that.constructor.actions[name].apply(that, args);
-
-		if (result && typeof result.then == 'function') {
-			result.then(function() {
-				next();
-			}).catch(next);
-		} else {
-			next();
+			this.setTitle(title);
 		}
 
-	}, function done(err) {
+		if (route.requires_data_for_translation && route.visible_location !== false && this.conduit.prefix) {
+			let route_translations = route.getRouteTranslations(this, this.conduit);
 
-		if (err != null) {
-			that.conduit.error(err);
-			return;
+			if (route_translations) {
+				route_translations = await route_translations;
+				this.internal('current_route_translations', route_translations);
+			}
 		}
 
-	});
+		if (route.visible_location !== true) {
+			this.setResponseUrl(route.visible_location);
+		}
+	}
+
+	try {
+		await this.issueEvent('initializing');
+		await this.issueEvent('filtering');
+		await this.issueEvent('starting', [name]);
+		await this.constructor.actions[name].apply(this, args);
+	} catch (err) {
+		this.conduit.error(err);
+	}
 });
 
 /**

package/lib/app/helper_datasource/00-nosql_datasource.js

@@ -590,7 +590,7 @@ NoSQL.setStatic(function areComparable(a, b) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.2.2
+ * @version  1.3.0
  *
  * @param    {Criteria}   criteria
  * @param    {Group}      group
@@ -710,12 +710,14 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 			    obj = {};
 
 			let field_entry = {},
-			    name = entry.target_path;
+			    name = entry.target_path,
+				queries_property = name.indexOf('.') > -1;
 
 			// Do we need to look into an object itself?
 			// (Like the "timestamp" property of a date field when stored with units)
-			if (entry.db_property) {
+			if (entry.db_property && !queries_property) {
 				name += '.' + entry.db_property;
+				queries_property = true;
 			}
 
 			if (entry.association) {
@@ -815,15 +817,46 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 					throw new Error('Unknown criteria expression: "' + item.type + '"');
 				}
 
+				let multiple_fields,
+				    prefixed_name = name;
+
+				// Temporary fix to actually query translatable field contents
+				// (entry.field can be undefined if trying to query a path)
+				if (entry.field && entry.field.is_translatable) {
+
+					let prefix = criteria.options.locale;
+
+					// If a prefix is specified, only query that translation
+					if (prefix) {
+						prefixed_name = name + '.' + prefix;
+					} else {
+						multiple_fields = [];
+
+						// No prefixes specified, so look through all translations
+						for (let key in Prefix.all()) {
+							multiple_fields.push(name + '.' + key);
+						}
+					}
+				}
+
 				if (obj && obj.$or) {
 
 					let $or = [],
 					    i;
 
 					for (i = 0; i < obj.$or.length; i++) {
-						$or.push({
-							[name] : obj.$or[i]
-						});
+
+						if (multiple_fields) {
+							for (let name of multiple_fields) {
+								$or.push({
+									[name] : obj.$or[i]
+								});
+							}
+						} else {
+							$or.push({
+								[prefixed_name] : obj.$or[i]
+							});
+						}
 					}
 
 					if (not) {
@@ -861,18 +894,19 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 
 					// Temporary fix to actually query translatable field contents
 					// (entry.field can be undefined if trying to query a path)
-					if (entry.field && entry.field.is_translatable) {
+					if (multiple_fields) {
+
 						let $or = [];
 
-						for (let key in Prefix.all()) {
+						for (let name of multiple_fields) {
 							let temp = {};
-							temp[name + '.' + key] = obj;
+							temp[name] = obj;
 							$or.push(temp);
 						}
 
 						field_entry.$or = $or;
 					} else {
-						field_entry[name] = obj;
+						field_entry[prefixed_name] = obj;
 					}
 				}
 

package/lib/app/helper_field/enum_field.js

@@ -45,7 +45,7 @@ Enum.setMethod(function cast(value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.1
+ * @version  1.3.0
  *
  * @return   {EnumValues}
  */
@@ -55,10 +55,10 @@ Enum.setMethod(function getValues() {
 	// or its pluralized name, if nothing was found
 	if (this.options && this.options.values) {
 		return this.options.values;
-	} else if (this.schema.enumValues[this.name]) {
-		return this.schema.enumValues[this.name];
+	} else if (this.schema.enum_values[this.name]) {
+		return this.schema.enum_values[this.name];
 	} else {
-		return this.schema.enumValues[this.name.pluralize()];
+		return this.schema.enum_values[this.name.pluralize()];
 	}
 });