alchemymvc 1.3.7 → 1.3.9

package/lib/app/helper/breadcrumb.js

@@ -0,0 +1,156 @@
+/**
+ * The Breadcrumb class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @param    {String}   input
+ */
+const Breadcrumb = Function.inherits('Alchemy.Base', function Breadcrumb(input) {
+
+	this.trails = [];
+	
+	if (input) {
+		this.addTrail(input);
+	}
+});
+
+/**
+ * Get the number of trails
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @return   {Number}
+ */
+Breadcrumb.setProperty(function length() {
+	return this.trails.length;
+});
+
+/**
+ * Add a breadcrumb trail
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @param    {String}   input
+ */
+Breadcrumb.setMethod(function addTrail(input) {
+
+	let trails;
+
+	if (!input) {
+		input = '';
+	} else if (typeof input == 'object') {
+		if (input instanceof Breadcrumb) {
+			trails = input.trails;
+		} else if (input.nodeType === 1) {
+			// Simple way to see if it's an HTMLElement
+
+			let element = input;
+			input = '';
+
+			let crumb = element.getAttribute('data-breadcrumb');
+
+			if (crumb) {
+				input = crumb;
+			}
+
+			crumb = element.getAttribute('data-breadcrumbs');
+
+			if (crumb) {
+				input += ' ' + crumb;
+			}
+		}
+	}
+
+	if (!trails) {
+		// Split the string why whitespaces
+		trails = input.trim().split(/\s+|\|+/);
+	}
+
+	if (trails?.length) {
+		for (let trail of trails) {
+
+			if (!trail) {
+				continue;
+			}
+
+			// The trail has to end with a dot
+			if (!trail.endsWith('.')) {
+				trail += '.';
+			}
+
+			this.trails.push(trail);
+		}
+	}
+});
+
+/**
+ * Do these 2 breadcrumbs match loosely?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @param    {Alchemy.Breadcrumb}   other
+ */
+Breadcrumb.setMethod(function matches(other) {
+	return this.matchLevel(other) > 0;
+});
+
+/**
+ * What leven of match is there between these 2 breadcrumbs?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @param    {Alchemy.Breadcrumb}   other
+ *
+ * @return   {Number}   1 for a strict match, 2 for a loose match
+ */
+Breadcrumb.setMethod(function matchLevel(other) {
+
+	if (!other || !this.trails.length) {
+		return 0;
+	}
+
+	if (!(other instanceof Breadcrumb)) {
+		other = new Breadcrumb(other);
+	}
+
+	let their_trail,
+	    our_trail;
+	
+	for (our_trail of this.trails) {
+		for (their_trail of other.trails) {
+			// Strict matches are always true
+			if (our_trail == their_trail) {
+				return 1;
+			}
+
+			if (our_trail.startsWith(their_trail)) {
+				return 2;
+			}
+		}
+	}
+
+	return 0;
+});
+
+/**
+ * Turn it into a string
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ */
+Breadcrumb.setMethod(function toString() {
+	return this.trails.join(' ');
+});

package/lib/app/helper/router_helper.js

@@ -147,14 +147,24 @@ Router.setMethod(function applyDirective(element, name, options) {
 		}
 	}
 
