boomack 0.8.2 → 0.9.2

package/client/public/js/client.js

@@ -57,35 +57,35 @@ window.boomack = window.boomack || {};
 
 	var clientResourceGroups = {};
 
-	ctx.registerClientResourceGroup = function (id, resourceIndices) {
+	ctx.registerClientResourceGroup = function (id, resourceGroupInfo) {
 		trace('Registered client resource group "' + id + '"');
 		clientResourceGroups[id] = {
 			// id: id,
 			state: false,
-			css: resourceIndices.css,
-			js: resourceIndices.js,
+			stylesCount: resourceGroupInfo.stylesCount || 0,
+			scriptsCount: resourceGroupInfo.scriptsCount || 0,
 		};
 	};
 
-	function buildPluginResourceUrl(groupId, index) {
+	function buildPluginResourceUrl(groupId, type, index) {
 		var pathPrefix = _.trim(ctx.pathPrefix, '/');
 		if (pathPrefix) pathPrefix = '/' + pathPrefix;
 		var location = _.trimEnd(window.location.origin, '/');
-		return location + pathPrefix + '/plugins/client-resources/' + groupId + '/' + index;
+		return location + pathPrefix + '/plugins/' + type + '/' + groupId + '/' + index;
 	}
 
-	function injectClientResourceCss(groupId, index) {
+	function injectClientResourceStyle(groupId, index) {
 		$('head').append(
-			'<link rel="stylesheet" type="text/css" src="' +
-			buildPluginResourceUrl(groupId, index) +
+			'<link rel="stylesheet" type="text/css" href="' +
+			buildPluginResourceUrl(groupId, 'styles', index) +
 			'">');
 	}
 
-	function runInjectClientResourceJs(groupId, index) {
+	function runInjectClientResourceScript(groupId, index) {
 		trace('run inject js', groupId, index);
 		ctx.runAsync(function (cb) {
 			trace('run execution inject js', groupId, index);
-			$.getScript(buildPluginResourceUrl(groupId, index),
+			$.getScript(buildPluginResourceUrl(groupId, 'scripts', index),
 				function () {
 					trace('inject js callback', groupId, index);
 					cb();
@@ -97,13 +97,17 @@ window.boomack = window.boomack || {};
 		if (ctx.offline) return;
 		var group = _.get(clientResourceGroups, id);
 		if (!group) {
-			console.err('Client resource group "' + id + '" not found.');
+			console.error('Client resource group "' + id + '" not found.');
 			return;
 		}
 		if (group.loaded) return;
 		group.loaded = 'loading';
-		_.forEach(group.css, function (index) { injectClientResourceCss(id, index); });
-		_.forEach(group.js, function (index) { runInjectClientResourceJs(id, index); });
+		for (var i = 0; i < group.stylesCount; i++) {
+			injectClientResourceStyle(id, i);
+		}
+		for (var i = 0; i < group.scriptsCount; i++) {
+			runInjectClientResourceScript(id, i);
+		}
 		ctx.run(function () {
 			group.loaded = true;
 			trace('Loaded client resource group "' + id + '" on demand.');
@@ -357,6 +361,10 @@ window.boomack = window.boomack || {};
 		updateExtensionsCount(slotId, slotE, count + 1);
 	}
 
+	function updateVersion(slotE, version) {
+		setData(slotE, 'version', version)
+	}
+
 	function limitExtensions(slotId, slotE, limit, extend, contentE) {
 		let count = getExtensionsCount(slotId, slotE, contentE);
 		const contentN = contentE[0];
@@ -475,6 +483,13 @@ window.boomack = window.boomack || {};
 			const cmd = envelope.command;
 			if (cmd.panel != ctx.panelId) return;
 			const slotE = findSlot(cmd.slot);
+			const contentE = slotE.find('.slot-content');
+			if (!contentE) return;
+			const empty = contentE.is(':empty');
+			if (!empty && (cmd.extend == 'begin' || cmd.extend == 'end')) {
+				// handle race condition of extensions
+				if (cmd.version <= Number.parseInt(slotE.data('version'))) return;
+			}
 			if (slotE.hasClass('paused')) {
 				notifySlotContent(slotE, cmd);
 				return;
@@ -483,19 +498,19 @@ window.boomack = window.boomack || {};
 			titleE.html(cmd.title || '');
 			notifySlotContent(slotE, cmd);
 			clearSlotResizeHandlers(slotE.data('slot-id'));
-			const contentE = slotE.find('.slot-content');
-			if (!contentE) return;
 			const extensionLimit = Number.parseInt(slotE.data('extension-limit') || 0);
-			const empty = contentE.is(':empty');
 			if (!empty && cmd.extend == 'begin') {
 				contentE.prepend(cmd.content + '<!--' + CONTENT_SEPARATOR_TEXT + '-->');
+				updateVersion(slotE, cmd.version);
 				incrementExtensionsCount(cmd.slot, slotE, contentE);
 				limitExtensions(cmd.slot, slotE, extensionLimit, cmd.extend, contentE);
 			} else if (!empty && cmd.extend == 'end') {
 				contentE.append('<!--' + CONTENT_SEPARATOR_TEXT + '-->' + cmd.content);
+				updateVersion(slotE, cmd.version);
 				incrementExtensionsCount(cmd.slot, slotE, contentE);
 				limitExtensions(cmd.slot, slotE, extensionLimit, cmd.extend, contentE);
 			} else {
+				updateVersion(slotE, cmd.version);
 				updateExtensionsCount(cmd.slot, slotE, 0);
 				showContent(slotE, cmd);
 			}
@@ -543,8 +558,6 @@ window.boomack = window.boomack || {};
 			}
 		});
 
-		socket.on('layout', updateLayout);
-
 		socket.on('display', envelopes => {
 			_.forEach(envelopes, displayMediaItemWithRequirements);
 		});
@@ -568,6 +581,14 @@ window.boomack = window.boomack || {};
 			window.location.reload();
 		});
 
+		socket.on('reload-layout', () => {
+			$.get('/panels/' + ctx.panelId + '/layout' + (ctx.themeOverride ? '?theme=' + ctx.theme.name : ''),
+			(html, status) => {
+				trace('Layout reload', status);
+				updateLayout(html);
+			}, 'html');
+		});
+
 		socket.on('action-error', err => {
 			if (actionCallback) {
 				actionCallback(err);
@@ -672,8 +693,8 @@ window.boomack = window.boomack || {};
 		const transform = zoom == 1.0 ? 'none' : 'scale(' + zoom + ')';
 		const contentE = slotE.find('.slot-content');
 		contentE.css('transform', transform);
-		contentE.css('min-width', 100.0 / zoom + '%');
-		contentE.css('max-width', 100.0 / zoom + '%');
+		contentE.css('min-width', slotE.data('align') ? '' : 100.0 / zoom + '%');
+		contentE.css('max-width', slotE.data('align') ? '' : 100.0 / zoom + '%');
 		const iframeE = slotE.find('iframe.isolated-slot-content');
 		iframeE.css('transform', transform);
 		iframeE.css('width', 100.0 / zoom + '%');

package/client/themes/blue-night/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": true,
 	"monoColor": [0, 0, 1],
+	"saturation": 0,
 
 	"headline-font-family": "Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif",
 	"headline-font-weight": "600",

package/client/themes/dark/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": true,
 	"monoColor": [0.917, 0.949, 0.965],
+	"saturation": 1,
 
 	"headline-font-family": "Signika, Cambria, Times, serif",
 	"headline-font-weight": "600",

package/client/themes/default/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": false,
 	"monoColor": [1, 1, 1],
+	"saturation": 1,
 
 	"headline-font-family": "Signika, Cambria, Times, serif",
 	"headline-font-weight": "600",

package/client/themes/green-night/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": true,
 	"monoColor": [0, 1, 0],
+	"saturation": 0,
 
 	"headline-font-family": "Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif",
 	"headline-font-weight": "600",

package/client/themes/iron/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": true,
 	"monoColor": [0.729, 0.863, 0.969],
+	"saturation": 0.95,
 
 	"headline-font-family": "Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif",
 	"headline-font-weight": "600",

package/client/themes/red-night/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": true,
 	"monoColor": [1, 0, 0],
+	"saturation": 0,
 
 	"headline-font-family": "Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif",
 	"headline-font-weight": "600",

package/client/themes/science/properties.json

@@ -1,6 +1,7 @@
 {
 	"dark": false,
 	"monoColor": [1, 1, 1],
+	"saturation": 1,
 
 	"headline-font-family": "Archivo, 'Heveltica Neue', Arial, sans-serif",
 	"headline-font-weight": "600",

package/client/views/panel.ejs

@@ -2,7 +2,7 @@
 <html>
 <head>
 <%- include('parts/head.ejs', { title: (panel.layout.title || panel.id), offline }); %>
-<%- include('parts/panel-head.ejs', { basePath, panelId: panel.id, offline }); %>
+<%- include('parts/panel-head.ejs', { basePath, panelId: panel.id, offline, theme, themeOverride }); %>
 <%- include('parts/theme-info.ejs', {
 	theme,
 	themeProperties,
@@ -64,6 +64,7 @@
 				_,
 				theme,
 				themeOverride,
+				themeProperties,
 				panel,
 				offline,
 			}); %><%
@@ -72,6 +73,7 @@
 				_,
 				theme,
 				themeOverride,
+				themeProperties,
 				panel,
 				offline,
 			}); %><%

package/client/views/parts/client-resources.ejs

@@ -11,12 +11,12 @@
 	} else {
 		_.forEach(clientRes.getResourceGroupsForPanel(panel, slot), groupId => {
 			const group = _.get(clientResGroups, groupId);
-			_.forEach(group.css, index => {
-%>	<link rel="stylesheet" type="text/css" href="<%- basePath + 'plugins/client-resources/' + groupId + '/' + index %>" />
-<%			});
-			_.forEach(group.js, index => {
-%>	<script src="<%- basePath + 'plugins/client-resources/' + groupId + '/' + index %>"></script>
-<%			});
+			for (let i = 0; i < group.stylesCount; i++) {
+%>	<link rel="stylesheet" type="text/css" href="<%- basePath + 'plugins/styles/' + groupId + '/' + i %>" />
+<%			}
+for (let i = 0; i < group.scriptsCount; i++) {
+	%>	<script type="application/javascript" src="<%- basePath + 'plugins/scripts/' + groupId + '/' + i %>"></script>
+<%			}
 		});
 	}
 %>

package/client/views/parts/document-layout.ejs

@@ -5,6 +5,7 @@ expects context:
 - basePath {string}
 - theme {string}
 - themeOverride {boolean}
+- themeProperties {Object}
 - panel {Panel}
 - offline {boolean}
 
@@ -18,6 +19,7 @@ expects context:
 			basePath,
 			theme,
 			themeOverride,
+			themeProperties,
 			panel,
 			slot,
 			offline,

package/client/views/parts/grid-layout.ejs

@@ -5,6 +5,7 @@ expects context:
 - basePath {string}
 - theme {string}
 - themeOverride {boolean}
+- themeProperties {Object}
 - panel {Panel}
 - offline {boolean}
 
@@ -24,6 +25,7 @@ expects context:
 			basePath,
 			theme,
 			themeOverride,
+			themeProperties,
 			panel,
 			slot,
 			offline,

package/client/views/parts/panel-head.ejs

@@ -6,4 +6,6 @@
 		window.boomack.pathPrefix = "<%- basePath %>";
 		window.boomack.panelId = <%- panelId ? '"' + panelId + '"' : 'null' %>;
 		window.boomack.offline = <%- offline %>;
+		window.boomack.theme = "<%- theme %>";
+		window.boomack.themeOverride = <%- themeOverride %>;
 	</script>

package/client/views/parts/slot.ejs

@@ -7,6 +7,7 @@ expects context:
 - slot {Slot}
 - theme {string}
 - themeOverride {boolean}
+- themeProperties {Object}
 - offline {boolean}
 - singled {boolean}
 
@@ -56,6 +57,7 @@ if (tbMaximize) toolbarWidth += 39;
 	data-history="<%= slot.history || 0 %>"
 	data-max-sequence-no="<%= command ? command.no : 0 %>"
 	data-sequence-no="<%= command ? command.no : 0 %>"
+	data-version="<%= command ? command.version : 0 %>"
 	data-extension-limit="<%= slot.extensions || 0 %>"
 	data-extensions="<%= command ? command.extensions : 0 %>"
 	data-zoom="<%= slot.zoom %>"
@@ -156,6 +158,22 @@ if (tbMaximize) toolbarWidth += 39;
 		), ' ') %><%
 	}
 	%>" /></filter></svg><%
+} else if (slot.colorFilter === 'theme') {
+	var s = Math.min(1, Math.max(0, themeProperties.saturation));
+	var si = 1.0 - s;
+	var rv = themeProperties.monoColor[0];
+	var gv = themeProperties.monoColor[1];
+	var bv = themeProperties.monoColor[2];
+	var rM = 0.2125, gM = 0.7154, bM = 0.0721;
+	var cf = [
+		rv * (s + rM * si), rv * gM * si, rv * bM * si, 0, 0,
+		gv * rM * si, gv * (s + gM * si), gv * bM * si, 0, 0,
+		bv * rM * si, bv * gM * si, bv * (s + bM * si), 0, 0,
+		0, 0, 0, 1, 0
+	];
+	%><svg style="display: hidden; position: absolute; width: 0; height: 0;"><filter id="slot-color-filter-<%= slot.id %>"><feColorMatrix in="SourceGraphic" type="matrix" values="<%
+	%><%= _.join(cf, ' ') %><%
+	%>" /></filter></svg><%
 } %>
 	<div class="slot-background" style="<%
 		if (slot.minHeight) {
@@ -177,9 +195,9 @@ if (tbMaximize) toolbarWidth += 39;
 				%>display:none;<%
 			}
 			if (slot.colorFilter) {
-				if (_.isString(slot.colorFilter)) {
+				if (_.isString(slot.colorFilter) && slot.colorFilter !== 'theme') {
 					%>filter: <%= slot.colorFilter %>;<%
-				} else if (_.isArray(slot.colorFilter)) {
+				} else if (_.isArray(slot.colorFilter) || slot.colorFilter === 'theme') {
 					%>filter: url(#slot-color-filter-<%= slot.id %>);<%
 				}
 			}
@@ -192,9 +210,9 @@ if (tbMaximize) toolbarWidth += 39;
 		%><div class="slot-content" style="<%
 				if (slot.zoom !== 1.0 && !contentScale) {
 					%>transform:scale(<%= slot.zoom %>);<%
-					%>min-width:<%= 100.0 / slot.zoom %>%;<%
+					if (!contentAlign) { %>min-width:<%= 100.0 / slot.zoom %>%;<% }
 					%>width:auto;<%
-					%>max-width:<%= 100.0 / slot.zoom %>%;<%
+					if (!contentAlign) { %>max-width:<%= 100.0 / slot.zoom %>%;<% }
 				}
 			%>"><%
 				if (commandContent) {

package/client/views/slot-panel.ejs

@@ -2,7 +2,7 @@
 <html>
 <head>
 <%- include('parts/head.ejs', { title: panel.id + ' – ' + slot.id, offline }); %>
-<%- include('parts/panel-head.ejs', { basePath, panelId: panel.id, offline }); %>
+<%- include('parts/panel-head.ejs', { basePath, panelId: panel.id, offline, theme, themeOverride }); %>
 <%- include('parts/theme-info.ejs', {
 	theme,
 	themeProperties,
@@ -23,6 +23,7 @@
 		basePath,
 		theme,
 		themeOverride,
+		themeProperties,
 		panel,
 		slot,
 		offline,

package/default-config.yaml

@@ -199,9 +199,14 @@ cache:
       global: 4 MB
 
 plugins:
-  # search the globally installed node packages for plugins
+  # The root directory where to find plugin packages.
+  # If not set, npm is used to find the global node_modules folder.
+  root: null
+  # Search the plugin root for plugin packages.
+  # If plugins.root is not set, searches for globally installed packages.
+  # Plugin packages must start with 'boomack-plugin-'.
   discover: false
-  # a list with node package names of plugins to use
+  # A list with node package names of plugins to use.
   packages: []
 
 export:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "boomack",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "description": "web app for displaying hyper-media items in concert with e.g. an IDE",
   "author": "Tobias Kiertscher <dev@mastersign.de>",
   "license": "MIT",
@@ -29,6 +29,7 @@
     "chardet": "^0.8.0",
     "commonmark": "^0.29.3",
     "cookie-parser": "^1.4.5",
+    "cors": "^2.8.5",
     "csv-parse": "^4.15.1",
     "ejs": "^2.7.4",
     "express": "^4.17.1",
@@ -36,9 +37,9 @@
     "got": "^10.7.0",
     "iconv-lite": "^0.5.2",
     "lodash": "^4.17.20",
-    "markdown-it": "^10.0.0",
-    "markdown-it-container": "^2.0.0",
-    "markdown-it-emoji": "^1.4.0",
+    "markdown-it": "^12.3.2",
+    "markdown-it-container": "^3.0.0",
+    "markdown-it-emoji": "^2.0.0",
     "markdown-it-ins": "^3.0.1",
     "markdown-it-mark": "^3.0.1",
     "markdown-it-sub": "^1.0.0",
@@ -74,7 +75,7 @@
     "gulp-text-simple": "^0.5.4",
     "jquery": "^3.5.1",
     "jsdoc": "^3.6.6",
-    "mocha": "^6.2.3",
+    "mocha": "^9.2.1",
     "nock": "^11.9.1",
     "typescript": "^4.1.5"
   },

package/server-build/index.js

@@ -4,6 +4,7 @@ const chalk = require('chalk');
 const async = require('async');
 const open = require('open');
 const express = require('express');
+const cors = require('cors');
 const app = express();
 const http = require('http');
 const server = http.createServer(app);
@@ -154,35 +155,55 @@ function loadCorePlugIns(cb) {
     plugins.register(require('./plugins/media'));
     cb(null);
 }
-function loadPlugIn(packageName, cb) {
-    plugins.load(packageName, (err, plugin) => {
-        if (err) {
-            cb(err);
-            return;
-        }
+function loadPlugIn(pluginRoot, packageName) {
+    try {
+        const plugin = plugins.load(pluginRoot, packageName);
         plugins.register(plugin);
         log.info(`PlugIn loaded: ${plugin.id}`);
-        cb(null);
-    });
+        return true;
+    }
+    catch (err) {
+        log.error(`Failed to load plugin from package '${packageName}': ${err}`);
+        return false;
+    }
 }
 function loadPlugIns(cb) {
-    log.info('Loading external plugins');
+    let pluginRoot = cfg.get('plugins.root');
+    if (!pluginRoot) {
+        try {
+            pluginRoot = plugins.getGlobalNodeModules();
+        }
+        catch (err) {
+            cb(err);
+            return;
+        }
+    }
+    log.info(`Loading external plugins from: ${pluginRoot}`);
     const discover = utils.parseBoolean(cfg.get('plugins.discover', false));
     const explicitPkgNames = new Set(cfg.get('plugins.packages', []));
-    let tasks = [
-        cb => async.eachSeries(explicitPkgNames, loadPlugIn, cb)
-    ];
-    if (discover) {
-        tasks.push(cb => plugins.discover('boomack-plugin-', cb), (discoveredPkgNames, cb) => async.eachSeries(_.filter(discoveredPkgNames, pn => !explicitPkgNames.has(pn)), loadPlugIn, cb));
+    let success = true;
+    for (const name of explicitPkgNames) {
+        success && (success = loadPlugIn(pluginRoot, name));
     }
-    async.waterfall(tasks, err => {
-        if (err) {
-            cb(new Error("Loading PlugIns failed with: " + err.message));
+    if (discover) {
+        log.info(`Discovering plugins`);
+        let discoveredPkgNames = [];
+        try {
+            discoveredPkgNames = plugins.discover(pluginRoot, 'boomack-plugin-');
         }
-        else {
-            cb(null);
+        catch (err) {
+            log.error(`Discovering plugins failed with: ${err}`);
         }
-    });
+        for (const name of discoveredPkgNames) {
+            success && (success = loadPlugIn(pluginRoot, name));
+        }
+    }
+    if (success) {
+        cb(null);
+    }
+    else {
+        cb(new Error("Loading plugins failed."));
+    }
 }
 function loadPresets(cb) {
     log.info('Loading presets from configuration');
@@ -286,6 +307,7 @@ function setupApp(cb) {
         log.http(`${req.method} ${req.url}`);
         next();
     });
+    app.use(cors());
     require('./routes/web-client').setup(app, io);
     require('./routes/panels').setup(app, io);
     require('./routes/presets').setup(app, io);
@@ -328,7 +350,11 @@ function startServer(cb) {
             return;
         }
         else {
-            log.info(`Server listening on http://${host}:${port}/`);
+            log.info(`Server is listening on http://${host}:${port}/`);
+            const publicUrl = cfg.serverBaseUrl();
+            if (`http://${host}:${port}/` !== publicUrl) {
+                log.info(`Public URL of the server is ${publicUrl}`);
+            }
             cb(null);
         }
     })

package/server-build/pipeline/render.js

@@ -13,7 +13,6 @@ const displayRequestModel = require('../model/display-request');
 const resources = require('../service/resources');
 const render = require('../service/render');
 const displayTaskHelper = require('../service/display-task-helper');
-const highlight = require('../service/highlight');
 /**
  * Selects the render function for the given {@link DisplayTask}.
  *

package/server-build/pipeline/render.test.js

@@ -77,12 +77,12 @@ describe('pipeline/render', function () {
             plugins.register({
                 id: 'test-plugin',
                 renderers: {
-                    'test-renderer': (u, t, o) => {
-                        passedUrl = u;
-                        passedType = t;
-                        passedOptions = o;
+                    'test-renderer': (url, { type, options }) => {
+                        passedUrl = url;
+                        passedType = type;
+                        passedOptions = options;
                         return {
-                            html: `<a href="${u}">link</a>`,
+                            html: `<a href="${url}">link</a>`,
                             requires: ['client-resource-group-1'],
                         };
                     },

package/server-build/pipeline/transform.test.js

@@ -43,7 +43,7 @@ describe('pipeline/transform', function () {
             plugins.register({
                 id: 'test-plugin',
                 textTransformations: {
-                    'test-transformation': ({ text, options }) => {
+                    'test-transformation': (text, { options }) => {
                         passedText = text;
                         passedOptions = options;
                         return {

package/server-build/pipeline.js

@@ -26,13 +26,11 @@
  *
  * @module
  */
-const fs = require('fs');
 const _ = require('lodash');
 const async = require('async');
-const { isFileUrl, isHttpUrl, error, parseDataAmount } = require('./utils');
+const { isFileUrl, error, parseDataAmount } = require('./utils');
 const displayRequestModel = require('./model/display-request');
 const cfg = require('./service/config');
-const encode = require('./service/char-encoding');
 const mimeType = require('./service/mime-type');
 const mediaTypes = require('./service/media-types');
 const html = require('./service/html');
@@ -460,6 +458,7 @@ function buildDisplayCommand(displayTask) {
         src: t.output.src,
         extend: o.extend,
         extensions: 0,
+        version: 0,
         requires: mergeClientResourcGroupRequirements(displayTask),
         scale: o.scale,
         align: o.scale ? null : o.align,
@@ -493,6 +492,7 @@ function buildDisplayCommandForError(err, displayRequest, displayTask) {
             no: null,
             extend: extend,
             extensions: 0,
+            version: 0,
             content: html.errorMessage('Unknown Error', 'An unknown error occured. This is defenitly a bug!'),
             resource: null,
             background: null,
@@ -506,6 +506,7 @@ function buildDisplayCommandForError(err, displayRequest, displayTask) {
         no: null,
         extend: extend,
         extensions: 0,
+        version: 0,
         content: html.errorMessage(err.title, err.message, err.details),
         resource: null,
         background: null,

package/server-build/plugins/csv.js

@@ -64,18 +64,15 @@ const parse = require('csv-parse');
 const uuid = require('uuid/v4');
 const html = require('../service/html');
 exports.id = 'core-csv';
-exports.clientResourceGroups = {
+exports.scripts = {
     'tablesort': [
-        {
-            type: 'application/javascript',
-            path: path.join(__dirname, 'client-resources', 'tablesort.js'),
-        },
+        path.join(__dirname, 'client-resources', 'tablesort.js'),
     ],
 };
 exports.textTransformations = {
     'csv-table': textTransformationCsvTable,
 };
-async function textTransformationCsvTable({ text, options }) {
+async function textTransformationCsvTable(text, { options }) {
     const detectColumns = _.isNil(options.columns) || options.columns === true;
     let columns = _.isArray(options.columns) ? options.columns : null;
     return new Promise((resolve, reject) => {

package/server-build/plugins/generic.js

@@ -18,7 +18,7 @@ exports.id = 'core-generic';
 exports.renderers = {
     'generic': renderTemplate,
 };
-function renderTemplate(url, type, options) {
+function renderTemplate(url, { options }) {
     let html = options.template || '';
     return html.replace(/\{\{\s*url\s*\}\}/g, url);
 }

package/server-build/plugins/highlight.js

@@ -23,7 +23,7 @@ exports.id = 'core-highlight';
 exports.textTransformations = {
     'highlight': textTransformationHighlight,
 };
-function textTransformationHighlight({ text, options }) {
+function textTransformationHighlight(text, { options }) {
     const language = _.get(options, 'syntax');
     let result = text;
     if (!language) {