alchemymvc 1.3.2 → 1.3.3-alpha

package/lib/app/helper_model/criteria.js

@@ -1503,7 +1503,7 @@ Select.setMethod(function addAssociation(name) {
 			this.requireFieldForQuery(info.options.localKey);
 		}
 	} catch (err) {
-		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.modelName);
+		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.model_name);
 	}
 
 	return this.associations[name];

package/lib/app/helper_validator/00_validator.js

@@ -218,6 +218,10 @@ Validator.setMethod(async function validateDocument(root, context, schema) {
 
 		fields_with_value = field.getDocumentValues(root);
 
+		if (!fields_with_value?.length) {
+			continue;
+		}
+
 		violation = await this.validateFieldValue(fields_with_value);
 
 		if (violation) {

package/lib/class/document.js

@@ -645,31 +645,26 @@ Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData
 /**
  * Get the display field value
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.3.0
- * @version  1.3.0
+ * @version  1.3.3
  *
  * @param    {Object}   options
  *
- * @return   {String}
+ * @return   {String|undefined}
  */
-Document.setMethod(function getDisplayFieldValue(options) {
-
-	var display_field,
-	    result,
-	    i;
-
-	if (!options) {
-		options = {};
-	}
+Document.setMethod(function getDisplayFieldValue(options = {}) {
 
-	display_field = Array.cast(this.$model.display_field);
+	let display_field = Array.cast(this.$model.display_field);
 
 	// If there are fields we prefer, check those first
 	if (options.prefer) {
 		display_field = Array.cast(options.prefer).concat(display_field);
 	}
 
+	let result,
+	    i;
+
 	for (i = 0; i < display_field.length; i++) {
 		result = this[display_field[i]];
 
@@ -682,8 +677,14 @@ Document.setMethod(function getDisplayFieldValue(options) {
 		}
 	}
 
+	let fallback_property = options.fallback ?? '_id';
+
+	if (!fallback_property) {
+		return;
+	}
+
 	// If nothing was found, return the _id value
-	return String(this._id);
+	return String(this[fallback_property]);
 });
 
 /**

package/lib/class/sitemap.js

@@ -281,7 +281,12 @@ Sitemap.setTypedMethod([Types.Alchemy.Route, Types.Object, Types.Alchemy.Criteri
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.3
+ *
+ * @param    {Route}   route           The route of which to add something to the map
+ * @param    {Object}  config          Sitemap configuration for this route
+ * @param    {Object}  parameters      The parameter object to use for generating the url
+ * @param    {String}  forced_prefix   The optional prefix to use
  *
  * @return   {Promise}
  */
@@ -290,6 +295,7 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 	if (!parameters) {
 		parameters = {};
 	} else {
+		// Make an overlay object
 		parameters = Object.create(parameters);
 	}
 
@@ -319,7 +325,7 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 		let route_config = Object.assign({}, config);
 
 		if (parameters && parameters.getDisplayFieldValue) {
-			route_config.title = parameters.getDisplayFieldValue({prefix});
+			route_config.title = parameters.getDisplayFieldValue({prefix, fallback: false});
 		}
 
 		if (!route_config.title) {
@@ -333,7 +339,9 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 		}
 
 		if (!route_config.title) {
-			route_config.title = route.name;
+			// Skip this if no title was found.
+			// It's better to show nothing
+			continue;
 		}
 
 		this.addUrl(config.category, url, route_config, prefix);

package/lib/core/middleware.js

@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.7
+ * @version  1.3.3
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -434,7 +434,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 				}
 			};
 
-			if (alchemy.settings.debug && alchemy.settings.source_map !== false) {
+			if (alchemy.settings.debug && alchemy.settings.source_map) {
 				minify_options.sourceMap = {
 					url: 'inline'
 				};

package/lib/init/alchemy.js

@@ -516,7 +516,7 @@ Alchemy.setMethod(function printLog(level, args, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.4.0
- * @version  1.1.6
+ * @version  1.3.3
  */
 Alchemy.setMethod(function loadSettings() {
 
@@ -689,6 +689,21 @@ Alchemy.setMethod(function loadSettings() {
 		}
 	}
 
+	if (settings.debug) {
+
+		if (settings.source_map === 'false') {
+			settings.source_map = false;
+		}
+
+		if (settings.source_map == null || settings.source_map) {
+			settings.source_map = true;
+		} else {
+			settings.source_map = false;
+		}
+	} else {
+		settings.source_map = false;
+	}
+
 	if (settings.preload) {
 		this.doPreload();
 	}
@@ -744,7 +759,7 @@ Alchemy.setMethod(function ready(callback) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.2
- * @version  1.1.2
+ * @version  1.3.3
  */
 Alchemy.setMethod(async function doPreload() {
 
@@ -771,7 +786,7 @@ Alchemy.setMethod(async function doPreload() {
 
 		Blast.getClientPath({
 			modify_prototypes : true,
-			create_source_map : alchemy.settings.debug,
+			create_source_map : alchemy.settings.source_map,
 			enable_coverage   : !!global.__coverage__
 		});
 	}

package/lib/stages.js

@@ -183,9 +183,9 @@ alchemy.sputnik.add(function define_debug() {
  * The "hawkejsSetup" stage:
  * Initialize Hawkejs
  *
- * @author        Jelle De Loecker   <jelle@develry.be>
+ * @author        Jelle De Loecker   <jelle@elevenways.be>
  * @since         0.0.1
- * @version       1.1.0
+ * @version       1.3.3
  */
 alchemy.sputnik.add(function hawkejs_setup() {
 
@@ -201,7 +201,7 @@ alchemy.sputnik.add(function hawkejs_setup() {
 		Blast.getClientPath({
 			modify_prototypes : true,
 			ua                : req.conduit.headers.useragent,
-			create_source_map : alchemy.settings.debug,
+			create_source_map : alchemy.settings.source_map,
 			enable_coverage   : !!global.__coverage__
 		}).done(gotClientFile);
 
@@ -243,7 +243,7 @@ alchemy.sputnik.add(function hawkejs_setup() {
 				refresh           : true,
 				modify_prototypes : true,
 				ua                : req.conduit.headers.useragent,
-				create_source_map : alchemy.settings.debug,
+				create_source_map : alchemy.settings.source_map,
 			}).done(gotClientFile);
 		}
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.2",
+	"version": "1.3.3-alpha",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~2.0.1",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.2",
+		"hawkejs"          : "~2.3.3",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.2",
+		"protoblast"       : "~0.8.3",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",