alchemymvc 1.3.3 → 1.3.4

package/lib/app/conduit/http_conduit.js

@@ -151,7 +151,7 @@ HttpConduit.setMethod(async function initHttp(req, res, router) {
 /**
  * Get the original url path
  *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -166,7 +166,7 @@ HttpConduit.setProperty(function original_path() {
 /**
  * Get the original url pathname
  *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *

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.5
+ * @version  1.3.4
  *
  * @param   {Model}     model
  * @param   {Criteria}  criteria
@@ -26,13 +26,13 @@ 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);
 	}
 
+	criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria, model);
+
 	let page_size = criteria.options.page_size || 10,
 	    skipless = criteria.options.skipless,
 		last_id,

package/lib/app/helper_model/criteria.js

@@ -3,15 +3,20 @@ const AUGMENTED = Symbol('AUGMENTED');
 /**
  * The Criteria class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.4
+ *
+ * @param    {Model}   model
  */
-var Criteria = Function.inherits('Alchemy.Base', 'Alchemy.Criteria', function Criteria() {
+var Criteria = Function.inherits('Alchemy.Base', 'Alchemy.Criteria', function Criteria(model) {
 
 	// The current active group
 	this.group = null;
 
+	// The model
+	this.model = model;
+
 	// All the created expressions
 	this.all_expressions = [];
 
@@ -58,19 +63,20 @@ Criteria.setStatic(function isCriteria(instance) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.2.5
+ * @version  1.3.4
  *
- * @param    {Object}   obj
+ * @param    {Object}   obj     The thing that should be a criteria
+ * @param    {Model}    model   The model that it probably belongs to
  *
  * @return   {Criteria}
  */
-Criteria.setStatic(function cast(obj) {
+Criteria.setStatic(function cast(obj, model) {
 
 	if (Criteria.isCriteria(obj)) {
 		return obj;
 	}
 
-	let instance = new Criteria();
+	let instance = new Criteria(model);
 
 	if (obj) {
 		instance.applyOldOptions(obj);
@@ -1456,9 +1462,9 @@ Select.setMethod(Blast.checksumSymbol, function toChecksum() {
 /**
  * Add an association
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.2.0
+ * @version  1.3.4
  *
  * @param    {String}   name
  *
@@ -1466,6 +1472,10 @@ Select.setMethod(Blast.checksumSymbol, function toChecksum() {
  */
 Select.setMethod(function addAssociation(name) {
 
+	if (!this.criteria?.model) {
+		throw new Error('Unable to select an association: this Criteria has no model info');
+	}
+
 	var pieces;
 
 	if (!this.associations) {

package/lib/app/helper_model/document_list.js

@@ -183,9 +183,9 @@ DocumentList.setMethod(function toDry() {
 /**
  * Simplify the object for Hawkejs
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.1.3
+ * @version  1.3.4
  *
  * @param    {WeakMap}   wm
  *
@@ -196,6 +196,8 @@ DocumentList.setMethod(function toHawkejs(wm) {
 	let records = JSON.clone(this.records, 'toHawkejs', wm),
 	    result = new Blast.Classes.Alchemy.Client.DocumentList(records);
 
+	result.available = this.available;
+
 	if (this.options && this.options.options) {
 		let options = JSON.clone(this.options.options, 'toHawkejs', wm);
 		result.options = {options: options};

package/lib/app/helper_model/model.js

@@ -599,7 +599,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.3.0
+ * @version  1.3.4
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -610,9 +610,7 @@ Model.setMethod(function getAliasModel(alias) {
 Model.setMethod(function find(type, criteria, callback) {
 
 	if (arguments.length == 0) {
-		criteria = new Blast.Classes.Alchemy.Criteria();
-		criteria.model = this;
-		return criteria;
+		return new Blast.Classes.Alchemy.Criteria(this);
 	}
 
 	let skip_type,
@@ -645,7 +643,7 @@ Model.setMethod(function find(type, criteria, callback) {
 	}
 
 	try {
-		criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria);
+		criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria, this);
 	} catch (err) {
 		error = err;
 	}
@@ -826,7 +824,7 @@ Model.setMethod(function findById(id, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.3.4
  *
  * @param    {String|ObjectId}   pk        The primary key value
  * @param    {Object}            options   Optional options object
@@ -842,7 +840,7 @@ Model.setMethod(function findByPk(pk, options, callback) {
 		return pledge;
 	}
 
-	let criteria = new Blast.Classes.Alchemy.Criteria();
+	let criteria = new Blast.Classes.Alchemy.Criteria(this);
 
 	criteria.where(this.primary_key).equals(pk);
 
@@ -860,7 +858,7 @@ Model.setMethod(function findByPk(pk, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.4
  *
  * @param    {Object}    values       The values to look for
  * @param    {Object}    options      Optional options object
@@ -869,7 +867,7 @@ Model.setMethod(function findByPk(pk, options, callback) {
  */
 Model.setMethod(function findByValues(values, options) {
 
-	var criteria = new Blast.Classes.Alchemy.Criteria(),
+	var criteria = new Blast.Classes.Alchemy.Criteria(this),
 	    key;
 
 	if (options) {
@@ -888,7 +886,7 @@ Model.setMethod(function findByValues(values, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.4
  *
  * @param    {Object}    values       The values to look for
  * @param    {Object}    options      Optional options object
@@ -897,7 +895,7 @@ Model.setMethod(function findByValues(values, options) {
  */
 Model.setMethod(function findAllByValues(values, options) {
 
-	var criteria = new Blast.Classes.Alchemy.Criteria(),
+	var criteria = new Blast.Classes.Alchemy.Criteria(this),
 	    key;
 
 	if (options) {

package/lib/class/conduit.js

@@ -1505,7 +1505,7 @@ Conduit.setMethod(function redirect(status, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.4
  *
  * @param    {Nulber}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
@@ -1551,7 +1551,7 @@ Conduit.setMethod(function error(status, message, print_error) {
 
 	if (print_dev) {
 		let subject = 'Error found on ' + this.original_path + '';
-		log.error(subject + ':\n' + message, this);
+		log.error(subject, message, this);
 	} else if (print_error) {
 		let subject = 'Error found on ' + this.original_path + '';
 
@@ -1646,7 +1646,7 @@ Conduit.setMethod(function notAuthorized(tried_auth) {
  * The current user is authenticated, but not allowed
  * (Default implementation, is overriden by the acl plugin)
  *
- * @author        Jelle De Loecker   <jelle@kipdola.be>
+ * @author        Jelle De Loecker   <jelle@elevenways.be>
  * @since         1.0.7
  * @version       1.1.0
  */

package/lib/class/document.js

@@ -573,7 +573,7 @@ Document.setMethod(function remove(callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.3
- * @version  1.2.3
+ * @version  1.3.4
  *
  * @param    {Criteria|String} criteria
  *
@@ -598,7 +598,7 @@ Document.setMethod(function preparePopulationCriteria(criteria) {
 	}
 
 	if (!Classes.Alchemy.Criteria.Criteria.isCriteria(criteria)) {
-		let new_criteria = new Classes.Alchemy.Criteria();
+		let new_criteria = new Classes.Alchemy.Criteria(model);
 		new_criteria.model = model;
 		new_criteria.applyOldConditions(criteria);
 		criteria = new_criteria;
@@ -780,7 +780,7 @@ Document.setMethod(async function revertTo(revision_id) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.3
- * @version  1.1.0
+ * @version  1.3.4
  *
  * @param    {Number}   revisions
  *
@@ -813,7 +813,7 @@ Document.setMethod(function revert(revisions) {
 		    record,
 		    i;
 
-		criteria = new Blast.Classes.Alchemy.Criteria();
+		criteria = revision_model.find();
 		criteria.where('record_id', that.$pk);
 		criteria.where('revision').gt(target_revision).lte(that.__r);
 		criteria.sort({revision: -1});

package/lib/class/schema.js

@@ -35,6 +35,24 @@ var Schema = Function.inherits(['Deck', 'Alchemy.Base'], function Schema(parent)
 	this.init();
 });
 
+/**
+ * Add a relation creator method
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.4
+ * @version  1.3.4
+ *
+ * @param    {String}   relation_type
+ */
+Schema.setStatic(function addRelationCreator(relation_type, relation_config) {
+
+	let method_name = relation_type[0].toLowerCase() + relation_type.slice(1);
+
+	this.setMethod(method_name, function _addAssociation(alias, model_name, options) {
+		this.addAssociation(relation_type, relation_config, alias, model_name, options);
+	});
+});
+
 /**
  * Revive a dried schema
  *
@@ -224,129 +242,44 @@ Schema.setMethod(function getDatasource() {
 	});
 });
 
-/**
- * Conform association arguments
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.0
- *
- * @param    {String}   locality       internal or external
- * @param    {String}   _alias
- * @param    {String}   _modelname
- * @param    {Object}   _options
- */
-Schema.setMethod(function getAssociationArguments(locality, alias, modelName, options) {
-
-	if (Object.isObject(modelName)) {
-		options = modelName;
-		modelName = undefined;
-	} else if (!Object.isObject(options)) {
-		options = {};
-	}
-
-	if (typeof modelName === 'undefined') {
-		modelName = alias;
-	}
-
-	if (options.localKey && typeof options.localKey == 'object') {
-		throw new Error('Local key for ' + alias + ' association can not be an object');
-	}
-
-	if (options.foreignKey && typeof options.foreignKey == 'object') {
-		throw new Error('Foreign key for ' + alias + ' association can not be an object');
-	}
-
-	if (locality == 'internal') {
-
-		if (!options.localKey) {
-			options.localKey = alias.foreign_key();
-		}
-
-		if (!options.foreignKey) {
-			let model = this.getModel(modelName);
-			options.foreignKey = model.primary_key || '_id';
-		}
-	} else {
-
-		if (!options.localKey) {
-			let model = this.getModel(modelName);
-			options.localKey = model.primary_key || '_id';
-		}
-
-		if (!options.foreignKey) {
-			options.foreignKey = this.name.foreign_key();
-		}
-	}
-
-	return {alias: alias, modelName: modelName, options: options}
-});
-
 /**
  * Add an association
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.3.4
  *
  * @param    {String}   alias
+ * @param    {Object}   relation_config
  * @param    {String}   modelname
  * @param    {Object}   options
  *
  * @return   {Object}
  */
-Schema.setMethod(function addAssociation(type, alias, modelName, options) {
-
-	var constructor,
-	    client_doc,
-	    doc_class,
-	    className,
-	    locality,
-	    singular,
-	    path,
-	    args;
+Schema.setMethod(function addAssociation(type, relation_config, alias, modelName, options) {
 
 	if (this.name === alias) {
 		throw new Error('Can\'t add  association with the same name as current model');
 	}
 
-	// Determine the locality
-	switch (type) {
-		case 'HasOneParent':
-		case 'HasAndBelongsToMany':
-		case 'BelongsTo':
-			locality = 'internal';
-			break;
-
-		case 'HasMany':
-		case 'HasOneChild':
-			locality = 'external';
-			break;
-
-		default:
-			throw new TypeError('Association type "' + type + '" does not exist');
-	}
+	let is_internal = relation_config.internal === true,
+	    is_singular = relation_config.singular === true;
 
-	// Determine if it's a single record to be found
-	switch (type) {
-		case 'HasOneParent':
-		case 'HasOneChild':
-		case 'BelongsTo':
-		case 'HasOne':
-			singular = true;
-			break;
-
-		default:
-			singular = false;
-	}
+	let constructor,
+	    client_doc,
+	    doc_class,
+	    className,
+	    locality,
+	    singular,
+	    path;
 
-	args = this.getAssociationArguments(locality, alias, modelName, options);
+	let args = this.getAssociationArguments(is_internal, alias, modelName, options);
 	args.type = type;
 
 	alias = args.alias;
 	modelName = args.modelName;
 	options = args.options;
-	options.singular = singular;
+	options.singular = is_singular;
 	className = this.model_name;
 
 	if (this.namespace) {
@@ -366,7 +299,7 @@ Schema.setMethod(function addAssociation(type, alias, modelName, options) {
 	}
 
 	// If the key is part of this model, make sure the field is added
-	if (locality == 'internal') {
+	if (is_internal) {
 
 		if (!this.getField(options.localKey)) {
 			let field_options = Object.assign({}, args);
@@ -441,81 +374,6 @@ Schema.setMethod(function setEnumValues(name, values) {
 	this.enum_values[name] = values;
 });
 
-/**
- * Add a belongsTo association
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   alias
- * @param    {String}   modelname
- * @param    {Object}   options
- */
-Schema.setMethod(function belongsTo(alias, modelName, options) {
-	this.addAssociation('BelongsTo', alias, modelName, options);
-});
-
-/**
- * Add a hasOneParent association
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   alias
- * @param    {String}   modelname
- * @param    {Object}   options
- */
-Schema.setMethod(function hasOneParent(alias, modelName, options) {
-	this.addAssociation('HasOneParent', alias, modelName, options);
-});
-
-/**
- * Add a HABTM association
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   alias
- * @param    {String}   modelname
- * @param    {Object}   options
- */
-Schema.setMethod(function hasAndBelongsToMany(alias, modelName, options) {
-	this.addAssociation('HasAndBelongsToMany', alias, modelName, options);
-});
-
-/**
- * Add a hasMany association
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   alias
- * @param    {String}   modelname
- * @param    {Object}   options
- */
-Schema.setMethod(function hasMany(alias, modelName, options) {
-	this.addAssociation('HasMany', alias, modelName, options);
-});
-
-/**
- * Add a hasOneChild association
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   alias
- * @param    {String}   modelname
- * @param    {Object}   options
- */
-Schema.setMethod(function hasOneChild(alias, modelName, options) {
-	this.addAssociation('HasOneChild', alias, modelName, options);
-});
-
 /**
  * Clone
  *

package/lib/class/schema_client.js

@@ -10,7 +10,7 @@
  *
  * @param    {Schema}   parent
  */
-var Schema = Function.inherits(['Deck', 'Alchemy.Client.Base'], 'Alchemy.Client', function Schema(parent) {
+const Schema = Function.inherits(['Deck', 'Alchemy.Client.Base'], 'Alchemy.Client', function Schema(parent) {
 
 	Blast.Classes.Deck.call(this);
 	Schema.super.call(this);
@@ -18,6 +18,24 @@ var Schema = Function.inherits(['Deck', 'Alchemy.Client.Base'], 'Alchemy.Client'
 	this.init();
 });
 
+/**
+ * Add a relation creator method
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.4
+ * @version  1.3.4
+ *
+ * @param    {String}   relation_type
+ */
+Schema.setStatic(function addRelationCreator(relation_type, relation_config) {
+
+	let method_name = relation_type[0].toLowerCase() + relation_type.slice(1);
+
+	this.setMethod(method_name, function _addAssociation(alias, model_name, options) {
+		this.addAssociation(relation_type, relation_config, alias, model_name, options);
+	});
+});
+
 /**
  * Is the given variable a schema?
  *
@@ -147,6 +165,144 @@ Schema.setProperty(function has_translatable_fields() {
 	return this.has_translations;
 });
 
+/**
+ * Add the relationships
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.4
+ */
+Schema.addRelationCreator('BelongsTo',           {internal: true,  singular: true});
+Schema.addRelationCreator('HasOneParent',        {internal: true,  singular: true});
+Schema.addRelationCreator('HasAndBelongsToMany', {internal: true,  singular: false});
+Schema.addRelationCreator('HasMany',             {internal: false, singular: false});
+Schema.addRelationCreator('HasOneChild',         {internal: false, singular: true});
+
+/**
+ * Browser-side association adder
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.4
+ * @version  1.3.4
+ *
+ * @param    {String}   alias
+ * @param    {String}   modelname
+ * @param    {Object}   options
+ *
+ * @return   {Object}
+ */
+Schema.setMethod(function addAssociation(relation_type, relation_config, alias, model_name, options) {
+
+	if (!options) {
+		options = {};
+	}
+
+	let is_internal = relation_config.internal === true,
+	    is_singular = relation_config.singular === true;
+
+	let args = this.getAssociationArguments(is_internal, alias, model_name, options);
+	alias = args.alias;
+	model_name = args.model_name;
+
+	let class_name = this.model_name || model_name,
+	    client_doc,
+	    path;
+
+	if (this.namespace) {
+		path = this.namespace + '.' + class_name;
+	} else {
+		path = class_name;
+	}
+
+	client_doc = Classes.Alchemy.Client.Document.Document.getDocumentClass(class_name);
+
+	if (is_internal) {
+		if (!this.getField(options.local_key)) {
+			let field_options = {...args};
+
+			if (options && options.field_options) {
+				Object.assign(field_options, options.field_options);
+				field_options.field_options = undefined;
+			}
+
+			this.addField(options.local_key, relation_type, field_options);
+		}
+	}
+
+	if (client_doc) {
+		client_doc.setAliasGetter(alias);
+	}
+});
+
+/**
+ * Conform association arguments
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.4
+ *
+ * @param    {Boolean}  is_internal      Is this internal (A remote record's id is stored inside this record)
+ * @param    {String}   alias
+ * @param    {String}   model_name
+ * @param    {Object}   options
+ */
+Schema.setMethod(function getAssociationArguments(is_internal, alias, model_name, options) {
+
+	if (Object.isObject(model_name)) {
+		options = model_name;
+		model_name = undefined;
+	} else if (!Object.isObject(options)) {
+		options = {};
+	}
+
+	if (typeof model_name === 'undefined') {
+		model_name = alias;
+	}
+
+	let local_key   = options.local_key || options.localKey || false,
+	    foreign_key = options.foreign_key || options.foreignKey || false;
+
+	if (typeof local_key == 'object') {
+		throw new Error('Local key for ' + alias + ' association can not be an object');
+	}
+
+	if (typeof foreign_key == 'object') {
+		throw new Error('Foreign key for ' + alias + ' association can not be an object');
+	}
+
+	if (is_internal) {
+
+		if (!local_key) {
+			local_key = alias.foreign_key();
+		}
+
+		if (!foreign_key) {
+			let model = this.getModel(model_name);
+			foreign_key = model.primary_key || '_id';
+		}
+	} else {
+
+		if (!local_key) {
+			let model = this.getModel(model_name);
+			local_key = model.primary_key || '_id';
+		}
+
+		if (!foreign_key) {
+			foreign_key = this.name.foreign_key();
+		}
+	}
+
+	options.local_key = options.localKey = local_key;
+	options.foreign_key = options.foreignKey = foreign_key;
+
+	return {
+		alias      : alias,
+		model_name,
+		modelName  : model_name,
+		options    : options
+	};
+});
+
 /**
  * Clone for JSON-Dry (JSON.clone())
  *

package/lib/class/sitemap.js

@@ -346,4 +346,61 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 
 		this.addUrl(config.category, url, route_config, prefix);
 	}
+});
+
+/**
+ * Create an XML builder
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.4
+ * @version  1.3.4
+ *
+ * @return   {Hawkejs.Builder}
+ */
+Sitemap.setMethod(function getXmlBuilder() {
+
+	let xml = Classes.Hawkejs.Builder.create({xml: true}),
+	    urlset = xml.ele('urlset');
+	
+	urlset.att('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+	      .att('xmlns:image', 'http://www.google.com/schemas/sitemap-image/1.1')
+	      .att('xsi:schemaLocation', 'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd http://www.google.com/schemas/sitemap-image/1.1 http://www.google.com/schemas/sitemap-image/1.1/sitemap-image.xsd')
+	      .att('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9');
+	
+	let categories = this.getCategories();
+
+	for (let category of categories) {
+		for (let info of category) {
+			let url = urlset.ele(url);
+
+			url.ele('loc').txt(info.url);
+
+			if (info.lastmod) {
+				url.ele('lastmod').txt(info.lastmod);
+			}
+
+			if (info.changefreq) {
+				url.ele('changefreq').txt(info.changefreq);
+			}
+
+			if (info.priority) {
+				url.ele('priority').txt(info.priority);
+			}
+		}
+	}
+
+	return xml;
+});
+
+/**
+ * Get the XML representation
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.4
+ * @version  1.3.4
+ *
+ * @return   {String}
+ */
+Sitemap.setMethod(function getXml() {
+	return this.getXmlBuilder().end();
 });

package/lib/core/middleware.js

@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.3
+ * @version  1.3.4
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -407,9 +407,18 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 
 	async function serveCode(data) {
 
-		var result;
+		let result;
+		let should_minify = false;
 
 		if (alchemy.settings.minify_js) {
+			let index = data.indexOf('@alchemy.minify.false');
+
+			if (index == -1 || index > 50) {
+				should_minify = true;
+			}
+		}
+
+		if (should_minify) {
 
 			// Force Blast.isNode & Blast.isBrowser to be replaced later
 			data = data.replaceAll('Blast.isNode', '__BLAST_IS_NODE');

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.3",
+	"version": "1.3.4",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~2.0.1",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.3",
+		"hawkejs"          : "~2.3.4",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",