alchemymvc 1.3.15 → 1.3.16

package/lib/app/behaviour/sluggable_behaviour.js

@@ -6,7 +6,7 @@
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.1.0
- * @version       0.3.0
+ * @version       1.3.16
  */
 var Sluggable = Function.inherits('Alchemy.Behaviour', function SluggableBehaviour(model, options) {
 
@@ -19,6 +19,10 @@ var Sluggable = Function.inherits('Alchemy.Behaviour', function SluggableBehavio
 	this.target_field = options.target_field;
 	this.replacement = options.replacement;
 
+	if (!this.source_field) {
+		throw new Error('No source field found for sluggable behaviour in "' + this.model.model_name + '"');
+	}
+
 	if (!options.unique_modifier_fields) {
 		options.unique_modifier_fields = [];
 	} else if (!Array.isArray(options.unique_modifier_fields)) {

package/lib/app/conduit/socket_conduit.js

@@ -132,6 +132,19 @@ SocketConduit.setProperty(function ip() {
 	return handshake.address || null;
 });
 
+/**
+ * Is this client still connected?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @type     {Boolean}
+ */
+SocketConduit.setProperty(function is_connected() {
+	return this.socket?.connected || false;
+});
+
 /**
  * Parse the request, get information from the url
  *

package/lib/app/datasource/mongo_datasource.js

@@ -5,9 +5,9 @@ var MongoClient = alchemy.use('mongodb').MongoClient;
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
-var Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _options) {
+const Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _options) {
 
 	var options,
 	    uri;
@@ -50,12 +50,6 @@ var Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _
 
 	// Set the connection options
 	this.mongoOptions = {
-
-		// Use the new url parser, because otherwise it logs a warning
-		useNewUrlParser    : true,
-
-		// Enable the new unified topology layer
-		useUnifiedTopology : true,
 	};
 
 	// Cache collections in here
@@ -144,7 +138,7 @@ Mongo.setMethod(function normalizeFindOptions(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
 Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), function connect() {
 
@@ -160,7 +154,7 @@ Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), functio
 	    pledge = new Pledge();
 
 	// Create the connection to the database
-	MongoClient.connect(that.uri, that.mongoOptions, function connected(err, client) {
+	Pledge.done(MongoClient.connect(that.uri, that.mongoOptions), function connected(err, client) {
 
 		if (err) {
 			that.connection_error = err;
@@ -186,7 +180,7 @@ Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), functio
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.16
  *
  * @param    {Function}   callback
  */
@@ -208,7 +202,7 @@ Mongo.setMethod(function collection(name, callback) {
 			return callback(err);
 		}
 
-		that.connection.collection(name, function createdCollection(err, collection) {
+		Pledge.done(that.connection.collection(name), function createdCollection(err, collection) {
 
 			if (err) {
 				return callback(err);
@@ -228,7 +222,7 @@ Mongo.setMethod(function collection(name, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.0
+ * @version  1.3.16
  */
 Mongo.setMethod(function _read(model, criteria, callback) {
 
@@ -268,11 +262,6 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 
 			let aggregate_options = {};
 
-			// Limits can still be set as an option though
-			if (options.limit) {
-				aggregate_options.limit = options.limit;
-			}
-
 			Function.parallel({
 				available: function getAvailable(next) {
 
@@ -286,13 +275,13 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					pipeline.push({$count: 'available'});
 
 					// Expensive aggregate just to get the available count...
-					collection.aggregate(pipeline, cloned_options, function gotAggregate(err, cursor) {
+					Pledge.done(collection.aggregate(pipeline, cloned_options), function gotAggregate(err, cursor) {
 
 						if (err) {
 							return next(err);
 						}
 
-						cursor.toArray(function gotAvailableArray(err, items) {
+						Pledge.done(cursor.toArray(), function gotAvailableArray(err, items) {
 
 							if (err) {
 								return next(err);
@@ -313,13 +302,22 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					});
 				},
 				items: function getItems(next) {
-					collection.aggregate(compiled.pipeline, aggregate_options, function gotAggregate(err, cursor) {
+
+					let pipeline = JSON.clone(compiled.pipeline);
+
+					// Limits also have to be set in the pipeline now
+					// (We have to do it here, so the `available` count is correct)
+					if (options.limit) {
+						pipeline.push({$limit: options.limit});
+					}
+
+					Pledge.done(collection.aggregate(pipeline, aggregate_options), function gotAggregate(err, cursor) {
 
 						if (err) {
 							return next(err);
 						}
 
-						cursor.toArray(next);
+						Pledge.done(cursor.toArray(), next);
 					});
 				}
 			}, function done(err, data) {
@@ -346,10 +344,10 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					return next(null, null);
 				}
 
-				cursor.count(false, next);
+				Pledge.done(collection.countDocuments(compiled), next);
 			},
 			items: function getItems(next) {
-				cursor.toArray(next);
+				Pledge.done(cursor.toArray(), next);
 			}
 		}, function done(err, data) {
 
@@ -369,7 +367,7 @@ Mongo.setMethod(function _read(model, criteria, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.6
+ * @version  1.3.16
  */
 Mongo.setMethod(function _create(model, data, options, callback) {
 
@@ -379,13 +377,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
 			return callback(err);
 		}
 
-		let method = 'insert';
-
-		if (typeof collection.insertOne == 'function') {
-			method = 'insertOne';
-		}
-
-		collection[method](data, {w: 1, fullResult: true}, function afterInsert(err, result) {
+		Pledge.done(collection.insertOne(data, {w: 1, fullResult: true}), function afterInsert(err, result) {
 
 			// Clear the cache
 			model.nukeCache();
@@ -394,6 +386,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
 				return callback(err, result);
 			}
 
+			// @TODO: fix because of mongodb 6
 			let write_errors = result.message?.documents?.[0]?.writeErrors;
 
 			if (write_errors) {
@@ -424,7 +417,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
 Mongo.setMethod(function _update(model, data, options, callback) {
 
@@ -507,16 +500,18 @@ Mongo.setMethod(function _update(model, data, options, callback) {
 			console.log('Updating with obj', id, updateObject);
 		}
 
+		let promise;
+
 		if (collection.findOneAndUpdate) {
-			collection.findOneAndUpdate({_id: id}, updateObject, {upsert: true}, afterUpdate);
+			promise = collection.findOneAndUpdate({_id: id}, updateObject, {upsert: true});
 		} else if (collection.findAndModify) {
-			collection.findAndModify({_id: id}, [['_id', 1]], updateObject, {upsert: true}, afterUpdate);
+			promise = collection.findAndModify({_id: id}, [['_id', 1]], updateObject, {upsert: true});
 		} else {
 			// If it's not available (like nedb)
-			collection.update({_id: ''+id}, updateObject, {upsert: true}, afterUpdate);
+			promise = collection.update({_id: ''+id}, updateObject, {upsert: true});
 		}
 
-		function afterUpdate(err, result) {
+		Pledge.done(promise, function afterUpdate(err, result) {
 
 			// Clear the cache
 			model.nukeCache();
@@ -526,7 +521,7 @@ Mongo.setMethod(function _update(model, data, options, callback) {
 			}
 
 			callback(null, Object.assign({}, data));
-		}
+		});
 	});
 });
 
@@ -536,7 +531,7 @@ Mongo.setMethod(function _update(model, data, options, callback) {
  * @author   Kjell Keisse   <kjell@codedor.be>
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.3
+ * @version  1.3.16
  */
 Mongo.setMethod(function _remove(model, query, options, callback) {
 
@@ -546,7 +541,7 @@ Mongo.setMethod(function _remove(model, query, options, callback) {
 			return callback(err);
 		}
 
-		collection.findOneAndDelete(query, function _deleted(err, result){
+		Pledge.done(collection.findOneAndDelete(query), function _deleted(err, result){
 
 			//clear cache
 			model.nukeCache();

package/lib/app/helper_datasource/00-nosql_datasource.js

@@ -590,7 +590,7 @@ NoSQL.setStatic(function areComparable(a, b) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.3.0
+ * @version  1.3.16
  *
  * @param    {Criteria}   criteria
  * @param    {Group}      group
@@ -711,13 +711,16 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 
 			let field_entry = {},
 			    name = entry.target_path,
-				queries_property = name.indexOf('.') > -1;
+			    queries_property = name.indexOf('.') > -1;
 
 			// Do we need to look into an object itself?
-			// (Like the "timestamp" property of a date field when stored with units)
-			if (entry.db_property && !queries_property) {
-				name += '.' + entry.db_property;
-				queries_property = true;
+			if (entry.db_property) {
+
+				// Make sure the query doesn't already specifically query this property
+				if (name == entry.field.path) {
+					name += '.' + entry.db_property;
+					queries_property = true;
+				}
 			}
 
 			if (entry.association) {
@@ -824,10 +827,15 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 				// (entry.field can be undefined if trying to query a path)
 				if (entry.field && entry.field.is_translatable) {
 
-					let prefix = criteria.options.locale;
+					let prefix = criteria.options.locale,
+					    specific_prefix = !!prefix;
+
+					if (specific_prefix && criteria?.model?.translate === false) {
+						specific_prefix = false;
+					}
 
 					// If a prefix is specified, only query that translation
-					if (prefix) {
+					if (specific_prefix) {
 						prefixed_name = name + '.' + prefix;
 					} else {
 						multiple_fields = [];

package/lib/app/helper_field/schema_field.js

@@ -5,9 +5,19 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.3.16
  */
 var SchemaField = Function.inherits('Alchemy.Field', function Schema(schema, name, options) {
+
+	if (!options) {
+		options = {};
+	}
+
+	// If the contents are array-like, the field itself can't be
+	if (this.force_array_contents) {
+		options.is_array = false;
+	}
+
 	Schema.super.call(this, schema, name, options);
 
 	if (options.schema == null || typeof options.schema != 'object') {
@@ -50,9 +60,18 @@ SchemaField.setDeprecatedProperty('fieldSchema', 'field_schema');
 SchemaField.setDatatype('object');
 
 /**
- * Get the subschema of this field
+ * Is this schema field always an array?
  *
- * @constructor
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @return   {Boolean}
+ */
+SchemaField.setProperty('force_array_contents', false);
+
+/**
+ * Get the subschema of this field
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
@@ -160,7 +179,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.16
  *
  * @param    {Object}      value        Value of field, an object in this case
  * @param    {Object}      data         The data object containing `value`
@@ -170,6 +189,38 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  */
 SchemaField.setMethod(function _toDatasource(value, holder, datasource, callback) {
 
+	if (!this.force_array_contents) {
+		return this._toDatasourceFromValue(value, holder, datasource, callback);
+	}
+
+	value = Array.cast(value);
+
+	let tasks = [];
+
+	for (let entry of value) {
+		tasks.push(next => {
+			this._toDatasourceFromValue(entry, holder, datasource, next);
+		});
+	}
+
+	Function.parallel(tasks, callback);
+});
+
+/**
+ * Cast all the subschema values using their _toDatasource method
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.3.1
+ *
+ * @param    {Object}      value        Value of field, an object in this case
+ * @param    {Object}      data         The data object containing `value`
+ * @param    {Datasource}  datasource   The destination datasource
+ *
+ * @return   {Object}
+ */
+SchemaField.setMethod(function _toDatasourceFromValue(value, holder, datasource, callback) {
+
 	var that = this,
 	    sub_schema,
 	    record,
@@ -241,13 +292,50 @@ SchemaField.setMethod(function _toDatasource(value, holder, datasource, callback
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.3.16
  *
  * @param    {Mixed}      value
  * @param    {Function}   callback
  */
 SchemaField.setMethod(function _toApp(query, options, value, callback) {
 
+	if (!this.force_array_contents) {
+		return this._toAppFromValue(query, options, value, callback);
+	}
+
+	value = Array.cast(value);
+
+	let tasks = [];
+
+	for (let entry of value) {
+		tasks.push(next => {
+			this._toAppFromValue(query, options, entry, next);
+		});
+	}
+
+	Function.parallel(tasks, (err, result) => {
+
+		if (err) {
+			return callback(err);
+		}
+
+		callback(null, this.cast(result));
+	});
+
+});
+
+/**
+ * Turn datasource data into app data
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.3.16
+ *
+ * @param    {Mixed}      value
+ * @param    {Function}   callback
+ */
+SchemaField.setMethod(function _toAppFromValue(query, options, value, callback) {
+
 	var that = this,
 	    recursive,
 	    Dummy,
@@ -364,11 +452,11 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 				return callback(err);
 			}
 
-			callback(null, that.cast(result));
+			callback(null, that.castEntry(result));
 		});
 	}
 
-	callback(null, this.cast(value));
+	callback(null, this.castEntry(value));
 });
 
 /**
@@ -424,6 +512,17 @@ SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 	}
 });
 
+/**
+ * Cast an entry
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+SchemaField.setMethod(function castEntry(value, to_datasource) {
+	return value;
+});
+
 /**
  * Cast the value to a document
  *

package/lib/app/helper_model/field_set.js

@@ -60,6 +60,19 @@ FieldSet.setStatic(function fromArray(fields) {
 	return set;
 });
 
+/**
+ * How many fields have been added to this set?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @type     {Number}
+ */
+FieldSet.setProperty(function size() {
+	return this.fields.size;
+});
+
 /**
  * Return an object for json-drying this list
  *

package/lib/app/helper_model/model.js

@@ -516,7 +516,7 @@ Model.setMethod(function getDisplayTitleOrNull(item, fallbacks) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.3.14
+ * @version  1.3.16
  *
  * @param    {Object}        item       The record item of this model
  * @param    {String|Array}  fallbacks  Extra fallbacks to use
@@ -532,7 +532,7 @@ Model.setMethod(function getDisplayTitle(item, fallbacks) {
 	let result = this.getDisplayTitleOrNull(item, fallbacks);
 
 	if (result == null) {
-		result = main[this.primary_key] || '';
+		result = item[this.primary_key] || '';
 
 		if (result && typeof result != 'string') {
 			result = '' + result;

package/lib/class/conduit.js

@@ -1211,7 +1211,7 @@ Conduit.setMethod(function prepareViewRender() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.7
+ * @version  1.3.16
  */
 Conduit.setMethod(function callHandler() {
 
@@ -1226,7 +1226,7 @@ Conduit.setMethod(function callHandler() {
 			this.error(405, 'Method Not Allowed', false);
 
 		} else {
-			if (alchemy.settings.debug) {
+			if (alchemy.settings.debug && this.original_path.indexOf('.js.map') == -1) {
 				console.log('Route not found:', this);
 			}
 
@@ -1527,7 +1527,7 @@ Conduit.setMethod(function redirect(status, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.4
+ * @version  1.3.16
  *
  * @param    {Nulber}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
@@ -1561,6 +1561,11 @@ Conduit.setMethod(function error(status, message, print_error) {
 
 	if (alchemy.settings.environment == 'dev') {
 		print_dev = true;
+
+		if (is_400 && this.original_path.indexOf('.js.map') > -1) {
+			print_dev = false;
+			print_error = false;
+		}
 	}
 
 	if (print_error == null) {
@@ -2309,6 +2314,34 @@ Conduit.setMethod(function getSession(allow_create = true) {
 	return session;
 });
 
+/**
+ * Create a controller of the given type and attach this conduit
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {String}   controller_name
+ *
+ * @return   {Controller}
+ */
+Conduit.setMethod(function getController(controller_name) {
+
+	if (!controller_name) {
+		return this.controller;
+	}
+
+	let instance = Controller.get(controller_name);
+
+	if (!instance) {
+		return false;
+	}
+
+	instance.conduit = this;
+
+	return instance;
+});
+
 /**
  * Register live data bindings via websockets
  *
@@ -2688,7 +2721,7 @@ Conduit.setMethod(function shouldBePostponed() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  0.4.0
+ * @version  1.3.16
  *
  * @param    {String}   type
  * @param    {Object}   data
@@ -2697,18 +2730,18 @@ Alchemy.setMethod(function broadcast(type, data) {
 
 	alchemy.sessions.forEach(function eachSession(session, key) {
 
-		// Go over every listening scene and submit the data
-		Object.each(session.connections, function eachScene(scene, scene_id) {
+		// Go over every listening socket and submit the data
+		Object.each(session.connections, function eachScene(socket_conduit, scene_id) {
 
-			if (!scene) {
+			if (!socket_conduit?.is_connected) {
 				return;
 			}
 
 			if (alchemy.settings.debug) {
-				log.debug('Broadcasting', type, {data, scene});
+				log.debug('Broadcasting', type, {data, scene: socket_conduit});
 			}
 
-			scene.submit(type, data);
+			socket_conduit.submit(type, data);
 		});
 	});
 });

package/lib/class/datasource.js

@@ -455,7 +455,7 @@ Datasource.setMethod(function _valueToApp(field, query, options, value, callback
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.3.16
  *
  * @param    {Model}      model
  * @param    {Criteria}   criteria
@@ -540,24 +540,29 @@ Datasource.setMethod(function read(model, criteria, callback) {
 				return pledge.reject(err);
 			}
 
-			let result = {
-				items     : app_results,
-				available : available
-			};
+			try {
 
-			if (hash) {
+				let result = {
+					items     : app_results,
+					available : available
+				};
 
-				// Emit the storing_cache event
-				model.emit('storing_cache', criteria, result);
+				if (hash) {
 
-				let cloned = JSON.clone(result);
+					// Emit the storing_cache event
+					model.emit('storing_cache', criteria, result);
 
-				model.emit('stored_cache', criteria, cloned);
+					let cloned = JSON.clone(result);
 
-				cache_pledge.resolve(cloned);
-			}
+					model.emit('stored_cache', criteria, cloned);
 
-			pledge.resolve(result);
+					cache_pledge.resolve(cloned);
+				}
+
+				pledge.resolve(result);
+			} catch (err) {
+				pledge.reject(err);
+			}
 		}
 	});
 

package/lib/class/inode_file.js

@@ -296,12 +296,16 @@ File.setMethod(function createReadStream(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.8
+ * @version  1.3.16
  */
 File.setMethod(function read(options) {
 
 	let pledge = new Pledge();
 
+	if (typeof options == 'string') {
+		options = {encoding: options};
+	}
+
 	if (!options) {
 		options = {flag: 'r'};
 	} else if (!options.flag) {

package/lib/class/model.js

@@ -845,7 +845,7 @@ Model.setMethod(function ensureIds(list, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.0
+ * @version  1.3.16
  *
  * @param    {Document}   document
  * @param    {Object}     options
@@ -943,6 +943,11 @@ Model.setMethod(function saveRecord(document, options, callback) {
 
 		Object.each(document.$record, function eachEntry(entry, key) {
 
+			// Skip empty entries
+			if (!entry) {
+				return;
+			}
+
 			// Skip our own record
 			if (key == that.name) {
 				return;
@@ -957,7 +962,6 @@ Model.setMethod(function saveRecord(document, options, callback) {
 			}
 
 			// Add the saved _id
-			//@TODO: this throws an error sometimes.
 			entry[assoc.options.foreignKey] = saved_record[assoc.options.localKey];
 
 			// Add the task

package/lib/class/route.js

@@ -3,7 +3,7 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.16
  */
 const Route = Function.inherits('Alchemy.Base', function Route(router, paths, options) {
 
@@ -51,6 +51,10 @@ const Route = Function.inherits('Alchemy.Base', function Route(router, paths, op
 	// Can this route's path be used in the browser's address location?
 	this.visible_location = true;
 
+	// Is this a system route of some kind?
+	// (meaning: not for end users)
+	this.is_system_route = false;
+
 	// If no fnc is given, these will be called
 	this.controller = null;
 	this.action = null;

package/lib/class/router.js

@@ -767,7 +767,7 @@ RouterClass.setMethod(function setOption(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.16
  *
  * @param    {Object}   args
  * @param    {String}   args.name            Optional route name
@@ -824,6 +824,10 @@ RouterClass.setMethod(function add(args) {
 		route.visible_location = args.visible_location;
 	}
 
+	if (args.is_system_route != null) {
+		route.is_system_route = args.is_system_route;
+	}
+
 	if (args.permission) {
 		route.setPermission(args.permission);
 	}
@@ -1163,7 +1167,7 @@ RouterClass.setMethod(function getOptions(result) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.7
+ * @version  1.3.16
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1212,6 +1216,7 @@ RouterClass.setMethod(function getRoutes(result) {
 			has_permission_assignments : route.has_permission_assignments || undefined,
 			title                      : route.title,
 			visible_location           : route.visible_location,
+			is_system_route            : route.is_system_route,
 			schema                     : route.schema,
 			param_definitions          : route.param_definitions,
 		};

package/lib/core/client_alchemy.js

@@ -315,11 +315,11 @@ Alchemy.setMethod(function castObjectId(str) {
 /**
  * Is the given parameter an object id (string or instance)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.0.5
+ * @version  1.3.16
  *
- * @param    {String|ObjectID}   obj
+ * @param    {String|ObjectId}   obj
  *
  * @return   {Boolean}
  */
@@ -331,9 +331,13 @@ Alchemy.setMethod(function isObjectId(obj) {
 
 	let type = typeof obj;
 
-	if (obj && type === 'object' && obj.constructor && obj.constructor.name === 'ObjectID') {
+	if (type === 'string' && obj.isObjectId()) {
 		return true;
-	} else if (type === 'string' && obj.isObjectId()) {
+	}
+
+	let class_name = obj.constructor?.name;
+
+	if (class_name == 'ObjectID' || class_name == 'ObjectId') {
 		return true;
 	}
 

package/lib/init/alchemy.js

@@ -1051,7 +1051,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.7
+ * @version  1.3.16
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -1177,7 +1177,20 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 
 		// Modules are required by default
 		if (options.require) {
-			if (package_json && package_json.type == 'module' && !(package_json.main && package_json.module)) {
+
+			let supports_cjs = package_json?.type != 'module';
+
+			// Make sure this does not support CJS.
+			// Some packages have the `module` type, but do have CJS exports too
+			if (!supports_cjs) {
+				let exports = package_json.exports?.['.'];
+
+				if (exports?.require) {
+					supports_cjs = true;
+				}
+			}
+
+			if (!supports_cjs) {
 				module = doImport(module_path)
 			} else {
 				module = require(module_path);
@@ -1248,22 +1261,28 @@ Alchemy.setMethod(function shared(name, type, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.4.0
+ * @version  1.3.16
  *
- * @param    {String|ObjectID}   obj
+ * @param    {String|ObjectId}   obj
  *
- * @return   {ObjectID|undefined}
+ * @return   {ObjectId|undefined}
  */
 Alchemy.setMethod(function castObjectId(obj) {
 
-	var type = typeof obj;
+	let type = typeof obj;
 
-	if (obj && type === 'object' && obj.constructor && obj.constructor.name === 'ObjectID') {
-		return obj;
-	} else if (type === 'string' && obj.isObjectId()) {
+	if (type === 'string' && obj.isObjectId()) {
 		return alchemy.ObjectId(obj);
 	}
 
+	if (obj && type === 'object') {
+		let class_name = obj.constructor?.name;
+
+		if (class_name == 'ObjectID' || class_name == 'ObjectId') {
+			return obj;
+		}
+	}
+
 	return undefined;
 });
 
@@ -1595,6 +1614,12 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 				return callback(null);
 			}
 
+			// Since formidable v3, all the fields are now arrays.
+			// We already had a lot of logic to deal with this,
+			// so we just have to un-array everything
+			form_fields = undoFormidableArray(form_fields);
+			form_files = undoFormidableArray(form_files);
+
 			// Fix the field names
 			for (key in form_fields) {
 				Object.setFormPath(fields, key, form_fields[key]);
@@ -1679,6 +1704,42 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	});
 });
 
+/**
+ * Undo formidable's new array handling
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {Object}
+ *
+ * @return   {Object}
+ */
+function undoFormidableArray(data) {
+
+	if (!data) {
+		return {};
+	}
+
+	let result = {},
+	    value,
+	    key;
+
+	for (key in data) {
+		value = data[key];
+
+		if (key.endsWith('[]')) {
+			key = key.slice(0, -2);
+		} else {
+			value = value[0];
+		}
+
+		result[key] = value;
+	}
+
+	return result;
+}
+
 /**
  * Export all data
  *

package/lib/init/functions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mkdirp       = alchemy.use('mkdirp'),
+let mkdirp       = alchemy.use('mkdirp')?.mkdirp,
     ncp          = alchemy.use('ncp').ncp,
     fs           = alchemy.use('fs'),
     libpath      = alchemy.use('path'),
@@ -496,6 +496,7 @@ Alchemy.setMethod(function getShared(first, second) {
 
 /**
  * Make JSON-Dry handle ObjectIDs when drying
+ * (Old class name)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
@@ -507,16 +508,65 @@ JSON.registerDrier('ObjectID', function dryOI(holder, key, value) {
 
 /**
  * Correctly un-dry ObjectIDs
+ * (Old class name)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
  * @version  0.2.0
  */
 JSON.registerUndrier('ObjectID', function undryOI(holder, key, value) {
-	return mongo.ObjectID(value);
+	return alchemy.castObjectId(value);
 });
 
-alchemy.ObjectId = mongo.ObjectID;
+/**
+ * Make JSON-Dry handle ObjectIds when drying
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+JSON.registerDrier('ObjectId', function dryOI(holder, key, value) {
+	return ''+value;
+}, {add_path: false});
+
+/**
+ * Correctly un-dry ObjectIds
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+JSON.registerUndrier('ObjectId', function undryOI(holder, key, value) {
+	return alchemy.castObjectId(value);
+});
+
+/**
+ * Monkey-patch checksum support to the ObjectId class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+if (typeof mongo?.ObjectId == 'function') {
+	Function.setMethod(mongo.ObjectId, Blast.checksumSymbol, function checksum() {
+		return this.toString();
+	});
+}
+
+/**
+ * Create a new ObjectId
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {*}   object_id
+ *
+ * @return   {ObjectId}
+ */
+Alchemy.setMethod(function ObjectId(object_id) {
+	return new mongo.ObjectId(object_id);
+});
 
 /**
  * Get mimetype info of a file

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.15",
+	"version": "1.3.16",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -14,29 +14,29 @@
 	},
 	"dependencies": {
 		"ansi-256-colors"  : "~1.1.0",
-		"autoprefixer"     : "~10.4.2",
-		"bcrypt"           : "~5.0.1",
+		"autoprefixer"     : "~10.4.16",
+		"bcrypt"           : "~5.1.1",
 		"body"             : "~5.1.0",
-		"body-parser"      : "~1.19.2",
-		"bson"             : "~4.6.1",
+		"body-parser"      : "~1.20.2",
+		"bson"             : "~6.1.0",
 		"chokidar"         : "~3.5.3",
-		"formidable"       : "~2.1.1",
-		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.9",
-		"jsondiffpatch"    : "~0.4.1",
+		"formidable"       : "~3.5.1",
+		"graceful-fs"      : "~4.2.11",
+		"hawkejs"          : "~2.3.13",
+		"jsondiffpatch"    : "~0.5.0",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
-		"mkdirp"           : "~1.0.4",
+		"mkdirp"           : "~3.0.1",
 		"mmmagic"          : "~0.5.3",
-		"mongodb"          : "~3.6.6",
+		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
-		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.9",
-		"semver"           : "~7.3.5",
-		"socket.io"        : "~4.6.0",
+		"postcss"          : "~8.4.31",
+		"protoblast"       : "~0.8.12",
+		"semver"           : "~7.5.4",
+		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",
 		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.18.1",
+		"terser"           : "~5.21.0",
 		"toobusy-js"       : "~0.5.1",
 		"useragent"        : "~2.3.0"
 	},
@@ -46,20 +46,20 @@
 	],
 	"optionalDependencies": {
 		"janeway"          : "~0.4.0",
-		"less"             : "~4.1.1",
-		"sass"             : "~1.53.0",
-		"sass-embedded"    : "~1.53.0",
+		"less"             : "~4.2.0",
+		"sass"             : "~1.68.0",
+		"sass-embedded"    : "~1.67.0",
 		"nodent-compiler"  : "~3.2.13",
-		"socket.io-client" : "~4.6.0",
+		"socket.io-client" : "~4.7.2",
 		"socket.io-msgpack-parser": "~3.0.2"
 	},
 	"devDependencies": {
 		"codecov"                 : "~3.8.1",
-		"istanbul-lib-instrument" : "~4.0.3",
+		"istanbul-lib-instrument" : "~6.0.1",
 		"mocha"                   : "~10.2.0",
-		"mongo-unit"              : "~3.2.0",
+		"mongo-unit"              : "~3.3.0",
 		"nyc"                     : "^15.1.0",
-		"puppeteer"               : "~19.0.0",
+		"puppeteer"               : "~21.3.6",
 		"source-map"              : "~0.7.3"
 	},
 	"scripts": {
@@ -71,6 +71,6 @@
 	"main": "lib/bootstrap.js",
 	"license": "MIT",
 	"engines": {
-		"node" : ">=14.0.0"
+		"node" : ">=16.20.1"
 	}
 }