alchemymvc 1.2.2 → 1.2.5

package/lib/app/helper_model/field_config.js

@@ -44,15 +44,24 @@ const FieldConfig = Fn.inherits('Alchemy.Base', 'Alchemy.Criteria', function Fie
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.3
  *
  * @param    {Object}   obj
  *
  * @return   {Alchemy.Form.FieldConfig}
  */
 FieldConfig.setStatic(function unDry(obj) {
-	let set = new FieldConfig(obj.path, obj.options);
-	return set;
+	let result = new FieldConfig(obj.path, obj.options);
+
+	if (obj.association) {
+		result.association = obj.association;
+	}
+
+	if (obj.model) {
+		result.model = obj.model;
+	}
+
+	return result;
 });
 
 /**
@@ -122,7 +131,7 @@ FieldConfig.setMethod(function getContextModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.2
+ * @version  1.2.5
  */
 FieldConfig.setMethod(function getModel() {
 
@@ -133,13 +142,15 @@ FieldConfig.setMethod(function getModel() {
 	}
 
 	if (this.association) {
-		let config = model.getAssociation(this.association);
+		try {
+			let config = model.getAssociation(this.association);
 
-		if (config) {
-			model = alchemy.getModel(config.modelName);
-		} else {
-			model = null;
-		}
+			if (config) {
+				model = alchemy.getModel(config.modelName);
+			} else {
+				model = null;
+			}
+		} catch (ignored_error) {}
 	}
 
 	return model;
@@ -150,17 +161,28 @@ FieldConfig.setMethod(function getModel() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.2
+ * @version  1.2.5
+ *
+ * @return   {Field}
  */
 FieldConfig.setMethod(function getFieldDefinition() {
 
-	let model = this.getModel();
+	let model = this.getModel(),
+	    result;
 
-	if (!model) {
-		return;
+	if (model) {
+		result = model.getField(this.local_path);
+	}
+
+	if (!result && this.options?.type) {
+		let constructor = Classes.Alchemy.Field.Field.getMember(this.options.type);
+
+		if (constructor) {
+			result = new constructor(null, this.name);
+		}
 	}
 
-	return model.getField(this.local_path);
+	return result;
 });
 
 /**
@@ -194,6 +216,7 @@ FieldConfig.setMethod(function toJSON() {
 		local_path  : this.local_path,
 		association : this.association,
 		options     : this.options,
+		model       : this.model,
 	};
 });
 

package/lib/app/helper_model/field_set.js

@@ -65,7 +65,7 @@ FieldSet.setStatic(function fromArray(fields) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @type    {Deck}
  */
@@ -88,6 +88,14 @@ FieldSet.enforceProperty(function fields(new_value, old_value) {
 				};
 			}
 
+			if (!entry.options) {
+				entry.options = {};
+			}
+
+			if (entry.type) {
+				entry.options.type = entry.type;
+			}
+
 			field = new Classes.Alchemy.Criteria.FieldConfig(entry.name, entry.options);
 			deck.set(entry.name, field);
 		}
@@ -205,4 +213,17 @@ FieldSet.setMethod(function addField(name, options) {
 	this.fields.set(name, config);
 
 	return config;
+});
+
+/**
+ * Get a fieldconfig by its field name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @return   {Alchemy.Form.FieldConfig}
+ */
+FieldSet.setMethod(function get(name) {
+	return this.fields.get(name);
 });

package/lib/app/helper_model/model.js

@@ -32,7 +32,7 @@ if (Blast.isBrowser) {
  *
  * @param    {Object}   options
  */
-var Model = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Model', function Model(options) {
+const Model = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Model', function Model(options) {
 	this.init(options);
 });
 
@@ -49,6 +49,22 @@ Model.constitute(function setModelName() {
 	this.table = this.model_name.tableize();
 });
 
+/**
+ * Map these events to methods
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ */
+Model.mapEventToMethod({
+	saved          : 'afterSave',
+	finding        : 'beforeFind',
+	queried        : 'afterQuery',
+	associated     : 'afterAssociated',
+	found          : 'afterData',
+	foundDocuments : 'afterFind',
+});
+
 /**
  * Is the given action enabled on the server?
  *
@@ -485,7 +501,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -530,14 +546,10 @@ Model.setMethod(function find(type, criteria, callback) {
 		error = new TypeError('Find type should be a string');
 	}
 
-	if (!Blast.Classes.Alchemy.Criteria.Criteria.isCriteria(criteria)) {
-		try {
-			let options = criteria;
-			criteria = new Blast.Classes.Alchemy.Criteria();
-			criteria.applyOldOptions(options);
-		} catch (err) {
-			error = err;
-		}
+	try {
+		criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria);
+	} catch (err) {
+		error = err;
 	}
 
 	if (error != null) {
@@ -1103,13 +1115,20 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 
 		aliases[alias] = function aliasRecordTask(nextAlias) {
 
-			var key;
+			let pledge,
+			    key;
 
 			if (options.create_references !== false) {
 				key = alchemy.checksum(assoc_crit);
 
-				if (key != null && options.assoc_cache[key]) {
-					return nextAlias(null, options.assoc_cache[key]);
+				if (key != null) {
+					if (options.assoc_cache[key]) {
+						Pledge.done(options.assoc_cache[key], nextAlias);
+						return;
+					} else {
+						pledge = new Pledge();
+						options.assoc_cache[key] = pledge;
+					}
 				}
 			}
 
@@ -1125,6 +1144,11 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 				}
 
 				if (err != null) {
+
+					if (pledge) {
+						pledge.reject(err);
+					}
+
 					return nextAlias(err);
 				}
 
@@ -1140,6 +1164,10 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 
 				if (key) {
 					options.assoc_cache[key] = result;
+
+					if (pledge) {
+						pledge.resolve(result);
+					}
 				}
 
 				nextAlias(null, result);

package/lib/class/conduit.js

@@ -5,6 +5,7 @@ var fileCache  = alchemy.shared('files.fileCache'),
     libua   = alchemy.use('useragent'),
     zlib    = alchemy.use('zlib'),
     BODY    = Symbol('body'),
+	TESTED_ROUTES = Symbol('tested_routes'),
     magic,
     fs = alchemy.use('fs'),
     prefixes = alchemy.shared('Routing.prefixes');
@@ -265,6 +266,62 @@ Conduit.setMethod(function setRequestBody(body) {
 	Object.assign(this.body, body);
 });
 
+/**
+ * Has the given route been tested yet?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Route}
+ */
+Conduit.setMethod(function hasRouteBeenTested(route) {
+
+	if (!route || !this[TESTED_ROUTES]) {
+		return false;
+	}
+
+	return this[TESTED_ROUTES].has(route);
+});
+
+/**
+ * Mark this route as having been tested
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Route}
+ */
+Conduit.setMethod(function markRouteAsTested(route) {
+
+	if (!this[TESTED_ROUTES]) {
+		this[TESTED_ROUTES] = new Set();
+	}
+
+	this[TESTED_ROUTES].add(route);
+});
+
+/**
+ * Rewrite a certain URL parameter
+ * (Causing some kind of redirect)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}   route_param
+ * @param    {*}        new_value
+ */
+Conduit.setMethod(function rewriteRequestRouteParam(route_param, new_value) {
+
+	if (!this.rewritten_request_route_param) {
+		this.rewritten_request_route_param = {};
+	}
+
+	this.rewritten_request_route_param[route_param] = new_value;
+});
+
 /**
  * Set the request files
  *
@@ -426,7 +483,7 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.2.5
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -457,6 +514,12 @@ Conduit.setMethod(async function parseRequest() {
 		this.encrypted = this.request.connection.encrypted;
 	}
 
+	if (this.rewritten_request_route_param) {
+		let params = Object.assign({}, this.route_string_parameters, this.rewritten_request_route_param);
+		let new_url = this.route.generateUrl(params, this);
+		this.overrideResponseUrl(new_url);
+	}
+
 	// If the url has already been parsed, return early
 	if (this.url) {
 		return;
@@ -1170,7 +1233,7 @@ Conduit.setMethod(function callHandler() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String|Object}   options   Options or url
  */
@@ -1214,11 +1277,27 @@ Conduit.setMethod(function postpone(options) {
 	// Nullify the response
 	this.response = null;
 
-	let old_url = String(this.url);
-
 	// Set the original url
-	this.setHeader('x-history-url', old_url);
-	this.expose('redirected_to', old_url);
+	this.overrideResponseUrl(this.url)
+});
+
+/**
+ * Set the response url
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|RURL}   url
+ */
+Conduit.setMethod(function overrideResponseUrl(url) {
+
+	if (typeof url != 'string') {
+		url = String(url);
+	}
+
+	this.setHeader('x-history-url', url);
+	this.expose('redirected_to', url);
 });
 
 /**
@@ -1226,7 +1305,7 @@ Conduit.setMethod(function postpone(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
  * @param    {String|Object}   options   Options or url
@@ -1283,8 +1362,7 @@ Conduit.setMethod(function redirect(status, options) {
 				}
 
 				// Register the new url as the one to use for the history
-				this.setHeader('x-history-url', url);
-				this.expose('redirected_to', url);
+				this.overrideResponseUrl(url);
 
 				this.original_path = url;
 

package/lib/class/document.js

@@ -386,7 +386,7 @@ Document.setMethod(function toDry() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.4
  *
  * @param    {WeakMap}   wm
  *
@@ -412,7 +412,10 @@ Document.setMethod(function toHawkejs(wm) {
 	// Sometimes we get an EMPTY $record value,
 	// this is probably because it's already in the process of being clones
 	if (!Object.isEmpty(record)) {
-		result.setDataRecord(record);
+		// Get clean options
+		let options = JSON.clone(this.getCleanOptions(), 'toHawkejs', wm);
+
+		result.setDataRecord(record, options);
 	} else {
 		record.$record = record;
 	}
@@ -425,6 +428,24 @@ Document.setMethod(function toHawkejs(wm) {
 	return result;
 });
 
+/**
+ * Keep private fields when sending to browser
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ */
+Document.setMethod(function keepPrivateFields(value) {
+
+	if (arguments.length == 0) {
+		value = true;
+	} else {
+		value = !!value;
+	}
+
+	this.$options.keep_private_fields = value;
+});
+
 /**
  * Return the basic record for JSON
  *
@@ -536,27 +557,24 @@ Document.setMethod(function remove(callback) {
 /**
  * Add associated data to this record
  *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.3
+ * @version  1.2.3
  *
- * @param    {Criteria} criteria
- * @param    {Function} callback
+ * @param    {Criteria|String} criteria
  *
- * @return   {Pledge}
+ * @return   {Criteria}
  */
-Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+Document.setMethod(function preparePopulationCriteria(criteria) {
 
-	var that  = this,
+	let type = typeof criteria,
 	    model = this.$model,
-	    type  = typeof criteria,
 	    selects;
 
 	if (type == 'string') {
 		selects = [criteria];
 		criteria = {};
 	} else if (type == 'function') {
-		callback = criteria;
 		criteria = {};
 	} else if (Array.isArray(criteria)) {
 		selects = criteria;
@@ -583,7 +601,31 @@ Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData
 		}
 	}
 
-	return model.addAssociatedDataToRecord(criteria, this.$record, callback);
+	return criteria;
+});
+
+/**
+ * Add associated data to this record
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.2.3
+ *
+ * @param    {Criteria} criteria
+ * @param    {Function} callback
+ *
+ * @return   {Pledge}
+ */
+Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+
+	if (typeof criteria == 'function') {
+		callback = criteria;
+		criteria = null;
+	}
+
+	criteria = this.preparePopulationCriteria(criteria);
+
+	return this.$model.addAssociatedDataToRecord(criteria, this.$record, callback);
 });
 
 /**

package/lib/class/document_list.js

@@ -63,13 +63,23 @@ DocumentList.setMethod(function clone() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  *
  * @param    {Criteria}   criteria
  *
  * @return   {Pledge}
  */
 DocumentList.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria) {
+
+	if (!this.records?.length) {
+		return;
+	}
+
+	let doc = this.records[0];
+
+	// Use the first doc to prepare the population criteria
+	criteria = doc.preparePopulationCriteria(criteria);
+
 	return Function.forEach.parallel(this.records, function eachDoc(doc, key, next) {
 		doc.populate(criteria).done(next);
 	});
@@ -105,4 +115,26 @@ DocumentList.setMethod(function findNextBatch(callback) {
 	}
 
 	this.options.model.find('all', options, callback);
+});
+
+/**
+ * Keep private fields when sending to browser
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ */
+DocumentList.setMethod(function keepPrivateFields(value) {
+
+	if (arguments.length == 0) {
+		value = true;
+	} else {
+		value = !!value;
+	}
+
+	let record;
+
+	for (record of this) {
+		record.keepPrivateFields(value);
+	}
 });

