alchemymvc 1.3.3 → 1.3.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 Jelle De Loecker <jelle@develry.be>
+Copyright (c) 2013-2023 Jelle De Loecker <jelle@elevenways.be>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="https://protoblast.develry.be/media/static/alchemy-small.png" width=30 alt="Alchemy logo"/>
+  <img src="https://protoblast.elevenways.be/media/static/alchemy-small.png" width=30 alt="Alchemy logo"/>
   <b>Alchemy</b>
 </h1>
 <div align="center">
@@ -8,24 +8,14 @@
     <img src="https://travis-ci.org/11ways/alchemy.svg?branch=master" alt="Mac/Linux Build Status" />
   </a>
 
-  <!-- CI - AppVeyor -->
-  <a href="https://ci.appveyor.com/project/skerit/alchemy">
-    <img src="https://img.shields.io/appveyor/ci/skerit/alchemy/master.svg?label=Windows" alt="Windows Build status" />
-  </a>
-
   <!-- Coverage - Codecov -->
   <a href="https://codecov.io/gh/11ways/alchemy">
     <img src="https://img.shields.io/codecov/c/github/11ways/alchemy/master.svg" alt="Codecov Coverage report" />
   </a>
 
   <!-- DM - Snyk -->
-  <a href="https://snyk.io/test/github/skerit/alchemy?targetFile=package.json">
-    <img src="https://snyk.io/test/github/skerit/alchemy/badge.svg?targetFile=package.json" alt="Known Vulnerabilities" />
-  </a>
-
-  <!-- DM - David -->
-  <a href="https://david-dm.org/skerit/alchemy">
-    <img src="https://david-dm.org/skerit/alchemy/status.svg" alt="Dependency Status" />
+  <a href="https://snyk.io/test/github/11ways/alchemy?targetFile=package.json">
+    <img src="https://snyk.io/test/github/11ways/alchemy/badge.svg?targetFile=package.json" alt="Known Vulnerabilities" />
   </a>
 </div>
 
@@ -69,55 +59,8 @@ Just installing the npm package can be done like this:
 
 # Quick start guide
 
