alchemymvc 1.3.12 → 1.3.14

package/lib/app/helper_model/data_provider.js

@@ -82,6 +82,15 @@ DataProvider.setAbstractMethod('getAll');
  */
 DataProvider.setAbstractMethod('getPage');
 
+/**
+ * Get a single data by id (or other unique identifier)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+DataProvider.setAbstractMethod('getById');
+
 /**
  * Return an object for json-drying this document
  *

package/lib/app/helper_model/document.js

@@ -636,6 +636,42 @@ Document.setMethod(function toDry() {
 	};
 }, false);
 
+/**
+ * Get the displaytitle of this document, or null
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.13
+ * @version  1.3.14
+ *
+ * @return   {String}
+ */
+Document.setMethod(function getDisplayTitleOrNull() {
+
+	if (this.$model) {
+		return this.$model.getDisplayTitleOrNull(this);
+	}
+
+	return null;
+});
+
+/**
+ * Get the displaytitle of this document
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.13
+ * @version  1.3.14
+ *
+ * @return   {String}
+ */
+Document.setMethod(function getDisplayTitle() {
+
+	if (this.$model) {
+		return this.$model.getDisplayTitle(this);
+	}
+
+	return '';
+});
+
 /**
  * Actually initialize this instance
  *

package/lib/app/helper_model/model.js

@@ -452,23 +452,22 @@ Model.setMethod(function getFindOptions(options) {
 	return Object.assign({}, def_options, options);
 });
 
-
 /**
  * Get the title to display for this record
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.2.7
+ * @version  1.3.14
  *
  * @param    {Object}        item       The record item of this model
  * @param    {String|Array}  fallbacks  Extra fallbacks to use
  * 
  * @return   {String}        The display title to use
  */