package/lib/class/element.js

@@ -5,9 +5,7 @@
  * @since    1.0.0
  * @version  1.0.0
  */
-var Element = Function.inherits('Hawkejs.Element', 'Alchemy.Element', function Element() {
-	return Element.super.call(this);
-});
+const Element = Function.inherits('Hawkejs.Element', 'Alchemy.Element', 'Element');
 
 /**
  * The default element prefix (when element contains no hyphen) is "al"
@@ -23,21 +21,12 @@ Function.getNamespace('Alchemy.Element').setStatic('default_element_prefix', 'al
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.2.1
+ * @version  1.2.5
  *
  * @return  {RURL}
  */
 Element.setMethod(function getCurrentUrl() {
-	if (Blast.isBrowser) {
-
-		if (hawkejs.scene.opening_url && hawkejs.scene.opening_url.url) {
-			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
-		}
-		
-		return Blast.Classes.RURL.parse(window.location);
-	} else if (this.hawkejs_renderer && this.hawkejs_renderer.variables && this.hawkejs_renderer.variables.__url) {
-		return this.hawkejs_renderer.variables.__url.clone();
-	}
+	return this.hawkejs_renderer?.helpers?.Router?.current_url;
 });
 
 /**
@@ -111,4 +100,20 @@ Element.setMethod(function getModel(model_name, options) {
 	this._model_instances[model_name] = instance;
 
 	return instance;
+});
+
+/**
+ * Default translation implementation
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ *
+ * @param   {String}   key
+ * @param   {Object}   parameters
+ *
+ * @return  {String}
+ */
+Element.setMethod(function __(key, parameters) {
+	return key;
 });

package/lib/class/field.js

@@ -105,12 +105,17 @@ Field.setStatic(function createPathEvaluator(path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.0.0
+ * @version  1.2.4
  *
  * @type     {Boolean}
  */
 Field.setProperty(function is_private() {
-	return !!this.options.is_private;
+
+	if (this.options.is_private || this.options.private) {
+		return true;
+	}
+
+	return false;
 });
 
 /**
@@ -1044,7 +1049,7 @@ Field.setMethod(function getRules() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.4
- * @version  1.1.4
+ * @version  1.2.5
  */
 Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 
@@ -1053,4 +1058,10 @@ Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 	// Use the final result, if we found something or not
 	record[this.name] = found.result;
 	record['_prefix_' + this.name] = found.prefix;
+
+	if (!record.$translated_fields) {
+		record.$translated_fields = {};
+	}
+
+	record.$translated_fields[this.name] = found.prefix;
 });