-	if (config.breadcrumb) {
-		let link_breadcrumb = this.getTrail(name, params);
+	let breadcrumb = config.breadcrumb;
+
+	if (options.breadcrumb) {
+		if (!breadcrumb) {
+			breadcrumb = options.breadcrumb;
+		} else {
+			breadcrumb += ' ' + options.breadcrumb;
+		}
+	}
+
+	if (config.breadcrumb || options.breadcrumb) {
+		let link_breadcrumb = this.getTrail(name, {...params}, options);
 		element.setAttribute('data-breadcrumb', link_breadcrumb);
 
 		if (this.renderer && link_breadcrumb) {
-			let page_breadcrumb = this.renderer.internal('breadcrumb');
+			let page_breadcrumb = new Classes.Alchemy.Breadcrumb(this.renderer.internal('breadcrumb'));
 
-			if (page_breadcrumb && page_breadcrumb.startsWith(link_breadcrumb)) {
+			if (page_breadcrumb.matches(link_breadcrumb)) {
 
 				if (element.parentElement) {
 					// @TODO: We need to make sure the options (classnames & such)
@@ -326,7 +336,7 @@ Router.setMethod(function routeConfig(name, socket_route) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.7
+ * @version  1.3.9
  *
  * @param    {String}   name
  * @param    {Object}   parameters
@@ -335,8 +345,7 @@ Router.setMethod(function routeConfig(name, socket_route) {
  */
 Router.setMethod(function routeUrl(name, parameters, options) {
 
-	var parameters,
-	    base_url,
+	var base_url,
 	    locales,
 	    config,
 	    url,
@@ -360,6 +369,10 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 		locales = [];
 	}
 
+	if (parameters) {
+		parameters = {...parameters};
+	}
+
 	let chosen_prefix;
 
 	if (config != null) {
@@ -492,28 +505,72 @@ Router.setMethod(function routeUrl(name, parameters, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  0.3.0
+ * @version  1.3.8
  *
  * @param    {String}   name
  * @param    {Object}   parameters
+ * @param    {Object}   options
  *
- * @return   {String}
+ * @return   {Alchemy.Breadcrumb}
  */
-Router.setMethod(function getTrail(name, parameters) {
+Router.setMethod(function getTrail(name, parameters, options) {
 
-	var breadcrumb,
+	let can_have_assignments,
+	    trails = [],
 	    config;
+	
+	if (options?.breadcrumb) {
+		can_have_assignments = true;
+		trails.push(options.breadcrumb);
+	}
 
 	config = this.routeConfig(name);
 
-	if (!config || !config.breadcrumb) {
+	if (!trails.length && (!config || !config.breadcrumb)) {
 		return;
 	}
 
-	breadcrumb = config.breadcrumb;
+	let breadcrumb = new Classes.Alchemy.Breadcrumb();
+
+	if (config?.breadcrumb) {
+		trails.push(config.breadcrumb);
+	}
 
-	if (config.has_breadcrumb_assignments) {
-		breadcrumb = Blast.Bound.String.assign(breadcrumb, parameters).toLowerCase();
+	if (!can_have_assignments) {
+		can_have_assignments = config?.has_breadcrumb_assignments;
+	}
+
+	if (can_have_assignments) {
+		let key;
+		parameters = {...parameters};
+
+		for (key in parameters) {
+			if (key[0] == key[0].toUpperCase()) {
+				let value = parameters[key];
+
+				if (value && typeof value == 'object') {
+					let subkey;
+
+					let context = value?.$main || value;
+
+					for (subkey in context) {
+						if (parameters[subkey] == null) {
+							parameters[subkey] = context[subkey];
+						}
+					}
+				}
+			}
+		}
+	}
+
+	let trail;
+
+	for (trail of trails) {
+		if (can_have_assignments) {
+			trail = Blast.Bound.String.assign(trail, parameters).toLowerCase();
+		}
+
+		breadcrumb.addTrail(trail);
 	}
 
 	return breadcrumb;
@@ -527,9 +584,6 @@ Router.setMethod(function getTrail(name, parameters) {
  * @version  0.3.0
  */
 Router.setMethod(function printBreadcrumb() {
-
-	var that = this;
-
 	this.view.print_partial('breadcrumb/wrapper');
 });
 
@@ -693,7 +747,7 @@ 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;
@@ -739,7 +793,7 @@ Router.setMethod(function updateLanguageSwitcher(element, variables) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.3.7
+ * @version  1.3.8
  *
  * @param    {String}   prefix    The prefix to use
  * @param    {Object}   variables
@@ -761,6 +815,15 @@ Router.setMethod(function translateCurrentRoute(prefix, variables) {
 		return;
 	}
 
+	// Don't just translate the last rendered route, make sure it's the current one
+	if (info.url && Blast.isBrowser) {
+		let url = RURL.parse(info.url);
+
+		if (url && !url.matchesPath(window.location)) {
+			return;
+		}
+	}
+
 	let config = this.routeConfig(info.route);
 
 	if (!config) {

package/lib/app/helper_model/model.js

@@ -597,9 +597,9 @@ Model.setMethod(function getAliasModel(alias) {
 /**
  * Query the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.3.4
+ * @version  1.3.8
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -660,7 +660,7 @@ Model.setMethod(function find(type, criteria, callback) {
 	}
 
 	if (!criteria.options.locale && this.conduit) {
-		criteria.setOption('locale', this.conduit.prefix);
+		criteria.setOption('locale', this.conduit.active_prefix);
 	}
 
 	let that = this,

package/lib/core/client_alchemy.js

@@ -519,6 +519,59 @@ Alchemy.setMethod(function routeConfig(name) {
 
 const markLinkElement = Alchemy.prototype.markLinkElement;
 
+/**
+ * Get a live map of all the routes
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @return   {Develry.BackedMap}
+ */
+Alchemy.setMethod(function getRoutes() {
+	return new Classes.Develry.BackedMap(getRoutesDict);
+});
+
+/**
+ * The live-map dictionary creator
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.8
+ * @version  1.3.8
+ *
+ * @return   {Object}
+ */
+function getRoutesDict() {
+	let routes;
+
+	if (Blast.isNode) {
+		routes = {};
+
+		let roots = Router.getRoutes();
+
+		for (let key in roots) {
+			let root = roots[key];
+
+			for (let name in root) {
+				routes[name] = root[name];
+			}
+		}
+		
+	} else {
+		routes = {};
+
+		for (let root in hawkejs.scene.exposed.routes) {
+			let section = hawkejs.scene.exposed.routes[root];
+
+			for (let key in section) {
+				routes[key] = section[key];
+			}
+		}
+	}
+
+	return routes;
+}
+
 // From here on, only client-side code is added
 if (Blast.isBrowser) {
 	window.alchemy = new Alchemy();
@@ -582,21 +635,18 @@ Alchemy.setMethod(function linkup(type, data, cb) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.3.0
- * @version   1.3.0
+ * @version   1.3.8
  *
  * @param     {Object}   variables
  * @param     {Object}   render_data
  */
 Alchemy.setMethod(function markLinks(variables, render_data) {
 
-	var page_breadcrumb,
-	    el_breadcrumbs,
-	    el_breadcrumb,
+	let page_breadcrumb,
 	    placeholder,
 	    href_val,
 	    elements,
 	    element,
-	    temp,
 	    url,
 	    i;
 
@@ -607,7 +657,7 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
 	}
 
 	// Get the newly set breadcrumb
-	page_breadcrumb = variables.__breadcrumb;
+	page_breadcrumb = new Classes.Alchemy.Breadcrumb(variables.__breadcrumb);
 
 	// Get all the language switcher anchors
 	elements = document.querySelectorAll('[data-alchemy-language-switch]');
@@ -621,30 +671,7 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
 
 	for (i = 0; i < elements.length; i++) {
 		element = elements[i];
-
-		// Create the breadcrumbs array
-		el_breadcrumbs = [];
-
-		// Get the element's set breadcrumb
-		el_breadcrumb = element.getAttribute('data-breadcrumb');
-
-		if (el_breadcrumb) {
-			el_breadcrumbs.push(el_breadcrumb);
-		}
-
-		el_breadcrumb = element.getAttribute('data-breadcrumbs');
-
-		if (el_breadcrumb) {
-			el_breadcrumbs.include(el_breadcrumb.split('|'));
-		}
-
-		if (el_breadcrumbs.indexOf(page_breadcrumb) > -1) {
-			markLinkElement(element, 1);
-		} else if (page_breadcrumb && page_breadcrumb.startsWithAny(el_breadcrumbs)) {
-			markLinkElement(element, 2);
-		} else {
-			markLinkElement(element, false);
-		}
+		markLinkElement(element, page_breadcrumb.matchLevel(element));
 	}
 
 	// Get all anchors without breadcrumbs
@@ -702,9 +729,9 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
 /**
  * Reload all stylesheets
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     1.0.0
- * @version   1.2.5
+ * @version   1.3.8
  */
 Alchemy.setMethod(function reloadStylesheets() {
 
@@ -718,15 +745,15 @@ Alchemy.setMethod(function reloadStylesheets() {
 		let url = new RURL(sheet.href);
 		url.param('last_reload', Date.now());
 
-		//sheet.ownerNode.href = String(url);
-
 		let new_element = alchemy.hawkejs.createElement('link');
 		new_element.setAttribute('rel', 'stylesheet');
 		new_element.setAttribute('href', String(url));
 		document.head.append(new_element);
 
 		new_element.addEventListener('load', e => {
-			sheet.ownerNode.remove();
+			if (sheet.ownerNode) {
+				sheet.ownerNode.remove();
+			}
 		});
 	}
 });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.7",
+	"version": "1.3.9",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",