-Model.setMethod(function getDisplayTitle(item, fallbacks) {
+Model.setMethod(function getDisplayTitleOrNull(item, fallbacks) {
 
 	if (!item) {
-		return 'Undefined item';
+		return null;
 	}
 
 	let main;
@@ -509,7 +508,38 @@ Model.setMethod(function getDisplayTitle(item, fallbacks) {
 		}
 	}
 
-	return main[this.primary_key] || '';
+	return null;
+});
+
+/**
+ * Get the title to display for this record
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.0.1
+ * @version  1.3.14
+ *
+ * @param    {Object}        item       The record item of this model
+ * @param    {String|Array}  fallbacks  Extra fallbacks to use
+ * 
+ * @return   {String}        The display title to use
+ */
+Model.setMethod(function getDisplayTitle(item, fallbacks) {
+
+	if (!item) {
+		return 'Undefined item';
+	}
+
+	let result = this.getDisplayTitleOrNull(item, fallbacks);
+
+	if (result == null) {
+		result = main[this.primary_key] || '';
+
+		if (result && typeof result != 'string') {
+			result = '' + result;
+		}
+	}
+
+	return result;
 });
 
 /**

package/lib/app/helper_model/remote_data_provider.js

@@ -17,27 +17,77 @@ const RemoteDataProvider = Function.inherits('Alchemy.DataProvider', 'Remote');
 RemoteDataProvider.addConfig('source');
 
 /**
- * Get all the data
+ * Do a fetch
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.2.2
- * @version  1.3.12
+ * @since    1.3.13
+ * @version  1.3.13
+ *
+ * @return   {Pledge|Array}
  */
-RemoteDataProvider.setMethod(async function getAll() {
+RemoteDataProvider.setMethod(function performSourceRequest(type, options) {
 
 	if (!this.source) {
 		return [];
 	}
 
-	let options = {};
+	if (!options) {
+		options = {};
+	}
+
+	if (!options.get) {
+		options.get = {};
+	}
 
 	if (this.context) {
-		options.get = {
-			context: this.context
-		};
+		options.get.context = this.context;
 	}
 
-	let result = await alchemy.fetch(this.source, options);
+	options.get.provider_method = type;
+
+	return alchemy.fetch(this.source, options);
+});
+
+/**
+ * Get all the data
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.3.13
+ */
+RemoteDataProvider.setMethod(function getAll() {
+	return this.performSourceRequest('all');
+});
+
+/**
+ * Get a specific id
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.3.13
+ */
+RemoteDataProvider.setMethod(function getById(id) {
+	return this.performSourceRequest('by_id', {
+		get: {
+			id: id,
+		}
+	});
+});
 
-	return result;
+/**
+ * Get a specific page
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.3.13
+ *
+ * @param    {Number}   page   1-indexed page number
+ */
+RemoteDataProvider.setMethod(function getPage(page) {
+	return this.performSourceRequest('page', {
+		get: {
+			page : page,
+			page_size: this.page_size,
+		}
+	});
 });

package/lib/class/conduit.js

@@ -1824,7 +1824,7 @@ Conduit.setMethod(function end(message) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.3.14
  */
 Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
@@ -1862,6 +1862,11 @@ Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
 	for (key in this.response_headers) {
 		value = this.response_headers[key];
+
+		if (value == null) {
+			continue;
+		}
+
 		this.response.setHeader(key, value);
 	}
 
@@ -2033,7 +2038,7 @@ Conduit.setTypedMethod([Types.String, Types.Object.optional()], function serveFi
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.3.13
  *
  * @param    {Alchemy.Inode.File}   file      The file to serve
  * @param    {Object}               options   Options, including headers
@@ -2043,12 +2048,17 @@ Conduit.setTypedMethod([Types.Alchemy.Inode.File, Types.Object.optional()], asyn
 	if (file.path && !FILECACHE.has(file.path)) {
 		FILECACHE.set(file.path, file);
 	}
-	
+
+	let stats = await file.getStats();
+
 	if (alchemy.settings.cache && (!options.cache_time && options.cache_time !== false)) {
-		let stats = await file.getStats();
 		options.cache_time = stats.mtime;
 	}
 
+	if (options.content_length == null) {
+		options.content_length = stats.size;
+	}
+
 	if (!options.mimetype) {
 		options.mimetype = await file.getMimetype();
 	}
@@ -2121,7 +2131,7 @@ Conduit.setTypedMethod([Types.Stream, Types.Object.optional()], function serveFi
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.14
  *
  * @param    {Stream}   stream    The stream to send
  * @param    {Object}   options   Options, including headers
@@ -2194,9 +2204,13 @@ Conduit.setMethod(function _sendStream(stream, options) {
 		// Set the gzip header
 		this.setHeader('content-encoding', 'gzip');
 		this.setHeader('vary', 'accept-encoding');
+		this.setHeader('transfer-encoding', 'chunked');
+		this.setHeader('content-length', null);
 
 		// Create the gzip stream
 		out_stream = out_stream.pipe(zlib.createGzip());
+	} else if (options.content_length != null) {
+		this.setHeader('content-length', options.content_length);
 	}
 
 	if (options.cleanup_stream) {
@@ -2219,7 +2233,13 @@ Conduit.setMethod(function _sendStream(stream, options) {
 
 	// Set the response headers
 	for (key in this.response_headers) {
-		response.setHeader(key, this.response_headers[key]);
+		let value = this.response_headers[key];
+
+		if (value == null) {
+			continue;
+		}
+
+		response.setHeader(key, value);
 	}
 
 	if (this.new_cookie_header.length) {

package/lib/core/client_alchemy.js

@@ -364,6 +364,63 @@ Alchemy.setMethod(function getValidatorClass(name) {
 	}
 });
 
+/**
+ * Get the display title of something
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.13
+ * @version  1.3.14
+ *
+ * @param    {Object}   value
+ *
+ * @return   {String}
+ */
+Alchemy.setMethod(function getDisplayTitle(value, max_length) {
+
+	//.title || value.name || value.slug || value.$pk || value._id || value.id
+
+	if (!value || Object.isPrimitive(value)) {
+
+		if (max_length == null) {
+			max_length = 48;
+		}
+
+		let result = '' + value;
+
+		if (result.length > max_length) {
+			result = result.truncate(max_length - 2);
+		}
+
+		return result;
+	}
+
+	let type = typeof value;
+
+	if (type == 'symbol') {
+		return value.toString();
+	}
+
+	let result;
+
+	// `getDisplayTitle` might already return the ID as a fallback,
+	// so we prefer `getDisplayTitleOrNull`
+	if (typeof value.getDisplayTitleOrNull == 'function') {
+		result = value.getDisplayTitleOrNull();
+	} else if (typeof value.getDisplayTitle == 'function') {
+		result = value.getDisplayTitle();
+	}
+
+	if (result == null || result === '') {
+		result = value.title || value.name || value.label || value.slug || value.id || value.$pk || value._id;
+	}
+
+	if (max_length != null && typeof result == 'string' && result.length > max_length) {
+		result = result.truncate(max_length - 2);
+	}
+
+	return result || '';
+});
+
 /**
  * Pick a translation
  *

package/lib/core/middleware.js

@@ -444,9 +444,10 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			};
 
 			if (alchemy.settings.debug && alchemy.settings.source_map) {
-				minify_options.sourceMap = {
+				console.warn('Source maps have been disabled because alchemy.settings.minify_js is true');
+				/*minify_options.sourceMap = {
 					url: 'inline'
-				};
+				};*/
 			}
 
 			result = await Terser.minify(data, minify_options);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.12",
+	"version": "1.3.14",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -36,7 +36,7 @@
 		"socket.io"        : "~4.6.0",
 		"@11ways/socket.io-stream" : "~0.9.2",
 		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.16.3",
+		"terser"           : "~5.18.1",
 		"toobusy-js"       : "~0.5.1",
 		"useragent"        : "~2.3.0"
 	},