alchemymvc 1.4.0-alpha.7 → 1.4.0-alpha.9

package/lib/app/helper_model/model.js

@@ -680,6 +680,11 @@ Model.setMethod(function getAliasModel(alias) {
 		config = this.schema.associations[alias];
 	}
 
+	// @TODO: associated fields with an alias name inside a nested schema
+	// somehow breaks! Should be looked in to?
+	// Workaround: set `recursive: 0` on the root schema field
+	// console.log('Alias:', alias, 'config:', config, this.schema);
+
 	if (config) {
 		result = this.getModel(config.modelName);
 	} else {

package/lib/app/model/system_setting_model.js

@@ -144,11 +144,19 @@ SystemSetting.setDocumentMethod(function applySetting(do_actions = true) {
 
 	if (!existing_value) {
 		existing_value = setting.generateValue();
+		alchemy.system_settings.forceValueInstanceAtPath(this.setting_id, existing_value);
 	}
 
+	let result;
+
 	if (do_actions) {
-		return existing_value.setValue(this.configuration.value);
+		result = existing_value.setValue(this.configuration.value);
 	} else {
-		return existing_value.setValueSilently(this.configuration.value);
+		result = existing_value.setValueSilently(this.configuration.value);
 	}
+
+	// And now force the settings to update!
+	alchemy.refreshSettingsObject();
+
+	return result;
 });

package/lib/class/conduit.js

@@ -511,7 +511,7 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.18
+ * @version  1.4.0
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -541,7 +541,7 @@ Conduit.setMethod(async function parseRequest() {
 	}
 
 	if (this.rewritten_request_route_param) {
-		let params = Object.assign({}, this.route_string_parameters, this.rewritten_request_route_param);
+		let params = Object.assign({...this.url.query}, this.route_string_parameters, this.rewritten_request_route_param);
 		let new_url = this.route.generateUrl(params, this);
 		this.overrideResponseUrl(new_url);
 	}

package/lib/class/model.js

@@ -679,21 +679,26 @@ Model.setMethod(function disableTranslations() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  0.5.0
+ * @version  1.4.0
  *
  * @param    {Array}    pipeline
  * @param    {Function} callback
  */
-Model.setMethod(function aggregate(pipeline, callback) {
+Model.setMethod(async function aggregate(pipeline, callback) {
 
-	this.datasource.collection(this.table, function gotCollection(err, collection) {
+	let collection = await this.datasource.collection(this.table);
 
-		if (err) {
-			return callback(err);
-		}
+	if (err) {
+		return pledge.reject(err);
+	}
 
-		collection.aggregate(pipeline, callback);
-	});
+	let cursor = collection.aggregate(pipeline);
+
+	if (typeof callback == 'function') {
+		callback(null, cursor);
+	}
+
+	return cursor;
 });
 
 /**

package/lib/core/alchemy.js

@@ -17,7 +17,7 @@ let shared_objects = {},
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.3.21
+ * @version  1.4.0
  */
 global.Alchemy = Function.inherits('Alchemy.Base', function Alchemy() {
 
@@ -147,7 +147,6 @@ global.Alchemy = Function.inherits('Alchemy.Base', function Alchemy() {
 	this.text_body = this.use('body');
 	this.formidable = this.use('formidable');
 	this.body_parser = this.use('body-parser');
-	this.url_form_body = this.body_parser.urlencoded({extended: true});
 });
 
 /**
@@ -581,10 +580,21 @@ Alchemy.setMethod(function setSetting(path, value) {
 	this.system_settings.setPathSilently(path, value);
 
 	if (this.started) {
-		this.settings = this.system_settings.toObject();
+		this.refreshSettingsObject();
 	}
 });
 
+/**
+ * Refresh the settings object
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ */
+Alchemy.setMethod(function refreshSettingsObject() {
+	this.settings = this.system_settings.toObject();
+});
+
 /**
  * Get a setting value
  *
@@ -1879,7 +1889,12 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	// Regular form-encoded data
 	if (content_type && content_type.indexOf('form-urlencoded') > -1) {
 
-		this.url_form_body(req, res, {limit: request_body_size_limit}, function parsedBody(err) {
+		let url_form_body = this.body_parser.urlencoded({
+			limit: request_body_size_limit,
+			extended: true,
+		});
+
+		url_form_body(req, res, function parsedBody(err) {
 
 			if (err) {
 

package/lib/core/alchemy_functions.js

@@ -1159,7 +1159,7 @@ function convertDataUriToFile(data_uri) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.4.0
  *
  * @param    {string}   url
  *
@@ -1226,10 +1226,14 @@ Alchemy.setMethod(function download(url, options) {
 			}
 
 			if (!name) {
-				name = alchemy.ObjectId();
+				name = alchemy.ObjectId() + '';
 			}
 		}
 
+		if (!name || typeof name != 'string') {
+			name = alchemy.ObjectId() + '';
+		}
+
 		if (name.indexOf('/') > -1) {
 			name = name.replaceAll('/', '-');
 		}

package/lib/core/base.js

@@ -564,7 +564,7 @@ Base.setMethod(function attachConduit(conduit) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
- * @version  1.1.8
+ * @version  1.4.0
  *
  * @param    {string}   name      The name of the model to get
  * @param    {boolean}  init      Initialize the class [true]
@@ -597,9 +597,9 @@ Base.setMethod(function getModel(name, init, options) {
 
 	if (options.cache !== false) {
 		if (!this._modelInstances) {
-			this._modelInstances = {};
+			this._modelInstances = new Map();
 		} else {
-			instance = this._modelInstances[name];
+			instance = this._modelInstances.get(name);
 		}
 	}
 
@@ -622,7 +622,7 @@ Base.setMethod(function getModel(name, init, options) {
 	}
 
 	if (options.cache !== false) {
-		this._modelInstances[name] = instance;
+		this._modelInstances.set(name, instance);
 	}
 
 	return instance;

package/lib/core/setting.js

@@ -452,6 +452,9 @@ const Group = Function.inherits('Alchemy.Setting.Base', function Group(name, con
 
 	// All the children
 	this.children = new Map();
+
+	// Weak references to existing values
+	this.weak_values = new Blast.Classes.WeakValueSet();
 });
 
 /**
@@ -583,6 +586,14 @@ Group.setMethod(function createGroup(name) {
 	let group = new Group(name, this);
 	this.children.set(name, group);
 
+	if (this.weak_values.size) {
+		let group_value = group.generateValue();
+
+		for (let existing of this.weak_values) {
+			this.setDefaultValue(existing, {[name]: group_value});
+		}
+	}
+
 	return group;
 });
 
@@ -633,6 +644,8 @@ Group.setMethod(function generateValue() {
 
 	this.setDefaultValue(result, object);
 
+	this.weak_values.add(result);
+
 	return result;
 });
 
@@ -1344,6 +1357,38 @@ GroupValue.setMethod(function _setPath(silent, path, raw_value) {
 	return this.getPath(path);
 });
 
+/**
+ * Force a value at the given path
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string|Array}   path
+ * @param    {Value}
+ */
+GroupValue.setMethod(function forceValueInstanceAtPath(path, value) {
+
+	if (typeof path == 'string') {
+		path = path.split('.');
+	}
+
+	if (this.definition.group == null && path[0] == this.definition.name) {
+		path.shift();
+	}
+
+	let last = path.pop();
+
+	let current = this;
+
+	while (path.length && current) {
+		let next = path.shift();
+		current = current.get(next);
+	}
+
+	current[VALUE][last] = value;
+});
+
 /**
  * Convert to a datasource array
  *
@@ -1584,6 +1629,20 @@ Value.setMethod(function getPath(path) {
 	return current;
 });
 
+/**
+ * Force a value at the given path
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string|Array}   path
+ * @param    {Value}
+ */
+Value.setMethod(function forceValueInstanceAtPath(path, value) {
+	throw new Error('Unable to perform on a simple Value instance');
+});
+
 if (Blast.isBrowser) {
 	return;
 }
@@ -1675,15 +1734,61 @@ const MagicGroupValue = Function.inherits('Magic', 'Alchemy.Setting', function M
  */
 MagicGroupValue.setMethod(function __get(key) {
 
-	let result = this[VALUE].get(key);
+	let result = this[key];
+
+	if (result != null) {
+		return result;
+	}
+
+	result = this[VALUE].get(key);
+
+	if (result == null) {
+		return this[VALUE][key];
+	}
 
 	if (!result) {
-		return;
+		return result;
 	}
 
 	if (result.is_group) {
 		return result.toProxyObject();
 	}
 
+	if (!result.get) {
+		return result;
+	}
+
 	return result.get();
+});
+
+/**
+ * The magic getter
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}   key
+ */
+MagicGroupValue.setMethod(function __ownKeys() {
+	return Object.keys(this[VALUE].toObject())
+});
+
+/**
+ * The magic getter
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}   key
+ */
+MagicGroupValue.setMethod(function __describe(key) {
+	let result = Object.getOwnPropertyDescriptor(this[VALUE], key);
+
+	if (result == null) {
+		result = Object.getOwnPropertyDescriptor(this, key);
+	}
+
+	return result;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.4.0-alpha.7",
+	"version": "1.4.0-alpha.9",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",