alchemymvc 1.3.6 → 1.3.7

package/lib/app/helper/alchemy_helper.js

@@ -290,16 +290,18 @@ Alchemy.setMethod(function group(name, id, callback) {
 /**
  * Print a segment
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.5.0
- * @version  1.1.5
+ * @version  1.3.7
  *
  * @param    {String|Object}   options
  * @param    {Object}          data
+ *
+ * @return   {HePlaceholder}
  */
 Alchemy.setMethod(function segment(options, data) {
 
-	var that = this;
+	const that = this;
 
 	if (typeof options == 'string') {
 		options = {
@@ -307,10 +309,14 @@ Alchemy.setMethod(function segment(options, data) {
 		};
 	}
 
-	let start = Date.now();
+	let print_placeholder = options.print;
+
+	if (print_placeholder == null) {
+		print_placeholder = true;
+	}
 
 	// Prints a placeholder
-	this.view.async(function doAsync(next) {
+	return this.view.async(function doAsync(next) {
 
 		var conduit,
 		    route;
@@ -354,7 +360,7 @@ Alchemy.setMethod(function segment(options, data) {
 
 			next(null, block);
 		});
-	});
+	}, {print: print_placeholder});
 });
 
 /**

package/lib/app/helper/router_helper.js

@@ -223,7 +223,7 @@ Router.setMethod(function applyDirective(element, name, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.6
+ * @version  1.3.7
  *
  * @param    {String}   name
  * @param    {Boolean}  socket_route   Look in the socket routes
@@ -288,22 +288,17 @@ Router.setMethod(function routeConfig(name, socket_route) {
 	if (routes[section] != null && routes[section][name] != null) {
 		let route = routes[section][name];
 
-		let result = {
-			section : section,
-			name    : name
-		};
+		let result;
 
 		if (socket_route) {
-			result.socket_route = true;
+			result = {
+				section      : section,
+				name         : name,
+				socket_route : true,
+			};
 		} else {
+			result = Object.create(route);
 			result.socket_route = false;
-			result.paths = route.paths;
-			result.breadcrumb = route.breadcrumb;
-			result.has_breadcrumb_assignments = route.has_breadcrumb_assignments;
-			result.keys = route.keys;
-			result.methods = route.methods;
-			result.permission = route.permission;
-			result.has_permission_assignments = route.has_permission_assignments;
 		}
 
 		let router_options;
@@ -329,9 +324,9 @@ Router.setMethod(function routeConfig(name, socket_route) {
 /**
  * Return the plain url for the given url name & parameters object
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.3.7
  *
  * @param    {String}   name
  * @param    {Object}   parameters
@@ -392,6 +387,33 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 			return '#url_config_' + name + '_notfound';
 		}
 
+		if (config.param_definitions) {
+
+			let documents = {},
+			    definition,
+			    key;
+
+			for (key in config.param_definitions) {
+				definition = config.param_definitions[key];
+
+				// If this definition has a specific model name,
+				// try to get it from the parameters (and also remove it from there)
+				if (definition.type_class_name) {
+					if (!documents[definition.type_class_name]) {
+						documents[definition.type_class_name] = parameters[definition.type_class_name];
+
+						if (documents[definition.type_class_name]) {
+							delete parameters[definition.type_class_name];
+						}
+					}
+				}
+
+				if (!parameters[definition.name] && documents[definition.type_class_name]) {
+					parameters[definition.name] = documents[definition.type_class_name][definition.type_field_name];
+				}
+			}
+		}
+
 		// Remove [brackets]
 		url = url.replace(/\[.*?\]/g, '');
 		url = url.assign(parameters, true, RURL.encodeUriQuery);
@@ -717,7 +739,7 @@ Router.setMethod(function updateLanguageSwitcher(element, variables) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.5
- * @version  1.3.0
+ * @version  1.3.7
  *
  * @param    {String}   prefix    The prefix to use
  * @param    {Object}   variables
@@ -762,6 +784,8 @@ Router.setMethod(function translateCurrentRoute(prefix, variables) {
 
 	// Add the get queries
 	if (info.url && info.url.search) {
+		let key;
+
 		for (key in info.url.query) {
 
 			if (key == 'hajax' || key == 'h_diversion' || key == 'htop') {

package/lib/app/helper_field/boolean_field.js

@@ -33,4 +33,24 @@ BooleanField.setDatatype('boolean');
  */
 BooleanField.setMethod(function cast(value) {
 	return Boolean(value);
-});
+});
+
+/**
+ * See if the given vlaue is considered not-empty for this field
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.7
+ * @version  1.3.7
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Boolean}
+ */
+BooleanField.setMethod(function valueHasContent(value) {
+
+	if (value === undefined) {
+		return false;
+	}
+
+	return true;
+});

package/lib/app/helper_field/schema_field.js

@@ -89,13 +89,11 @@ SchemaField.setProperty(function requires_translating() {
 /**
  * Get the subschema of this field
  *
- * @constructor
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.7
  *
- * @param    {Object}   record
+ * @param    {Object}   record      This *should* be the schema context (might not be the root)
  * @param    {String}   some_path   Some path to a field in the wanted schema
  *
  * @return   {Schema}

package/lib/class/field.js

@@ -1078,6 +1078,36 @@ Field.setMethod(function getRules() {
 	return result;
 });
 
+/**
+ * See if the given vlaue is considered not-empty for this field
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.7
+ * @version  1.3.7
+ *
+ * @param    {Mixed}   value
+ *
+ * @return   {Boolean}
+ */
+Field.setMethod(function valueHasContent(value) {
+
+	if (value == null) {
+		return false;
+	}
+
+	if (value === '') {
+		return false;
+	}
+
+	if (Array.isArray(value)) {
+		if (value.length === 0) {
+			return false;
+		}
+	}
+
+	return true;
+});
+
 /**
  * Translate the given value
  *

package/lib/class/model.js

@@ -310,7 +310,7 @@ Model.prepareProperty('datasource', function datasource() {
  * @type {Object}
  */
 Model.prepareProperty('sort', function sort() {
-	return {created: 1};
+	return {[this.primary_key]: -1};
 });
 
 /**

package/lib/class/path_param_definition.js

@@ -5,7 +5,7 @@ const PathDefinition = Classes.Alchemy.PathDefinition;
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.7
  */
 const PathParamDefinition = Function.inherits('Alchemy.Base', function PathParamDefinition(config) {
 
@@ -41,6 +41,9 @@ const PathParamDefinition = Function.inherits('Alchemy.Base', function PathParam
 	// The optional type class constructor
 	this.type_class_constructor = null;
 
+	// Is this a model type?
+	this.is_model_type = false;
+
 	// Has all the config been parsed?
 	this.is_parsed = false;
 });
@@ -79,6 +82,30 @@ PathParamDefinition.setStatic(function from(input) {
 	return new this(input);
 });
 
+/**
+ * Get the model constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.7
+ * @version  1.3.7
+ */
+PathParamDefinition.enforceProperty(function model_constructor(new_value) {
+
+	if (!this.is_parsed) {
+		this.parseTypeDefinition();
+	}
+
+	if (!new_value) {
+		const constructor = this.type_class_constructor;
+
+		if (constructor && this.is_model_type) {
+			new_value = constructor;
+		}
+	}
+
+	return new_value;
+});
+
 /**
  * Parse the type definition
  *
@@ -131,7 +158,14 @@ PathParamDefinition.setMethod(function parseTypeDefinition() {
 		this.type_field_name = field_name;
 
 		const Model = Classes.Alchemy.Model || Classes.Alchemy.Client.Model;
-		this.type_class_constructor = Object.path(Model, class_name) || Object.path(Classes.Alchemy, class_name) || Object.path(Classes, class_name);
+
+		this.type_class_constructor = Object.path(Model, class_name);
+
+		if (this.type_class_constructor) {
+			this.is_model_type = true;
+		} else {
+			this.type_class_constructor = Object.path(Classes.Alchemy, class_name) || Object.path(Classes, class_name);
+		}
 	}
 });
 

package/lib/class/route.js

@@ -129,6 +129,116 @@ Route.setProperty(function has_type_class_checks() {
 	return result;
 });
 
+/**
+ * Routes with parameters can have schemas
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.7
+ * @version  1.3.7
+ *
+ * @return   {Schema}
+ */
+Route.enforceProperty(function schema(new_value) {
+
+	if (new_value) {
+		return new_value;
+	}
+
+	if (!this.has_path_assignments) {
+		return false;
+	}
+
+	let added_models = {},
+	    added_fields = {},
+	    prefix,
+	    param,
+	    model_constructor,
+	    definition;
+
+	new_value = alchemy.createSchema();
+	
+	for (prefix in this.paths) {
+		definition = this.paths[prefix];
+
+		if (!definition?.param_definitions?.length) {
+			continue;
+		}
+
+		for (param of definition.param_definitions) {
+			model_constructor = param.model_constructor;
+
+			if (model_constructor) {
+
+				if (added_models[model_constructor.name]) {
+					continue;
+				}
+
+				if (added_fields[param.name]) {
+					continue;
+				}
+
+				added_models[model_constructor.name] = true;
+
+				try {
+					new_value.belongsTo(model_constructor.name);
+				} catch (err) {
+					// Ignored
+					alchemy.distinctProblem('route-schema-' + this.name, 'Route schema error', {error: err});
+				}
+			} else {
+				new_value.addField(param.name, 'String');
+				added_fields[param.name] = true;
+			}
+		}
+	}
+
+	return new_value;
+});
+
+/**
+ * Get all the param definitions
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.7
+ * @version  1.3.7
+ *
+ * @return   {Object}
+ */
+Route.enforceProperty(function param_definitions(new_value) {
+
+	if (new_value) {
+		return new_value;
+	}
+
+	let prefix,
+	    param,
+	    key,
+	    definition;
+
+	new_value = {};
+
+	for (prefix in this.paths) {
+		definition = this.paths[prefix];
+
+		if (!definition.param_definitions?.length) {
+			continue;
+		}
+
+		for (param of definition.param_definitions) {
+			key = prefix + '_' + param.name;
+
+			new_value[key] = {
+				name            : param.name,
+				type_class_name : param.type_class_name,
+				type_field_name : param.type_field_name,
+				is_model_type   : param.is_model_type,
+			};
+		}
+	}
+
+	return new_value;
+});
+
 /**
  * Set the breadcrumb for this route
  *

package/lib/class/router.js

@@ -1163,7 +1163,7 @@ RouterClass.setMethod(function getOptions(result) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.3.7
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1212,6 +1212,8 @@ RouterClass.setMethod(function getRoutes(result) {
 			has_permission_assignments : route.has_permission_assignments || undefined,
 			title                      : route.title,
 			visible_location           : route.visible_location,
+			schema                     : route.schema,
+			param_definitions          : route.param_definitions,
 		};
 	}
 

package/package.json

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