-Alchemy makes heavy use of the **Protoblast** utility library, which extends the native objects with many new methods.
-Especially the `Function.inherits()` method is interesting, as that is the basis for the Alchemy class system.
-You can find extensive documentation on the library here: [https://protoblast.develry.be](https://protoblast.develry.be)
-
-## File structure
-
-All of your project code should go into an `app` directory.
-That directory can contain many subdirectories. Most of those files are auto-required on boot.
-
-The directories (and some of their basic files) are:
-
-* **assets**:
-  * **images**: Static images
-  * **scripts**: Client-side only javascript files. Accessible through `/scripts/` url.
-  * **stylesheets**: SCSS and LESS stylesheet files. Accessible through `/stylesheets/` url.
-* **config**:
-  * **bootstrap.js**: Place where all plugins should be loaded
-  * **default.js**: Default configuration
-  * **local.js**: Configuration file that overrides all others. Is required for the `environment` definition. Should not be checked into git.
-  * **prefixes.js**: Place to define which prefixes (locales/languages) are used on the site
-  * **routes.js**: Routes should be defined here
-* **controller**:
-  * **app_controller.js**: Basic controller instance your other controllers should inherit from
-* **element**:
-  * **app_element.js**: Basic custom element your other custom elements should inherit from.
-* **helper**:
-  * **app_helper.js**: Basic helper your other helpers should inherit from.
-* **lib**:
-  * Put classes here that are only needed on the server.
-* **model**:
-  * **app_model.js**: Basic model your other models should inherit from.
-* **public**:
-  * Files put in here will be publicly available under the `/public/` url.
-* **root**:
-  * Files put in here will be publicly available under the root url (So `/`)
-* **view**:
-  * Template files go in here, preferably with a `.hwk` extension, though regular `.ejs` files also work.
-
-## Code convention
-
-### Naming:
-
-* Class names are written using upper camel case: **MyClassName**
-* Method names are written using lower camel case: **myMethodName**
-* Property names and variables are written using snake case: **my_property_name**
-
-### Whitespaces
-
-* Tabs are used for indentations, spaces are used for positioning.
+You can find all the documentation on [https://alchemy.elevenways.be](https://alchemy.elevenways.be)
+
 
 ## Base class
 

package/lib/app/assets/stylesheets/alchemy-info.less

@@ -25,6 +25,8 @@ body {
 .row {
 	display: flex;
 	margin-bottom: 2rem;
+	flex-flow: wrap;
+	gap: 2rem;
 }
 
 .col {
@@ -32,10 +34,6 @@ body {
 	background: #E8F3F8;
 }
 
-.col:not(:last-child) {
-	margin-right: 2rem;
-}
-
 .header-image {
 	box-shadow: #000 1px 1px 3px;
 	background: #0B486B;
@@ -56,6 +54,17 @@ body {
 	}
 }
 
+tr:nth-child(even) {
+	td {
+		background-color: rgba(100, 100, 100, 0.1);
+	}
+}
+
+td {
+	vertical-align: top;
+	padding: 1rem 0.2rem;
+}
+
 .package-description {
 	max-width: 350px;
 }
@@ -72,6 +81,10 @@ body {
 			margin-top: 0;
 		}
 	}
+
+	@media screen and (max-width: 1500px)  {
+		padding: 2rem 1rem;
+	}
 }
 
 .engine {
@@ -129,13 +142,18 @@ li.failed::before {
 }
 
 .settings {
-	max-width: 50%;
 
 	th {
 		text-align: left;
 		border-bottom: 1px solid black;
 	}
 
+	table {
+		width: 100%;
+	}
+}
+
+.table-wrap {
 	table {
 		width: 100%;
 	}

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/controller/alchemy_info_controller.js

@@ -17,7 +17,7 @@ var Info = Function.inherits('Alchemy.Controller.App', function AlchemyInfo(cond
  *
  * @author   Jelle De Loecker       <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.5
  */
 Info.setMethod(function setInfoVariables() {
 
@@ -30,7 +30,7 @@ Info.setMethod(function setInfoVariables() {
 	Object.each(Datasource.get(), function eachDatasource(datasource, key) {
 		data_sources[key] = {
 			type: datasource.constructor.name,
-			error: datasource.connectionError
+			error: datasource.connection_error
 		};
 	});
 

package/lib/app/helper/socket_helper.js

@@ -311,16 +311,16 @@ Client.setMethod(function createStream() {
 /**
  * Make the actual connection
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     0.2.0
- * @version   1.0.5
+ * @version   1.3.5
  *
  * @param    {Function} callback
  */
 Client.setMethod(function connect(address, data, callback) {
 
-	var that = this,
-	    ioServer,
+	let that = this,
+	    io_client,
 	    serverstream,
 	    config = {},
 	    server;
@@ -339,9 +339,9 @@ Client.setMethod(function connect(address, data, callback) {
 	}
 
 	if (typeof io != 'undefined') {
-		ioServer = io;
+		io_client = io;
 	} else if (typeof alchemy != 'undefined') {
-		ioServer = alchemy.use('socket.io-client');
+		io_client = alchemy.use('socket.io-client');
 	} else {
 		return callback(new Error('Could not find socket.io client library'));
 	}
@@ -362,11 +362,19 @@ Client.setMethod(function connect(address, data, callback) {
 		config.reconnection = false;
 	}
 
+	if (Blast.isNode) {
+		let msgpack_parser = alchemy.use('socket.io-msgpack-parser');
+
+		if (msgpack_parser) {
+			config.parser = msgpack_parser;
+		}
+	}
+
 	// Create the connection to the server
 	if (address) {
-		server = ioServer.connect(address, config);
+		server = io_client(address, config);
 	} else {
-		server = ioServer.connect(config);
+		server = io_client(config);
 	}
 
 	if (Blast.isNode) {

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/app/view/alchemy/info.hwk

@@ -5,6 +5,8 @@
 		<% set_title('Alchemy Info Page') %>
 		<% this.foundation({protoblast: true}) %>
 		<% style('alchemy-info') %>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	</head>
 	<body>
 
@@ -64,11 +66,25 @@
 				<div class="row">
 					<article class="plugins col">
 						<h1>Plugins</h1>
-						<ul>
-							{% each plugins as plugin %}
+						{% with plugins as plugin %}
+
+							{% none %}
+								<p class="none">No plugins are loaded</p>
+							{% /none %}
+
+							{% all %}
+								<ul>
+							{% /all %}
+
+							{% each %}
 								<li>{{ plugin }}</li>
 							{% /each %}
-						</ul>
+
+							{% all %}
+								</ul>
+							{% /all %}
+
+						{% /with %}
 					</article>
 
 					<article class="settings col">

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/lib/core/socket.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var types     = alchemy.shared('Socket.types'),
+let msgpack_parser,
     iostream,
+    types     = alchemy.shared('Socket.types'),
     path      = alchemy.use('path'),
     fs        = alchemy.use('fs');
 
@@ -10,16 +11,12 @@ var types     = alchemy.shared('Socket.types'),
  * 
  * Create the socket.io listener
  *
- * @author        Jelle De Loecker   <jelle@develry.be>
+ * @author        Jelle De Loecker   <jelle@elevenways.be>
  * @since         0.1.0
- * @version       1.1.3
+ * @version       1.3.5
  */
 alchemy.sputnik.add(function socket() {
 
-	var clientPath,
-	    streamPath,
-	    io;
-
 	if (!alchemy.settings.websockets) {
 		log.info('Websockets have been disabled');
 		return;
@@ -31,36 +28,50 @@ alchemy.sputnik.add(function socket() {
 		}
 	}
 
-	io = alchemy.use('socket.io');
+	const socket_io = alchemy.use('socket.io');
 
-	if (!io) {
+	if (!socket_io) {
 		return log.error('Could not load socket.io!');
 	}
 
 	iostream = alchemy.use('socket.io-stream');
+	msgpack_parser = alchemy.use('socket.io-msgpack-parser');
+
+	let socket_io_options = {
+		serveClient : false,
+	};
+
+	if (msgpack_parser) {
+		socket_io_options.parser = msgpack_parser;
+	}
 
 	// Create the Socket.io listener
-	alchemy.io = io.listen(alchemy.server, {serveClient: false});
+	alchemy.io = socket_io(alchemy.server, socket_io_options);
 
 	// Get the core client path
-	clientPath = path.dirname(alchemy.findModule('socket.io-client').module_path);
-	clientPath = path.resolve(clientPath, '..', 'dist', 'socket.io.slim.js');
+	let client_path = alchemy.findModule('socket.io-client').module_dir;
+
+	if (msgpack_parser) {
+		client_path = path.join(client_path, 'dist', 'socket.io.msgpack.min.js');
+	} else {
+		client_path = path.join(client_path, 'dist', 'socket.io.min.js');
+	}
 
 	// Get the stream client path
-	streamPath = path.dirname(alchemy.findModule('@11ways/socket.io-stream').module_path);
-	streamPath = path.resolve(streamPath, 'socket.io-stream.js');
+	let stream_path = path.dirname(alchemy.findModule('@11ways/socket.io-stream').module_path);
+	stream_path = path.resolve(stream_path, 'socket.io-stream.js');
 
 	// Serve the socket io core file
 	Router.use('/scripts/socket.io.js', function getSocketIo(req, res, next) {
-		alchemy.minifyScript(clientPath, function gotMinifiedPath(err, mpath) {
-			req.conduit.serveFile(mpath || clientPath);
+		alchemy.minifyScript(client_path, function gotMinifiedPath(err, mpath) {
+			req.conduit.serveFile(mpath || client_path);
 		});
 	});
 
 	// Serve the socket io stream file
 	Router.use('/scripts/socket.io-stream.js', function getSocketStream(req, res, next) {
-		alchemy.minifyScript(streamPath, function gotMinifiedPath(err, mpath) {
-			req.conduit.serveFile(mpath || streamPath);
+		alchemy.minifyScript(stream_path, function gotMinifiedPath(err, mpath) {
+			req.conduit.serveFile(mpath || stream_path);
 		});
 	});
 

package/lib/stages.js

@@ -381,7 +381,7 @@ alchemy.sputnik.add(function routes() {
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.0.1
- * @version       1.1.2
+ * @version       1.3.5
  */
 alchemy.sputnik.add(function start_server() {
 
@@ -429,7 +429,8 @@ alchemy.sputnik.add(function start_server() {
 	// The actual `requests` listener is defined in the 'http' stage
 	alchemy.server.listen(listen_target, function areListening(){
 
-		var address = alchemy.server.address();
+		let address = alchemy.server.address();
+		let url = alchemy.settings.url;
 
 		if (typeof address == 'string') {
 			settings.socket = address;
@@ -439,19 +440,19 @@ alchemy.sputnik.add(function start_server() {
 			if (settings.socketfile_chmod) {
 				fs.chmodSync(address, settings.socketfile_chmod);
 			}
-
 		} else {
 			// Get the actual server port
 			settings.port = address.port;
 			log.info('HTTP server listening on port', settings.port);
-		}
-
-		if (alchemy.settings.url) {
-			let url = alchemy.settings.url;
 
-			url = alchemy.colors.bg.getRgb(1, 0, 1) + alchemy.colors.fg.getRgb(5, 3, 0) + ' ' + url + ' ' + alchemy.colors.reset;
+			if (!url) {
+				url = 'http://localhost:' + address.port;
+			}
+		}
 
-			log.info('Served at »»', url, '««');
+		if (url) {
+			let pretty_url = alchemy.colors.bg.getRgb(1, 0, 1) + alchemy.colors.fg.getRgb(5, 3, 0) + ' ' + url + ' ' + alchemy.colors.reset;
+			log.info('Served at »»', pretty_url, '««');
 		}
 
 		// If this process is a child, tell the parent we're ready

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.3",
+	"version": "1.3.5",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -20,9 +20,9 @@
 		"body-parser"      : "~1.19.2",
 		"bson"             : "~4.6.1",
 		"chokidar"         : "~3.5.3",
-		"formidable"       : "~2.0.1",
+		"formidable"       : "~2.1.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",
@@ -33,10 +33,10 @@
 		"postcss"          : "~8.4.6",
 		"protoblast"       : "~0.8.3",
 		"semver"           : "~7.3.5",
-		"socket.io"        : "~2.4.0",
+		"socket.io"        : "~4.6.0",
 		"@11ways/socket.io-stream" : "~0.9.2",
 		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.10.0",
+		"terser"           : "~5.16.3",
 		"toobusy-js"       : "~0.5.1",
 		"useragent"        : "~2.3.0"
 	},
@@ -50,12 +50,13 @@
 		"sass"             : "~1.53.0",
 		"sass-embedded"    : "~1.53.0",
 		"nodent-compiler"  : "~3.2.13",
-		"socket.io-client" : "~2.4.0"
+		"socket.io-client" : "~4.6.0",
+		"socket.io-msgpack-parser": "~3.0.2"
 	},
 	"devDependencies": {
 		"codecov"                 : "~3.8.1",
 		"istanbul-lib-instrument" : "~4.0.3",
-		"mocha"                   : "~8.3.2",
+		"mocha"                   : "~10.2.0",
 		"mongo-unit"              : "~3.2.0",
 		"nyc"                     : "^15.1.0",
 		"puppeteer"               : "~19.0.0",