alchemymvc 1.3.21 → 1.4.0-alpha.1

package/lib/core/client_base.js

@@ -1,19 +1,17 @@
-'use strict';
-
 /**
  * Alchemy's Client Base class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
-var ClientBase = Function.inherits('Alchemy.Base', 'Alchemy.Client', function Base() {});
+const ClientBase = Function.inherits('Alchemy.Base', 'Alchemy.Client', function Base() {});
 
 // PROTOBLAST START CUT
 /**
  * Get the server implementation of this class
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.2
  *
@@ -45,7 +43,7 @@ ClientBase.setStatic(function getServerClass() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.2
- * @version  1.1.2
+ * @version  1.4.0
  *
  * @param    {Function}
  */
@@ -63,7 +61,7 @@ ClientBase.setStatic(function callbackWithServerClass(callback) {
 
 	const that = this;
 
-	alchemy.sputnik.after('plugins', function loadedPlugins() {
+	STAGES.afterStages('load_app.plugins', function loadedPlugins() {
 
 		server_class = that.getServerClass();
 
@@ -77,14 +75,14 @@ ClientBase.setStatic(function callbackWithServerClass(callback) {
 /**
  * Set a property
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.2
  *
- * @param    {String}     key        Name of the property
+ * @param    {string}     key        Name of the property
  * @param    {Function}   getter     Optional getter function
  * @param    {Function}   setter     Optional setter function
- * @param    {Boolean}    on_server  Also set on the server implementation
+ * @param    {boolean}    on_server  Also set on the server implementation
  */
 ClientBase.setStatic(function setProperty(key, getter, setter, on_server) {
 
@@ -122,13 +120,13 @@ ClientBase.setStatic(function setProperty(key, getter, setter, on_server) {
 /**
  * Prepare a property
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
  * @version  1.1.2
  *
- * @param    {String}     key        Name of the property
+ * @param    {string}     key        Name of the property
  * @param    {Function}   getter     Optional getter function
- * @param    {Boolean}    on_server  Also set on the server implementation
+ * @param    {boolean}    on_server  Also set on the server implementation
  */
 ClientBase.setStatic(function prepareProperty(key, getter, on_server) {
 
@@ -161,13 +159,13 @@ ClientBase.setStatic(function prepareProperty(key, getter, on_server) {
 /**
  * Set a method
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.2
  *
- * @param    {String}     key        Name of the property
+ * @param    {string}     key        Name of the property
  * @param    {Function}   method     The method to set
- * @param    {Boolean}    on_server  Also set on the server implementation
+ * @param    {boolean}    on_server  Also set on the server implementation
  */
 ClientBase.setStatic(function setMethod(key, method, on_server) {
 
@@ -195,12 +193,12 @@ ClientBase.setStatic(function setMethod(key, method, on_server) {
  * @since    1.1.1
  * @version  1.1.2
  *
- * @param    {String}   event_name
- * @param    {String}   method_name
+ * @param    {string}   event_name
+ * @param    {string}   method_name
  */
 ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
 
-	function doMap() {
+	function addEventMap() {
 
 		if (!this.event_to_method_map) {
 			this.setStatic('event_to_method_map', new Map(), false);
@@ -219,11 +217,11 @@ ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
 		}
 	}
 
-	this.constitute(doMap);
+	this.constitute(addEventMap);
 
 	if (Blast.isNode) {
 		this.callbackWithServerClass(function gotClass(ServerClass) {
-			ServerClass.constitute(doMap);
+			ServerClass.constitute(addEventMap);
 		});
 	}
 });
@@ -231,44 +229,23 @@ ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
 /**
  * Get a client model
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.2.4
+ * @version  1.4.0
  *
- * @param   {String}   name
- * @param   {Object}   options
+ * @param    {string}   name
+ * @param    {Object}   options
  *
- * @return  {Model}
+ * @return   {Model}
  */
 ClientBase.setMethod(function getModel(name, init, options) {
 
-	var constructor,
-	    instance;
-
 	if (typeof init != 'boolean') {
 		options = init;
 		init = true;
 	}
 
-	if (!options || !options.strict_name) {
-		name = name.modelName();
-	}
-
-	if (Blast.isBrowser) {
-
-		if (name == '') {
-			constructor = Hawkejs.Model;
-		} else {
-			constructor = Hawkejs.Model.getClass(name, false);
-		}
-	} else {
-
-		if (name == '') {
-			constructor = Blast.Classes.Hawkejs.Model;
-		} else {
-			constructor = Blast.Classes.Hawkejs.Model.getClass(name);
-		}
-	}
+	let constructor = Classes.Alchemy.Client.Model.Model.getClass(name);
 
 	if (!constructor) {
 		throw new Error('Model "' + name + '" could not be found');
@@ -278,7 +255,7 @@ ClientBase.setMethod(function getModel(name, init, options) {
 		return constructor;
 	}
 
-	instance = new constructor(options);
+	let instance = new constructor(options);
 
 	let conduit = this.conduit;
 
@@ -294,9 +271,9 @@ ClientBase.setMethod(function getModel(name, init, options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.1
- * @version  1.3.2
+ * @version  1.3.22
  *
- * @param    {String}   name   The name of the event to emit
+ * @param    {string}   name   The name of the event to emit
  * @param    {Array}    args   The parameters to pass to the event
  * @param    {Function} next   The optional callback
  *
@@ -323,7 +300,17 @@ ClientBase.setMethod(function issueEvent(name, args, next) {
 	}
 
 	if (method_name && typeof this[method_name] == 'function') {
-		promise = this[method_name].apply(this, args);
+		try {
+			promise = this[method_name].apply(this, args);
+		} catch (err) {
+			pledge.reject(err);
+
+			if (next) {
+				next(err);
+			}
+
+			return pledge;
+		}
 	}
 
 	Pledge.done(promise, function doneEventPromise(err, result) {

package/lib/core/discovery.js

@@ -1,10 +1,8 @@
-'use strict';
-
 var bson       = alchemy.use('bson'),
     emitter    = alchemy.use('events').EventEmitter,
     maxSize    = 65536,
     mevents    = new emitter(),
-    udpIp      = alchemy.settings.multicast_ipv4,
+    udpIp      = alchemy.settings.network.multicast_ipv4,
     udpPort    = 4002,
     callbacks  = {},
     services   = alchemy.shared('alchemy.services'),
@@ -18,7 +16,7 @@ var bson       = alchemy.use('bson'),
 /**
  * Submit data
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  0.4.3
  *
@@ -44,7 +42,7 @@ function submit(packet) {
 	packet.origin = alchemy.discovery_id;
 
 	// Set the server http port
-	packet.http_port = alchemy.settings.port;
+	packet.http_port = alchemy.settings.network.port;
 
 	// Serialize the buffer
 	buffer = bson.serialize(packet);
@@ -67,7 +65,7 @@ function submit(packet) {
 /**
  * Listen for messages
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  0.4.3
  */
@@ -121,7 +119,7 @@ function onServerMessage(message, rinfo) {
 /**
  * Prepare multicast
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  0.4.3
  *
@@ -186,7 +184,7 @@ Alchemy.setMethod(function initMulticast(callback) {
 		/**
 		 * Bind to the UDP server port
 		 *
-		 * @author   Jelle De Loecker   <jelle@develry.be>
+		 * @author   Jelle De Loecker <jelle@elevenways.be>
 		 * @since    0.1.0
 		 * @version  0.2.0
 		 */
@@ -230,13 +228,13 @@ Alchemy.setMethod(function initMulticast(callback) {
 /**
  * Multicast a message to other alchemy instances
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  0.1.0
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Object}   data         The data to broadcast
- * @param    {Boolean}  accumulate   Group response data
+ * @param    {boolean}  accumulate   Group response data
  * @param    {Function} callback
  */
 Alchemy.setMethod(function multicast(type, data, accumulate, callback) {
@@ -279,11 +277,11 @@ Alchemy.setMethod(function multicast(type, data, accumulate, callback) {
 /**
  * Listen for multicast messages
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  0.4.0
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Function} callback
  */
 Alchemy.setMethod(function onMulticast(type, callback) {
@@ -293,7 +291,7 @@ Alchemy.setMethod(function onMulticast(type, callback) {
 /**
  * Respond to discovery requests
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -317,7 +315,7 @@ mevents.on('discover_services', function gotDiscoverRequest(_requirements, packe
 /**
  * Detect instances with optional required services
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.0
  *
@@ -339,11 +337,11 @@ Alchemy.setMethod(function discover(requirements, callback) {
 /**
  * Configure a service
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.0
  *
- * @param    {String}   service_name
+ * @param    {string}   service_name
  * @param    {Object}   config
  */
 Alchemy.setMethod(function configureService(service_name, config) {
@@ -370,6 +368,6 @@ Alchemy.setMethod(function configureService(service_name, config) {
 	log.info('Service ' + JSON.stringify(service_name) + ' has been ' + status);
 });
 
-if (alchemy.settings.multicast_on_boot) {
+if (alchemy.settings.network.multicast_on_boot) {
 	alchemy.initMulticast();
 }

package/lib/core/middleware.js

@@ -1,5 +1,3 @@
-'use strict';
-
 var publicDirs = alchemy.shared('public.directories', new Deck()),
     scriptDirs = alchemy.shared('script.directories', new Deck()),
     assetDirs  = alchemy.shared('asset.directories', new Deck()),
@@ -9,7 +7,7 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     fontDirs   = alchemy.shared('font.directories', new Deck()),
     asset_cache= alchemy.getCache('files.assets'),
     fileCache  = alchemy.shared('files.fileCache'),
-    minifyMap  = alchemy.shared('files.minifyMap'),
+    minify_map = alchemy.shared('files.minifyMap', new Map()),
     Nodent     = alchemy.use('nodent-compiler'),
     Terser     = alchemy.use('terser'),
     libpath    = alchemy.use('path'),
@@ -26,11 +24,11 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     less,
     fs = alchemy.use('fs');
 
-if (alchemy.settings.css_less !== false) {
+if (alchemy.settings.frontend.stylesheet.enable_less !== false) {
 	less = alchemy.use('less');
 }
 
-if (alchemy.settings.css_sass) {
+if (alchemy.settings.frontend.stylesheet.enable_scss) {
 
 	// Try to use the embedded DART sass
 	sass = alchemy.use('sass-embedded');
@@ -88,12 +86,12 @@ if (alchemy.settings.css_sass) {
 	};
 }
 
-if (alchemy.settings.css_post !== false) {
+if (alchemy.settings.frontend.stylesheet.enable_post !== false) {
 	postcss = alchemy.use('postcss');
 	autoprefixer = alchemy.use('autoprefixer');
 }
 
-if (alchemy.settings.babel) {
+if (alchemy.settings.frontend.javascript.enable_babel) {
 	babel = alchemy.use('@babel/core');
 	babel_polyfill = alchemy.use('@babel/polyfill');
 	babel_preset = alchemy.use('@babel/preset-env');
@@ -104,7 +102,7 @@ if (alchemy.settings.babel) {
 /**
  * Get an array of paths, optionally replace text
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.3
  * @version  0.2.3
  */
@@ -126,7 +124,7 @@ function getMiddlePaths(paths, ext, new_ext) {
 /**
  * Less middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  */
@@ -267,13 +265,13 @@ Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
  * Sourcemap middleware:
  * Serve the original source files
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.0
  */
 Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
 
-	if (!alchemy.settings.debug) {
+	if (!alchemy.settings.debugging.debug) {
 		return nextMiddleware();
 	}
 
@@ -309,11 +307,11 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
 /**
  * Minify the given path, return a temp path
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.4.0
  *
- * @param    {String}   path
+ * @param    {string}   path
  * @param    {Object}   options
  * @param    {Function} callback
  */
@@ -325,13 +323,15 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 	}
 
 	// Leave early if minify_js is false en nodent is falsy
-	if (!alchemy.settings.minify_js && !options.add_async_support) {
+	if (!alchemy.settings.frontend.javascript.minify && !options.add_async_support) {
 		return callback();
 	}
 
+	let cached = minify_map.get(path);
+
 	// @TODO: take options.add_async_support into account
-	if (minifyMap[path]) {
-		return callback(null, minifyMap[path].path, minifyMap[path]);
+	if (cached) {
+		return callback(null, cached.path, cached);
 	}
 
 	fs.readFile(path, {encoding: 'utf8'}, function gotSource(err, data) {
@@ -406,11 +406,19 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 	}
 
 	async function serveCode(data) {
+		try {
+			await _serveCode(data);
+		} catch (err) {
+			return callback(err);
+		}
+	}
+
+	async function _serveCode(data) {
 
 		let result;
 		let should_minify = false;
 
-		if (alchemy.settings.minify_js) {
+		if (alchemy.settings.frontend.javascript.minify) {
 			let index = data.indexOf('@alchemy.minify.false');
 
 			if (index == -1 || index > 50) {
@@ -421,6 +429,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 		if (should_minify && typeof Terser?.minify == 'function') {
 
 			// Force Blast.isNode & Blast.isBrowser to be replaced later
+			data = data.replaceAll('Blast.isServer', '__BLAST_IS_SERVER');
 			data = data.replaceAll('Blast.isNode', '__BLAST_IS_NODE');
 			data = data.replaceAll('Blast.isBrowser', '__BLAST_IS_BROWSER');
 
@@ -439,7 +448,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 					hoist_funs      : false,
 
 					// Only drop console calls when not debugging
-					drop_console    : !alchemy.settings.debug,
+					drop_console    : !alchemy.settings.debugging.debug,
 
 					// Remove dead code
 					dead_code       : true,
@@ -450,6 +459,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 					// Provide it some info on global definitions
 					global_defs     : {
 						'__BLAST_IS_NODE'    : false,
+						'__BLAST_IS_SERVER'  : false,
 						'__BLAST_IS_BROWSER' : true
 					}
 				},
@@ -463,8 +473,8 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 				},
 			};
 
-			if (alchemy.settings.debug && alchemy.settings.source_map) {
-				console.warn('Source maps have been disabled because alchemy.settings.minify_js is true');
+			if (alchemy.settings.debugging.debug && alchemy.settings.debugging.create_source_map) {
+				console.warn('Source maps have been disabled because alchemy.settings.frontend.javascript.minify is true');
 				/*minify_options.sourceMap = {
 					url: 'inline'
 				};*/
@@ -487,6 +497,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			if (result.code.indexOf('__BLAST_IS_') > -1) {
 				// Restore some instances in case these weren't removed by Terser
 				// (Maybe because they're part of another variable or a string)
+				result = result.code.replaceAll('__BLAST_IS_SERVER', 'Blast.isServer');
 				result = result.code.replaceAll('__BLAST_IS_NODE', 'Blast.isNode');
 				result = result.replaceAll('__BLAST_IS_BROWSER', 'Blast.isBrowser');
 			} else {
@@ -522,7 +533,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 						return callback(err);
 					}
 
-					minifyMap[path] = info;
+					minify_map.set(path, info);
 
 					// Callback with the path and the full info object
 					// of the temporary file
@@ -536,7 +547,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 /**
  * Script middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  */
@@ -613,8 +624,8 @@ Alchemy.setMethod(function scriptMiddleware(req, res, nextMiddleware) {
 					asset_cache.remove(req.url);
 				}
 
-				if (source && minifyMap[source.path]) {
-					minifyMap[source.path] = null;
+				if (source && minify_map.has(source.path)) {
+					minify_map.delete(source.path);
 				}
 
 				alchemy.scriptMiddleware(req, res, nextMiddleware);
@@ -626,7 +637,7 @@ Alchemy.setMethod(function scriptMiddleware(req, res, nextMiddleware) {
 /**
  * Font middleware
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
  * @version  1.1.3
  */
@@ -638,7 +649,7 @@ Alchemy.setMethod(function fontMiddleware(req, res, nextMiddleware) {
 /**
  * Public files middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
@@ -650,7 +661,7 @@ Alchemy.setMethod(function publicMiddleware(req, res, nextMiddleware) {
 /**
  * Generic asset middleware
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
  * @version  1.1.3
  */
@@ -690,7 +701,7 @@ Alchemy.setMethod(function assetInDirsMiddleware(req, res, directories, nextMidd
 /**
  * Root files middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  */
@@ -743,11 +754,11 @@ Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
 /**
  * Look for assetFile in the given directories
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}     image_path
+ * @param    {string}     image_path
  * @param    {Function}   callback
  *
  * @return   {Pledge}
@@ -764,7 +775,7 @@ Alchemy.setMethod(function findImagePath(image_path, callback) {
 
 		let id = 'image-' + image_path;
 
-		if (alchemy.settings.cache && asset_cache.has(id)) {
+		if (alchemy.settings.performance.cache && asset_cache.has(id)) {
 			pledge.resolve(asset_cache.get(id).path);
 		} else {
 
@@ -786,12 +797,12 @@ Alchemy.setMethod(function findImagePath(image_path, callback) {
 /**
  * Look for assetFile in the given directories
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.2
  *
- * @param    {String}       assetFile     The full filename to look for
- * @param    {Deck|String}  directories   The directories to look in (or subdir of "assets")
+ * @param    {string}       assetFile     The full filename to look for
+ * @param    {Deck|string}  directories   The directories to look in (or subdir of "assets")
  * @param    {Function}     callback
  */
 Alchemy.setMethod(function findAssetPath(assetFile, directories, callback) {
@@ -923,11 +934,11 @@ Alchemy.setMethod(function findAssetPath(assetFile, directories, callback) {
 /**
  * Apply postCss
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  1.0.5
  *
- * @param    {String}     css
+ * @param    {string}     css
  * @param    {Function}   callback
  */
 function doPostCss(css, callback) {
@@ -941,7 +952,7 @@ function doPostCss(css, callback) {
 /**
  * Callback with the compiled CSS filepath
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  */
@@ -949,7 +960,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
 
 	// If it has been compiled before, return that
 	// @todo: check timestamps on dev. Not-founds are not cached
-	if (alchemy.settings.cache && fileCache[lessPath]) {
+	if (alchemy.settings.performance.cache && fileCache[lessPath]) {
 		return setImmediate(function lessCache(){callback(null, fileCache[lessPath])});
 	}
 
@@ -974,7 +985,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
 
 		render_options = {
 			paths: import_paths,
-			compress: alchemy.settings.minify_css
+			compress: alchemy.settings.frontend.stylesheet.minify,
 		};
 
 		// @todo: source maps. Compression. Everything
@@ -1041,7 +1052,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
 /**
  * Callback with the compiled CSS filepath
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.2.5
  */
@@ -1049,7 +1060,7 @@ Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 
 	// If it has been compiled before, return that
 	// @todo: check timestamps on dev. Not-founds are not cached
-	if (alchemy.settings.cache && fileCache[sassPath]) {
+	if (alchemy.settings.performance.cache && fileCache[sassPath]) {
 		return setImmediate(function lessCache(){callback(null, fileCache[sassPath])});
 	}
 
@@ -1072,7 +1083,7 @@ Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 			functions      : sass_functions,
 		};
 
-		if (alchemy.settings.debug) {
+		if (alchemy.settings.debugging.debug) {
 			render_options.file = sassPath;
 			render_options.sourceMap      = 'out.css.map';
 			render_options.sourceMapContents = true;