alchemymvc 1.2.4 → 1.2.5

package/lib/class/model.js

@@ -317,7 +317,7 @@ Model.prepareProperty('sort', function sort() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String}   value       The value in the url
  * @param    {String}   name        The name of the url parameter
@@ -326,7 +326,7 @@ Model.prepareProperty('sort', function sort() {
  *
  * @return   {Pledge}
  */
-Model.setStatic(function checkPathValue(value, name, field_name, conduit) {
+Model.setStatic(async function checkPathValue(value, name, field_name, conduit) {
 
 	var instance,
 	    pledge,
@@ -352,9 +352,17 @@ Model.setStatic(function checkPathValue(value, name, field_name, conduit) {
 	// Look for the wanted field
 	crit.where(field_name).equals(value);
 
-	pledge = instance.find('first', crit);
+	let result = await instance.find('first', crit);
 
-	return pledge;
+	if (result) {
+		let found_value = result[field_name];
+
+		if (found_value != value && !Object.alike(value, found_value)) {
+			conduit.rewriteRequestRouteParam(name, found_value);
+		}
+	}
+
+	return result;
 });
 
 /**

package/lib/class/route.js

@@ -3,7 +3,7 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.5
  */
 var Route = Function.inherits('Alchemy.Base', function Route(router, paths, options) {
 
@@ -41,6 +41,10 @@ var Route = Function.inherits('Alchemy.Base', function Route(router, paths, opti
 	this.breadcrumb = '';
 	this.has_breadcrumb_assignments = false;
 
+	// The optional permissions to check
+	this.permission = null;
+	this.has_permission_assignments = false;
+
 	// If no fnc is given, these will be called
 	this.controller = null;
 	this.action = null;
@@ -84,6 +88,35 @@ Route.setMethod(function setBreadcrumb(breadcrumb) {
 	this.breadcrumb = breadcrumb;
 });
 
+/**
+ * Set the permissions for this route
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|String[]}   permission
+ */
+Route.setMethod(function setPermission(permission) {
+
+	if (!permission) {
+		return;
+	}
+
+	permission = Array.cast(permission);
+
+	this.permission = permission;
+
+	for (let entry of permission) {
+		let assignments = entry.assignments();
+
+		if (assignments.length) {
+			this.has_permission_assignments = true;
+			break;
+		}
+	}
+});
+
 /**
  * Compile paths for this route
  *
@@ -135,7 +168,7 @@ Route.setMethod(function setPaths(paths) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.3
+ * @version  1.2.5
  *
  * @param    {String}   method
  * @param    {String}   path     The path (without the prefix)
@@ -145,19 +178,13 @@ Route.setMethod(function setPaths(paths) {
  */
 Route.setMethod(function match(conduit, method, path, prefix) {
 
-	var definition,
-	    params,
-	    pledge,
-	    result,
-	    temp,
-	    type,
-	    i;
+	conduit.markRouteAsTested(this);
 
 	if (this.methods && this.methods.indexOf(method) == -1) {
 		return false;
 	}
 
-	result = false;
+	let result = false;
 
 	if (!prefix) {
 		prefix = '';
@@ -181,17 +208,17 @@ Route.setMethod(function match(conduit, method, path, prefix) {
 	if (this.paths[prefix]) {
 
 		// Get the path definition, including the regex & keys array
-		definition = this.paths[prefix];
+		let definition = this.paths[prefix];
 
 		// Test it
-		temp = definition.test(path, conduit);
+		let temp = definition.test(path, conduit);
 
 		if (!temp) {
 			return false;
 		}
 
 		if (temp.then) {
-			pledge = new Blast.Classes.Pledge();
+			let pledge = new Blast.Classes.Pledge();
 
 			temp.then(function gotValue(values) {
 
@@ -295,12 +322,48 @@ Route.setMethod(function checkPolicy(conduit) {
 	return false;
 });
 
+/**
+ * Check the permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Conduit}   conduit
+ */
+Route.setMethod(function checkPermission(conduit) {
+
+	// Check the rouer section first
+	if (!this.router.checkPermission(conduit)) {
+		return false;
+	}
+
+	if (!this.permission) {
+		return true;
+	}
+
+	let permission;
+
+	for (permission of this.permission) {
+
+		if (this.has_permission_assignments) {
+			permission = permission.assign(conduit.route_string_parameters).toLowerCase();
+		}
+
+		if (conduit.hasPermission(permission)) {
+			return true;
+		}
+	}
+
+	return false;
+});
+
 /**
  * Call the handler for this route
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.2.5
  *
  * @param    {Conduit}   conduit
  * @param    {Array}     parameters
@@ -314,6 +377,17 @@ Route.setMethod(async function callHandler(conduit, parameters) {
 
 	if (this.fnc) {
 
+		if (!this.checkPermission(conduit)) {
+
+			let user = conduit.session('UserData');
+
+			if (!user) {
+				return conduit.notAuthorized();
+			} else {
+				return conduit.forbidden();
+			}
+		}
+
 		if (this.options.policy && !await this.checkPolicy(conduit)) {
 			return conduit.notAuthorized();
 		}
@@ -403,25 +477,20 @@ Route.setMethod(async function callHandler(conduit, parameters) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  0.5.0
+ * @version  1.2.5
  *
  * @param    {Object}                  parameters  (optional)
  * @param    {Object|Alchemy.Conduit}  conduit     Conduit or options (optional)
  */
 Route.setMethod(function generateUrl(parameters, conduit) {
 
-	var locale,
-	    mount,
-	    path,
-	    url,
-	    i;
-
 	// Use the "no locale" by default
-	locale = '';
+	let locale = '';
 
 	// If a conduit is given, get the locale
 	if (conduit) {
 		if (conduit.locales) {
+			let i;
 			for (i = 0; i < conduit.locales.length; i++) {
 				if (this.paths[conduit.locales[i]]) {
 					locale = conduit.locales[i];
@@ -435,45 +504,7 @@ Route.setMethod(function generateUrl(parameters, conduit) {
 		}
 	}
 
-	// Get the path to use for the url generation
-	path = this.paths[locale];
-
-	if (!path) {
-		return null;
-	}
-
-	if (path && path.source) {
-		path = path.source;
-	}
-
-	// Remove type definitions from the path
-	path = path.replace(/\[.*\]\:/g, ':');
-
-	if (!parameters && conduit) {
-		if (conduit.param) {
-			parameters = conduit.param();
-		} else if (conduit.parameters) {
-			paramers = conduit.parameters;
-		}
-	}
-
-	if (parameters) {
-		url = path.fillPlaceholders(parameters, true);
-	} else {
-		url = path;
-	}
-
-	mount = this.router.getFullMount();
-
-	if (mount.length > 1) {
-		url = mount + url;
-	}
-
-	if (locale) {
-		url = '/' + locale + url;
-	}
-
-	return url;
+	return Router.getUrl(this.name, parameters, {locale});
 });
 
 /**

package/lib/class/router.js

@@ -12,7 +12,7 @@ var Url = alchemy.use('url'),
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  */
 var RouterClass = Function.inherits('Alchemy.Base', function Router(name, mount, parent) {
 
@@ -52,6 +52,9 @@ var RouterClass = Function.inherits('Alchemy.Base', function Router(name, mount,
 	// Routes inside this router
 	this.routes = new Deck();
 
+	// Optional permissions to check for
+	this.permissions = null;
+
 	this.generateSectionIdentifier();
 });
 
@@ -67,6 +70,66 @@ RouterClass.setProperty('default_route_settings', {
 	weight : 10
 });
 
+/**
+ * Add a required permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|String[]}   permission
+ */
+RouterClass.setMethod(function requirePermission(permission) {
+
+	if (!permission) {
+		return;
+	}
+
+	if (!this.permissions) {
+		this.permissions = [];
+	}
+
+	this.permissions.include(permission);
+});
+
+/**
+ * Check the permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Conduit}   conduit
+ *
+ * @return   {Boolean}
+ */
+RouterClass.setMethod(function checkPermission(conduit) {
+
+	// Does this section require a permission?
+	if (this.permissions?.length) {
+		let permission,
+		    has_permission;
+
+		for (permission of this.permissions) {
+			if (conduit.hasPermission(permission)) {
+				has_permission = true;
+				break;
+			}
+		}
+
+		if (!has_permission) {
+			return false;
+		}
+	}
+
+	// If this section has a parent, check those permissions too
+	if (this.parent) {
+		return this.parent.checkPermission(conduit);
+	}
+
+	return true;
+});
+
 /**
  * Get the complete section identifier
  *
@@ -424,7 +487,7 @@ RouterClass.setMethod(function getRouteByName(name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.5
  *
  * @param    {Conduit}  conduit
  * @param    {Router}   section
@@ -462,6 +525,16 @@ RouterClass.setMethod(async function getMiddleware(conduit, section, path, prefi
 		for (i = 0; i < routes.length; i++) {
 			route = routes[i];
 
+			// If this route matches the main route of the conduit,
+			// don't look for more middleware in this section
+			if (conduit.route && conduit.route == route) {
+				break;
+			}
+
+			if (conduit.hasRouteBeenTested(route)) {
+				continue;
+			}
+
 			if (route.is_middleware) {
 
 				temp = route.match(conduit, conduit.method, sectionPath, prefix);
@@ -690,7 +763,7 @@ RouterClass.setMethod(function setOption(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Object}   args
  * @param    {String}   args.name            Optional route name
@@ -741,6 +814,10 @@ RouterClass.setMethod(function add(args) {
 	route.methods = args.methods;
 	route.setBreadcrumb(args.breadcrumb);
 
+	if (args.permission) {
+		route.setPermission(args.permission);
+	}
+
 	if (args.breadcrumb) {
 		breadcrumb_options = {
 			route : route

package/lib/class/schema_client.js

@@ -637,7 +637,7 @@ Schema.setMethod(function getField(name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String}   name
  *
@@ -660,9 +660,14 @@ Schema.setMethod(function getFieldChain(name) {
 		// Iterate over all the pieces
 		for (i = 0; i <= max; i++) {
 			current = current.get(pieces[i]);
+
+			if (!current || typeof current == 'function') {
+				break;
+			}
+
 			result.push(current);
 
-			if (!current || i == max) {
+			if (i == max) {
 				break;
 			}
 

package/lib/core/client_alchemy.js

@@ -186,6 +186,26 @@ Alchemy.setMethod(function __d(domain, key, parameters) {
 	return hawkejs.scene.generalView.__d(domain, key, parameters);
 });
 
+/**
+ * Set the permission checker
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.2.5
+ * @version   1.2.5
+ *
+ * @param     {Object}   instance
+ */
+Alchemy.setMethod(function setPermissionChecker(instance) {
+
+	if (instance) {
+		if (typeof instance.conduitHasPermission != 'function') {
+			throw new Error('Permission checker needs to have a `conduitHasPermisison` method');
+		}
+	}
+
+	this.permission_checker = instance;
+});
+
 /**
  * Cast to an object id
  *
@@ -469,7 +489,7 @@ Alchemy.setMethod(function linkup(type, data, cb) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.3.0
- * @version   1.1.0
+ * @version   1.2.5
  *
  * @param     {Object}   variables
  * @param     {Object}   render_data
@@ -496,6 +516,13 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
 	// Get the newly set breadcrumb
 	page_breadcrumb = variables.__breadcrumb;
 
+	// Get all the language switcher anchors
+	elements = document.querySelectorAll('[data-alchemy-language-switch]');
+
+	for (i = 0; i < elements.length; i++) {
+		hawkejs.scene.general_renderer.helpers.Router.updateLanguageSwitcher(elements[i]);
+	}
+
 	// Get all the elements with a breadcrumb set
 	elements = document.querySelectorAll('[data-breadcrumb],[data-breadcrumbs]');
 
@@ -584,25 +611,30 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     1.0.0
- * @version   1.0.5
+ * @version   1.2.5
  */
 Alchemy.setMethod(function reloadStylesheets() {
 
-	var sheet,
-	    url,
-	    i;
-
-	for (i = 0; i < document.styleSheets.length; i++) {
-		sheet = document.styleSheets[i];
+	for (let i = 0; i < document.styleSheets.length; i++) {
+		let sheet = document.styleSheets[i];
 
 		if (!sheet.href) {
 			continue;
 		}
 
-		url = new RURL(sheet.href);
+		let url = new RURL(sheet.href);
 		url.param('last_reload', Date.now());
 
-		sheet.ownerNode.href = String(url);
+		//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();
+		});
 	}
 });
 
@@ -611,22 +643,17 @@ Alchemy.setMethod(function reloadStylesheets() {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.4.1
- * @version   1.1.0
+ * @version   1.2.5
  */
 Alchemy.setMethod(function switchLanguage(prefix) {
 
-	var config,
-	    target,
-	    temp,
-	    url,
-	    key,
-	    e;
-
 	if (prefix) {
 		if (typeof prefix != 'string') {
+			let target,
+			    temp;
 
 			if (prefix instanceof Event) {
-				e = prefix;
+				let e = prefix;
 				target = e.srcElement || e.target;
 				e.preventDefault();
 			} else if (typeof prefix.getAttribute == 'function') {
@@ -645,35 +672,13 @@ Alchemy.setMethod(function switchLanguage(prefix) {
 		}
 	}
 
-	config = hawkejs.scene.helpers.Router.routeConfig(alchemy.current_route);
+	let url = hawkejs.scene.helpers.Router.translateCurrentRoute(prefix);
 
-	if (!alchemy.current_route || !config) {
+	if (!url) {
 		// Unknown current route, defaulting to /prefix
 		return doNavigate('/' + prefix);
 	}
 
-	// Get the url string
-	url = hawkejs.scene.helpers.Router.routeUrl(alchemy.current_route, alchemy.current_url_params, {locale: prefix});
-
-	// Turn it into a url object
-	url = RURL.parse(url);
-
-	if (url && url.pathname == '/') {
-		url.pathname = '/' + prefix + url.pathname;
-	}
-
-	// Add the get queries
-	if (alchemy.current_url && alchemy.current_url.search) {
-		for (key in alchemy.current_url.query) {
-
-			if (key == 'hajax' || key == 'h_diversion' || key == 'htop') {
-				continue;
-			}
-
-			url.addQuery(key, alchemy.current_url.query[key]);
-		}
-	}
-
 	url = String(url);
 
 	return doNavigate(url);

package/lib/core/middleware.js

@@ -15,6 +15,7 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     libpath    = alchemy.use('path'),
     nodent_compiler,
     regenerator_runtime,
+	sass_functions,
     babel_polyfill,
     babel_preset,
     babel_async,
@@ -30,7 +31,61 @@ if (alchemy.settings.css_less !== false) {
 }
 
 if (alchemy.settings.css_sass) {
-	sass = alchemy.use('sass');
+
+	// Try to use the embedded DART sass
+	sass = alchemy.use('sass-embedded');
+
+	if (!sass) {
+		sass = alchemy.use('sass');
+	}
+
+	sass_functions = {
+		'alchemy_settings($name)': function(name) {
+
+			if (!(name instanceof sass.types.String)) {
+				return sass.types.Null.NULL;
+			}
+
+			name = name.getValue();
+
+			let value = Object.path(alchemy.settings, name);
+
+			if (value == null) {
+				value = Object.path(alchemy.plugins, name);
+			}
+
+			let type = typeof value,
+			    result;
+
+			switch (type) {
+				case 'string':
+					if (value) {
+						result = new sass.types.String(value);
+					} else {
+						result = sass.types.Null.NULL;
+					}
+					break;
+				
+				case 'number':
+					result = new sass.types.Number(value);
+					break;
+				
+				case 'boolean':
+					result = new sass.types.Boolean(value);
+					break;
+				
+				default:
+					if (value == null) {
+						result = sass.types.Null.NULL;
+					} else {
+						result = new sass.types.String(''+value);
+					}
+					break;
+			}
+
+			return result;
+		}
+	};
 }
 
 if (alchemy.settings.css_post !== false) {
@@ -945,7 +1000,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  */
 Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 
@@ -969,12 +1024,22 @@ Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 			return writeToTemp(source);
 		}
 
-		sass.render({
-			data           : source,
+		const render_options = {
 			includePaths   : ['.'].concat(styleDirs.getSorted()).concat(libpath.dirname(sassPath)),
-			sourceMapEmbed : alchemy.settings.debug,
-			sourceMapRoot  : '/_sourcemaps/'
-		}, function gotCss(err, result) {
+			functions      : sass_functions,
+		};
+
+		if (alchemy.settings.debug) {
+			render_options.file = sassPath;
+			render_options.sourceMap      = 'out.css.map';
+			render_options.sourceMapContents = true;
+			render_options.sourceMapEmbed = true;
+			render_options.sourceMapRoot  = '/_sourcemaps/';
+		} else {
+			render_options.data = source;
+		}
+
+		sass.render(render_options, function gotCss(err, result) {
 
 			if (err) {
 				console.log(''+err, err);