alchemymvc 1.3.4 → 1.3.6

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/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/datasource/mongo_datasource.js

@@ -369,7 +369,7 @@ Mongo.setMethod(function _read(model, criteria, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.6
  */
 Mongo.setMethod(function _create(model, data, options, callback) {
 
@@ -394,6 +394,26 @@ Mongo.setMethod(function _create(model, data, options, callback) {
 				return callback(err, result);
 			}
 
+			let write_errors = result.message?.documents?.[0]?.writeErrors;
+
+			if (write_errors) {
+				let violations = new Classes.Alchemy.Error.Validation.Violations();
+
+				if (write_errors.length) {
+					let entry;
+
+					for (entry of write_errors) {
+						let violation = new Classes.Alchemy.Error.Validation.Violation();
+						violation.message = entry.errmsg || entry.message || entry.code;
+						violations.add(violation);
+					}
+				} else {
+					violations.add(new Error('Unknown database error'));
+				}
+
+				return callback(violations);
+			}
+
 			callback(null, Object.assign({}, data));
 		});
 	});

package/lib/app/helper/backed_map.js

@@ -1,7 +1,3 @@
-const OBJECT = Symbol('Object'),
-      BACKING = Symbol('Backing'),
-	  MAP = Symbol('Map');
-
 /**
  * The Backed map class
  *
@@ -9,249 +5,6 @@ const OBJECT = Symbol('Object'),
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.1
- * @version  1.2.1
+ * @version  1.3.5
  */
-const Backed = Function.inherits('Alchemy.Base', 'Alchemy.Map', function Backed(backing) {
-	this.local = new Map();
-	this.type = null;
-	this.backing = backing;
-});
-
-/**
- * Undry the given value
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @param    {Object}   value
- *
- * @return   {EnumValues}
- */
-Backed.setStatic(function unDry(value, custom_method, whenDone) {
-	let result = new this(value.backing);
-	return result;
-});
-
-/**
- * Get the size
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- */
-Backed.setProperty(function size() {
-	return this.keys().length;
-});
-
-/**
- * Set the backing value
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- */
-Backed.enforceProperty(function backing(new_value, old_value) {
-
-	this.backing = null;
-	this.type = null;
-
-	if (!new_value) {
-		return;
-	}
-
-	if (new_value instanceof Backed) {
-		this.type = BACKING;
-	} else if (new_value instanceof Map) {
-		this.type = MAP;
-	} else if (typeof new_value == 'object') {
-		this.type = OBJECT;
-	}
-
-	return new_value;
-});
-
-/**
- * Create a (shallow) clone of this backed map.
- * Since we don't ever touch the backing itself, we don't have to clone that.
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.3.1
- *
- * @return   {Backed}
- */
-Backed.setMethod(function clone() {
-	let result = new this.constructor(this.backing);
-	result.local = new Map(this.local);
-	return result;
-});
-
-/**
- * Create a (shallow) clone of this backed map.
- * Since we don't ever touch the backing itself, we don't have to clone that.
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @return   {Backed}
- */
-Backed.setMethod(function dryClone(wm, custom_method) {
-	return this.clone();
-});
-
-/**
- * Simplify the object for Hawkejs
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @param    {WeakMap}   wm
- *
- * @return   {Backed}
- */
-Backed.setMethod(function toHawkejs(wm) {
-
-	let values = new Map(),
-	    value,
-	    keys = this.keys(),
-		key;
-	
-	for (key of keys) {
-		value = this.get(key);
-		values.set(key, JSON.clone(value, 'toHawkejs', wm));
-	}
-
-	return new this.constructor(values);
-});
-
-/**
- * Get all the keys
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @return   {String[]}
- */
-Backed.setMethod(function keys() {
-
-	let result;
-
-	if (this.type == BACKING) {
-		result = this.backing.keys();
-	} else if (this.type == MAP) {
-		result = [...this.backing.keys()];
-	} else if (this.type == OBJECT) {
-		result = Object.keys(this.backing);
-	} else {
-		result = [];
-	}
-
-	if (this.local.size) {
-		for (let key of this.local.keys()) {
-			if (result.indexOf(key) == -1) {
-				result.push(key);
-			}
-		}
-	}
-
-	return result;
-});
-
-/**
- * Get a value by it's name
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @param    {String}   name
- *
- * @return   {Mixed}
- */
-Backed.setMethod(function get(name) {
-
-	if (this.local.has(name)) {
-		return this.local.get(name);
-	}
-
-	if (!this.type) {
-		return;
-	}
-
-	let value;
-
-	if (this.type == BACKING || this.type == MAP) {
-		value = this.backing.get(name);
-	} else if (this.type == OBJECT) {
-		value = this.backing[name];
-	}
-
-	return value;
-});
-
-/**
- * Set a value
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @param    {String}   name
- * @param    {*}        value
- *
- * @return   {*}
- */
-Backed.setMethod(function set(name, value) {
-	this.local.set(name, value);
-	return value;
-});
-
-/**
- * Dry the object
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @return   {Object}
- */
-Backed.setMethod(function toDry() {
-	
-	let result = {
-		backing  : {}
-	};
-
-	let value,
-	    key;
-
-	for (key of this.keys()) {
-		value = this.get(key);
-		result.backing[key] = value;
-	}
-
-	return {value: result};
-});
-
-/**
- * Iterate over the object
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.2.1
- * @version  1.2.1
- *
- * @return   {Object}
- */
-Backed.setMethod(Symbol.iterator, function* iterate() {
-
-	let value,
-	    key;
-
-	for (key of this.keys()) {
-		value = this.get(key);
-		yield value;
-	}
-});
+const Backed = Function.inherits('Develry.BackedMap', 'Alchemy.Map', 'Backed');

package/lib/app/helper/enum_values.js

@@ -91,7 +91,7 @@ EnumMap.setMethod(function set(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.1
- * @version  1.2.1
+ * @version  1.3.6
  *
  * @param    {WeakMap}   wm
  *
@@ -100,23 +100,45 @@ EnumMap.setMethod(function set(name, value) {
 EnumMap.setMethod(function toHawkejs(wm) {
 
 	let result = toHawkejs.super.call(this, wm),
-	    original_value,
-		cloned_value,
+	    original_entry,
+		cloned_entry,
 	    keys = this.keys(),
 		key;
 	
 	for (key of keys) {
-		original_value = this.get(key);
-		cloned_value = result.get(key);
+		original_entry = this.get(key);
+		cloned_entry = result.get(key);
+
+		if (original_entry.value) {
 
-		if (original_value.value) {
+			let val = original_entry.value;
 
-			if (typeof original_value.value == 'function') {
-				cloned_value.type = 'function';
+			if (typeof val == 'function') {
+				cloned_entry.type = 'function';
 			}
 
-			if (original_value.value.schema) {
-				cloned_value.schema = JSON.clone(original_value.value.schema, 'toHawkejs', wm);
+			if (val.schema) {
+				cloned_entry.schema = JSON.clone(val.schema, 'toHawkejs', wm);
+			}
+
+			let key,
+			    field_val;
+
+			for (key in val) {
+
+				if (key == 'schema') {
+					continue;
+				}
+
+				field_val = val[key];
+
+				if (field_val) {
+					const SchemaClass = Blast.isBrowser ? Classes.Alchemy.Client.Schema : Classes.Alchemy.Schema;
+
+					if (field_val instanceof SchemaClass) {
+						cloned_entry[key] = JSON.clone(field_val, 'toHawkejs', wm);
+					}
+				}
 			}
 		}
 	}

package/lib/app/helper/router_helper.js

@@ -221,9 +221,9 @@ Router.setMethod(function applyDirective(element, name, options) {
 /**
  * Return route name info
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.2.7
+ * @version  1.3.6
  *
  * @param    {String}   name
  * @param    {Boolean}  socket_route   Look in the socket routes
@@ -232,13 +232,12 @@ Router.setMethod(function applyDirective(element, name, options) {
  */
 Router.setMethod(function routeConfig(name, socket_route) {
 
-	var section,
-	    pieces,
-	    routes,
-	    result,
-	    route,
-	    name,
-	    key;
+	if (!name) {
+		return null;
+	}
+
+	let section,
+	    routes;
 
 	if (socket_route) {
 
@@ -264,7 +263,7 @@ Router.setMethod(function routeConfig(name, socket_route) {
 		return null;
 	}
 
-	pieces = name.split('@');
+	let pieces = name.split('@');
 
 	if (pieces.length == 1) {
 		name = pieces[0];
@@ -273,6 +272,8 @@ Router.setMethod(function routeConfig(name, socket_route) {
 		if (routes.default[name] != null) {
 			section = 'default';
 		} else {
+			let key;
+
 			for (key in routes) {
 				if (routes[key][name] != null) {
 					section = key
@@ -285,9 +286,9 @@ Router.setMethod(function routeConfig(name, socket_route) {
 	}
 
 	if (routes[section] != null && routes[section][name] != null) {
-		route = routes[section][name];
+		let route = routes[section][name];
 
-		result = {
+		let result = {
 			section : section,
 			name    : name
 		};

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_field/big_int_field.js

@@ -0,0 +1,116 @@
+let mongo;
+
+if (Blast.isNode) {
+	mongo = alchemy.use('mongodb');
+}
+
+/**
+ * The BigInt Field class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ */
+const BigIntField = Function.inherits('Alchemy.Field.Number', 'BigInt');
+
+/**
+ * Set the datatype name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ */
+BigIntField.setDatatype('bigint');
+
+/**
+ * Cast the given value to this field's type
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {BigInt}
+ */
+BigIntField.setMethod(function cast(value) {
+
+	// Allow null
+	if (value == null) {
+		return value;
+	}
+
+	return BigInt(value);
+});
+
+/**
+ * Cast the given value to this field's type for search in a db
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ *
+ * @param    {Mixed}   value
+ * @param    {Array}   field_paths   The path to the field
+ *
+ * @return   {Mixed}
+ */
+BigIntField.setMethod(function _castCondition(value, field_paths) {
+
+	value = this.cast(value);
+
+	if (mongo) {
+		value = mongo.Long.fromBigInt(value);
+	}
+
+	return value;
+});
+
+/**
+ * Convert the value for the given datasource
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ *
+ * @param    {Mixed}        value       The field's own value
+ * @param    {Object}       data        The main record
+ * @param    {Datasource}   datasource  The datasource instance
+ *
+ * @return   {Mixed}
+ */
+BigIntField.setMethod(function _toDatasource(value, data, datasource, callback) {
+
+	value = this.cast(value);
+
+	if (mongo) {
+		value = mongo.Long.fromBigInt(value);
+	}
+
+	callback(null, value);
+});
+
+/**
+ * Convert from database to app
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.6
+ * @version  1.3.6
+ *
+ * @param    {Object}   query     The original query
+ * @param    {Object}   options   The original query options
+ * @param    {Mixed}    value     The field value, as stored in the DB
+ * @param    {Function} callback
+ */
+BigIntField.setMethod(function _toApp(query, options, value, callback) {
+
+	if (mongo && value && value.toBigInt) {
+		value = value.toBigInt();
+	}
+
+	value = this.cast(value);
+
+	callback(null, value);
+});

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

@@ -1400,16 +1400,16 @@ Conduit.setMethod(function setResponseUrl(new_url) {
 /**
  * Redirect to another url
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.2.5
+ * @version  1.3.6
  *
  * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
  * @param    {String|Object}   options   Options or url
  */
 Conduit.setMethod(function redirect(status, options) {
 
-	var hard_refresh = false,
+	let hard_refresh = false,
 	    url;
 
 	if (typeof status != 'number') {
@@ -1486,6 +1486,20 @@ Conduit.setMethod(function redirect(status, options) {
 
 	this.status = status;
 
+	// Make sure the url is an internal one if no hard refresh is requested
+	if (!hard_refresh && alchemy.settings.url) {
+		let rurl = RURL.parse(url);
+
+		// If an explicit hostname is set, this might be an external url
+		if (rurl.hostname) {
+			let base_url = RURL.parse(alchemy.settings.url);
+
+			if (base_url.hostname != rurl.hostname) {
+				hard_refresh = true;
+			}
+		}
+	}
+
 	if (hard_refresh && this.headers['x-hawkejs-request']) {
 		this.setHeader('x-hawkejs-navigate', url);
 
@@ -2217,7 +2231,7 @@ Conduit.setMethod(function _sendStream(stream, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.6
  *
  * @param    {Boolean}   create   Create a session if none exist
  *
@@ -2231,7 +2245,6 @@ Conduit.setMethod(function getSession(allow_create = true) {
 	}
 
 	let cookie_name,
-	    fingerprint,
 	    session_id,
 	    session;
 
@@ -2246,30 +2259,11 @@ Conduit.setMethod(function getSession(allow_create = true) {
 		session = alchemy.sessions.get(session_id);
 	}
 
-	// If no session is found, see if we can find one
-	// based on the browser fingerprint
-	if (!session && this.ip) {
-		fingerprint = this.fingerprint;
-
-		if (fingerprint) {
-			session = alchemy.fingerprints.get(fingerprint);
-
-			if (session && session.id) {
-				session_id = session.id;
-				this.cookie(cookie_name, session_id, {httpOnly: true});
-			}
-		}
-	}
-
 	// If no valid session exists, create a new one
 	if (!session && allow_create) {
 		session = new Classes.Alchemy.ClientSession(this);
 		session_id = session.id;
 
-		if (fingerprint) {
-			alchemy.fingerprints.set(fingerprint, session);
-		}
-
 		this.cookie(cookie_name, session_id, {httpOnly: true});
 
 		alchemy.sessions.set(session_id, session);

package/lib/class/field.js

@@ -4,9 +4,9 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.6
  *
  * @param    {Schema}   schema      The schema this field is added to
  * @param    {String}   name        The name of the field
@@ -22,8 +22,11 @@ Blast.Globals.Field = Function.inherits('Alchemy.Base', 'Alchemy.Field', functio
 	// Also store under parent
 	this.parent_schema = schema;
 
-	// Check the indexes
-	this.checkIndexes();
+	if (schema) {
+		// Check the indexes
+		// @TODO: move this to the `addField` methods?
+		this.checkIndexes();
+	}
 });
 
 /**
@@ -974,9 +977,9 @@ Field.setMethod(function _getValue(wrapped, done_translation) {
 /**
  * See if we need to apply any indexes
  *
- * @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.6
  */
 Field.setMethod(function checkIndexes() {
 
@@ -997,7 +1000,7 @@ Field.setMethod(function checkIndexes() {
 		index.sparse = this.options.sparse;
 	}
 
-	if (this.options.unique) {
+	if (this.options.unique && this.schema) {
 		this.schema.addIndex(this, index);
 	} else if (!Object.isEmpty(index)) {
 		console.log('@TODO: handle field index:', this, index);

package/lib/class/path_param_definition.js

@@ -84,7 +84,7 @@ PathParamDefinition.setStatic(function from(input) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.6
  */
 PathParamDefinition.setMethod(function parseTypeDefinition() {
 
@@ -109,8 +109,21 @@ PathParamDefinition.setMethod(function parseTypeDefinition() {
 			class_name = this.typedef;
 		}
 	} else {
-		class_name = this.typedef[0];
-		field_name = this.typedef[1];
+
+		let class_path = [],
+		    field_path = [],
+		    current = class_path;
+	
+		for (let piece of this.typedef) {
+			if (piece[0] != piece[0].toUpperCase()) {
+				current = field_path;
+			}
+
+			current.push(piece);
+		}
+		
+		class_name = class_path.join('.');
+		field_name = field_path.join('.');
 	}
 
 	if (class_name) {

package/lib/class/sitemap.js

@@ -353,11 +353,13 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.4
- * @version  1.3.4
+ * @version  1.3.6
+ *
+ * @param    {String}   prefix
  *
  * @return   {Hawkejs.Builder}
  */
-Sitemap.setMethod(function getXmlBuilder() {
+Sitemap.setMethod(function getXmlBuilder(prefix) {
 
 	let xml = Classes.Hawkejs.Builder.create({xml: true}),
 	    urlset = xml.ele('urlset');
@@ -367,13 +369,18 @@ Sitemap.setMethod(function getXmlBuilder() {
 	      .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();
+	let categories = this.getCategories(prefix);
 
 	for (let category of categories) {
-		for (let info of category) {
+
+		if (!category.pages) {
+			continue;
+		}
+
+		for (let info of category.pages) {
 			let url = urlset.ele(url);
 
-			url.ele('loc').txt(info.url);
+			url.ele('loc').txt(''+info.url);
 
 			if (info.lastmod) {
 				url.ele('lastmod').txt(info.lastmod);

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.4",
+	"version": "1.3.6",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -20,7 +20,7 @@
 		"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.4",
 		"jsondiffpatch"    : "~0.4.1",
@@ -31,12 +31,12 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.3",
+		"protoblast"       : "~0.8.5",
 		"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",