Merge branch 'master' into colour-improvements

* Fix typo in story width variable name

* Add change note for release 5.5.0

Fixes a typo in the CSS custom properties

.github/workflows/ci.yml

@@ -5,17 +5,17 @@ on:
       - master
       - tiddlywiki-com
 env:
-  NODE_VERSION: "22"
+  NODE_VERSION: "22.22"
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-test.sh"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: playwright-report
@@ -30,8 +30,8 @@ jobs:
       TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
       TW5_BUILD_OUTPUT: "./output/prerelease"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"
@@ -62,8 +62,8 @@ jobs:
       TW5_BUILD_OUTPUT: "./output"
       TW5_BUILD_ARCHIVE: "./output"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"

.github/workflows/pr-check-build-size.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: build-size-check
       id: get_sizes
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v8.1
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}
@@ -52,4 +52,4 @@ jobs:
               pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
               base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
             }
-          });
+          });

.github/workflows/pr-comment-build-size.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Build and check size
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v8.1
       with:
         pr_number: ${{ inputs.pr_number }}
         repo: ${{ github.repository }}

.github/workflows/pr-validation.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
     # Step 1: Validate PR paths
     - name: Validate PR Paths
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v8.1
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}
@@ -26,7 +26,7 @@ jobs:
     
     # Step 2: Validate change notes
     - name: Validate Change Notes
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v8.1
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}

.gitignore

@@ -2,10 +2,20 @@
 .c9/
 .vs/
 .vscode/
+.claude/
+# TiddlyWiki
 tmp/
 output/
 node_modules/
+$__StoryList.tid
+# Playwright
 /test-results/
 /playwright-report/
+/blob-report/
 /playwright/.cache/
-$__StoryList.tid
+/playwright/.auth/
+test-screenshots/
+test-output.txt
+.playwright-mcp
+# TiddlyWiki MPC
+.tw-mcp

.npmignore

@@ -3,3 +3,4 @@
 tmp/
 output/
 node_modules/
+.claude/

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.4.0
+    TW5_BUILD_VERSION=v5.5.0.
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

bin/build-tw-org.sh

@@ -45,7 +45,7 @@ git clone --depth=1 --branch=main "https://github.com/TiddlyWiki/tiddlywiki.org-
 
 # Make the CNAME file that GitHub Pages requires
 
-echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME
+# echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME
 
 # Delete any existing static content
 

bin/optimise-svgs.js

@@ -15,40 +15,40 @@ var fs = require("fs"),
 	{ optimize } = require("svgo"),
 	config = {
 		plugins: [
-			'cleanupAttrs',
+			"cleanupAttrs",
-			'removeDoctype',
+			"removeDoctype",
-			'removeXMLProcInst',
+			"removeXMLProcInst",
-			'removeComments',
+			"removeComments",
-			'removeMetadata',
+			"removeMetadata",
-			'removeTitle',
+			"removeTitle",
-			'removeDesc',
+			"removeDesc",
-			'removeUselessDefs',
+			"removeUselessDefs",
-			'removeEditorsNSData',
+			"removeEditorsNSData",
-			'removeEmptyAttrs',
+			"removeEmptyAttrs",
-			'removeHiddenElems',
+			"removeHiddenElems",
-			'removeEmptyText',
+			"removeEmptyText",
-			'removeEmptyContainers',
+			"removeEmptyContainers",
 			// 'removeViewBox',
-			'cleanupEnableBackground',
+			"cleanupEnableBackground",
-			'convertStyleToAttrs',
+			"convertStyleToAttrs",
-			'convertColors',
+			"convertColors",
-			'convertPathData',
+			"convertPathData",
-			'convertTransform',
+			"convertTransform",
-			'removeUnknownsAndDefaults',
+			"removeUnknownsAndDefaults",
-			'removeNonInheritableGroupAttrs',
+			"removeNonInheritableGroupAttrs",
-			'removeUselessStrokeAndFill',
+			"removeUselessStrokeAndFill",
-			'removeUnusedNS',
+			"removeUnusedNS",
-			'cleanupIDs',
+			"cleanupIDs",
-			'cleanupNumericValues',
+			"cleanupNumericValues",
-			'moveElemsAttrsToGroup',
+			"moveElemsAttrsToGroup",
-			'moveGroupAttrsToElems',
+			"moveGroupAttrsToElems",
-			'collapseGroups',
+			"collapseGroups",
 			// 'removeRasterImages',
-			'mergePaths',
+			"mergePaths",
-			'convertShapeToPath',
+			"convertShapeToPath",
-			'sortAttrs',
+			"sortAttrs",
 			//'removeDimensions',
-			{name: 'removeAttrs', params: { attrs: '(stroke|fill)' } }
+			{name: "removeAttrs", params: { attrs: "(stroke|fill)" } }
 		]
 	};
 
@@ -72,7 +72,7 @@ files.forEach(function(filename) {
 			var newSVG = header.join("\n") + "\n\n" + result.data.replace("&lt;&lt;now &quot;DD&quot;&gt;&gt;","<<now \"DD\">>");
 			fs.writeFileSync(filepath,newSVG);
 		} else {
-			console.log("Error " + err + " with " + filename)
+			console.log("Error " + err + " with " + filename);
 			process.exit();
 		};
 	}

boot/boot.js

@@ -12,8 +12,6 @@ On the server this file is executed directly to boot TiddlyWiki. In the browser,
 
 var _boot = (function($tw) {
 
-/*jslint node: true, browser: true */
-/*global modules: false, $tw: false */
 "use strict";
 
 // Include bootprefix if we're not given module data
@@ -37,7 +35,7 @@ if($tw.node) {
 $tw.boot.log = function(str) {
 	$tw.boot.logMessages = $tw.boot.logMessages || [];
 	$tw.boot.logMessages.push(str);
-}
+};
 
 /*
 Check if an object has a property
@@ -47,7 +45,14 @@ $tw.utils.hop = function(object,property) {
 };
 
 /** @deprecated Use Array.isArray instead  */
-$tw.utils.isArray = value => Array.isArray(value);
+$tw.utils.isArray = (value) => Array.isArray(value);
+
+/*
+Determine if a value is a date, even across VM boundaries
+*/
+$tw.utils.isDate = function(value) {
+	return Object.prototype.toString.call(value) === "[object Date]";
+};
 
 /*
 Check if an array is equal by value and by reference.
@@ -126,9 +131,6 @@ $tw.utils.pushTop = function(array,value) {
 	return array;
 };
 
-/** @deprecated Use instanceof Date instead */
-$tw.utils.isDate = value => value instanceof Date;
-
 /** @deprecated Use array iterative methods instead */
 $tw.utils.each = function(object,callback) {
 	if(object) {
@@ -138,7 +140,7 @@ $tw.utils.each = function(object,callback) {
 				return next !== false;
 			});
 		} else {
-			Object.entries(object).every(entry => {
+			Object.entries(object).every((entry) => {
 				const next = callback(entry[1], entry[0], object);
 				return next !== false;
 			});
@@ -565,7 +567,7 @@ using a lowercase extension only.
 */
 $tw.utils.getFileExtensionInfo = function(ext) {
 	return ext ? $tw.config.fileExtensionInfo[ext.toLowerCase()] : null;
-}
+};
 
 /*
 Given an extension, get the correct encoding for that file.
@@ -588,7 +590,7 @@ var globalCheck =[
 	"    delete Object.prototype.__temp__;",
 	"  }",
 	"  delete Object.prototype.__temp__;",
-].join('\n');
+].join("\n");
 
 /*
 Run code globally with specified context variables in scope
@@ -616,7 +618,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
 		fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
 	} else {
 		if(sandbox){
-			fn = vm.runInContext(code,sandbox,filename)
+			fn = vm.runInContext(code,sandbox,filename);
 		} else {
 			fn = vm.runInThisContext(code,filename);
 		}
@@ -727,7 +729,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	var self = this;
 	form.addEventListener("submit",function(event) {
 		// Collect the form data
-		var data = {},t;
+		var data = {};
 		$tw.utils.each(form.elements,function(element) {
 			if(element.name && element.value) {
 				data[element.name] = element.value;
@@ -773,7 +775,7 @@ $tw.utils.PasswordPrompt.prototype.removePrompt = function(promptInfo) {
 		promptInfo.form.parentNode.removeChild(promptInfo.form);
 		this.setWrapperDisplay();
 	}
-}
+};
 
 /*
 Crypto helper object for encrypted content. It maintains the password text in a closure, and provides methods to change
@@ -812,7 +814,7 @@ $tw.utils.Crypto = function() {
 	};
 	this.hasPassword = function() {
 		return !!currentPassword;
-	}
+	};
 	this.encrypt = function(text,password) {
 		// set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html
 		return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"});
@@ -830,7 +832,7 @@ Execute the module named 'moduleName'. The name can optionally be relative to th
 $tw.modules.execute = function(moduleName,moduleRoot) {
 	var name = moduleName;
 	if(moduleName.charAt(0) === ".") {
-		name = $tw.utils.resolvePath(moduleName,moduleRoot)
+		name = $tw.utils.resolvePath(moduleName,moduleRoot);
 	}
 	if(!$tw.modules.titles[name]) {
 		if($tw.modules.titles[name + ".js"]) {
@@ -891,7 +893,6 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	if(!moduleInfo) {
 		// We could not find the module on this path
 		// Try to defer to browserify etc, or node
-		var deferredModule;
 		if($tw.browser) {
 			if(window.require) {
 				try {
@@ -1146,8 +1147,7 @@ enableIndexers - Array of indexer names to enable, or null to use all available
 */
 $tw.Wiki = function(options) {
 	options = options || {};
-	var self = this,
+	var tiddlers = Object.create(null), // Hashmap of tiddlers
-		tiddlers = Object.create(null), // Hashmap of tiddlers
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
@@ -1201,7 +1201,7 @@ $tw.Wiki = function(options) {
 						shadow: this.isShadowTiddler(title),
 						exists: this.tiddlerExists(title)
 					}
-				}
+				};
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
 				// Check we've got the title
@@ -1211,7 +1211,7 @@ $tw.Wiki = function(options) {
 					tiddler: tiddler,
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
-				}
+				};
 				// Update indexes
 				this.clearCache(title);
 				this.clearGlobalCache();
@@ -1236,7 +1236,7 @@ $tw.Wiki = function(options) {
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
 				}
-			}
+			};
 			// Delete the tiddler
 			delete tiddlers[title];
 			// Delete it from the list of titles
@@ -1251,7 +1251,7 @@ $tw.Wiki = function(options) {
 				tiddler: this.getTiddler(title),
 				shadow: this.isShadowTiddler(title),
 				exists: this.tiddlerExists(title)
-			}
+			};
 			// Update indexes
 			this.clearCache(title);
 			this.clearGlobalCache();
@@ -1439,8 +1439,7 @@ $tw.Wiki = function(options) {
 
 	// Unregister the plugin tiddlers of a particular type, or null/undefined for any type, optionally restricting unregistering to an array of tiddler titles. Returns an array of the titles affected
 	this.unregisterPluginTiddlers = function(pluginType,titles) {
-		var self = this,
+		var unregisteredTitles = [];
-			unregisteredTitles = [];
 		// Remove any previous registered plugins of this type
 		for(var t=pluginTiddlers.length-1; t>=0; t--) {
 			var tiddler = pluginTiddlers[t];
@@ -1454,16 +1453,15 @@ $tw.Wiki = function(options) {
 
 	// Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers
 	this.unpackPluginTiddlers = function() {
-		var self = this;
 		// Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1
 		pluginTiddlers.sort(function(a, b) {
 			var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1;
 			var priorityB = "plugin-priority" in b.fields ? b.fields["plugin-priority"] : 1;
-			if (priorityA !== priorityB) {
+			if(priorityA !== priorityB) {
 				return priorityA - priorityB;
-			} else if (a.fields.title < b.fields.title) {
+			} else if(a.fields.title < b.fields.title) {
 				return -1;
-			} else if (a.fields.title === b.fields.title) {
+			} else if(a.fields.title === b.fields.title) {
 				return 0;
 			} else {
 				return +1;
@@ -1570,7 +1568,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	// Assemble a report tiddler
 	var titleReportTiddler = "TiddlyWiki Safe Mode",
 		report = [];
-	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:")
+	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:");
 	// Delete the overrides
 	overrides.forEach(function(title) {
 		var tiddler = self.getTiddler(title),
@@ -1579,7 +1577,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 		self.addTiddler(new $tw.Tiddler(tiddler, {title: newTitle}));
 		report.push("* [[" + title + "|" + newTitle + "]]");
 	});
-	report.push()
+	report.push();
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
@@ -2013,7 +2011,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join('/');
+							value = path.relative(rootPath, filename).split(path.sep).join("/");
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2066,7 +2064,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 			}
 		});
 		return arrayOfFiles;
-	}
+	};
 	// Process the listed tiddlers
 	$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
 		if(tidInfo.prefix && tidInfo.suffix) {
@@ -2175,7 +2173,7 @@ Returns the path of the plugin folder
 $tw.findLibraryItem = function(name,paths) {
 	var pathIndex = 0;
 	do {
-		var pluginPath = path.resolve(paths[pathIndex],"./" + name)
+		var pluginPath = path.resolve(paths[pathIndex],"./" + name);
 		if(fs.existsSync(pluginPath) && fs.statSync(pluginPath).isDirectory()) {
 			return pluginPath;
 		}
@@ -2534,7 +2532,7 @@ $tw.boot.initStartup = function(options) {
 				}
 			});
 			return result;
-		}
+		};
 	}
 };
 $tw.boot.loadStartup = function(options){
@@ -2551,7 +2549,7 @@ $tw.boot.loadStartup = function(options){
 	}
 	// Give hooks a chance to modify the store
 	$tw.hooks.invokeHook("th-boot-tiddlers-loaded");
-}
+};
 $tw.boot.execStartup = function(options){
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
@@ -2581,7 +2579,7 @@ $tw.boot.execStartup = function(options){
 	$tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || [];
 	// Repeatedly execute the next eligible task
 	$tw.boot.executeNextStartupTask(options.callback);
-}
+};
 /*
 Startup TiddlyWiki
 */
@@ -2600,7 +2598,7 @@ $tw.addUnloadTask = function(task) {
 	if($tw.unloadTasks.indexOf(task) === -1) {
 		$tw.unloadTasks.push(task);
 	}
-}
+};
 
 /*
 Execute the remaining eligible startup tasks
@@ -2647,7 +2645,7 @@ $tw.boot.executeNextStartupTask = function(callback) {
 		}
 		taskIndex++;
 	}
-	if(typeof callback === 'function') {
+	if(typeof callback === "function") {
 		callback();
 	}
 	return false;

community/project/teams/Infrastructure Team.tid

@@ -1,6 +1,7 @@
 created: 20250909171928024
 modified: 20251110133437795
 tags: Community/Team
+leader: @kjharcombe 
 team: @MotovunJack
 title: Infrastructure Team
 
@@ -12,4 +13,4 @@ The infrastructure includes:
 * github.com/TiddlyWiki
 * tiddlywiki.com DNS
 * Netlify account for PR previews
-* edit.tiddlywiki.com
+* edit.tiddlywiki.com

community/project/teams/TiddlyDesktop Team.tid

@@ -0,0 +1,8 @@
+title: TiddlyWiki Team
+tags: Community/Team
+modified: 20260708095630754
+created: 20260708095630754
+leader: @BurningTreeC
+team: 
+
+The TiddlyDesktop development repository is at https://github.com/TiddlyWiki/TiddlyDesktop

core-server/commander.js

@@ -103,7 +103,7 @@ Commander.prototype.executeNextCommand = function() {
 					c = new command.Command(params,this);
 					err = c.execute();
 					if(err && typeof err.then === "function") {
-						err.then(e => { e ? this.callback(e) : this.executeNextCommand(); });
+						err.then((e) => { e ? this.callback(e) : this.executeNextCommand(); });
 					} else if(err) {
 						this.callback(err);
 					} else {
@@ -120,7 +120,7 @@ Commander.prototype.executeNextCommand = function() {
 					});
 					err = c.execute();
 					if(err && typeof err.then === "function") {
-						err.then(e => { if(e) this.callback(e); });
+						err.then((e) => { if(e) this.callback(e); });
 					} else if(err) {
 						this.callback(err);
 					}

core-server/commands/commands.js

@@ -25,7 +25,7 @@ Command.prototype.execute = function() {
 	if(!filter) {
 		return "No filter specified";
 	}
-	var commands = this.commander.wiki.filterTiddlers(filter)
+	var commands = this.commander.wiki.filterTiddlers(filter);
 	if(commands.length === 0) {
 		return "No tiddlers found for filter '" + filter + "'";
 	}

core-server/commands/deletetiddlers.js

@@ -24,8 +24,7 @@ Command.prototype.execute = function() {
 	if(this.params.length < 1) {
 		return "Missing filter";
 	}
-	var self = this,
+	var wiki = this.commander.wiki,
-		wiki = this.commander.wiki,
 		filter = this.params[0],
 		tiddlers = wiki.filterTiddlers(filter);
 	$tw.utils.each(tiddlers,function(title) {

core-server/commands/fetch.js

@@ -66,7 +66,7 @@ Command.prototype.fetchFiles = function(options) {
 	// Get the list of URLs
 	var urls;
 	if(options.url) {
-		urls = [options.url]
+		urls = [options.url];
 	} else if(options.urlFilter) {
 		urls = this.commander.wiki.filterTiddlers(options.urlFilter);
 	} else {
@@ -96,30 +96,30 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	var self = this,
 		lib = url.substr(0,8) === "https://" ? require("https") : require("http");
 	lib.get(url).on("response",function(response) {
-	    var type = (response.headers["content-type"] || "").split(";")[0],
+		var type = (response.headers["content-type"] || "").split(";")[0],
-	    	data = [];
+			data = [];
-	    self.commander.write("Reading " + url + ": ");
+		self.commander.write("Reading " + url + ": ");
-	    response.on("data",function(chunk) {
+		response.on("data",function(chunk) {
-	        data.push(chunk);
+			data.push(chunk);
-	        self.commander.write(".");
+			self.commander.write(".");
-	    });
+		});
-	    response.on("end",function() {
+		response.on("end",function() {
-	        self.commander.write("\n");
+			self.commander.write("\n");
-	        if(response.statusCode === 200) {
+			if(response.statusCode === 200) {
-		        self.processBody(Buffer.concat(data),type,options,url);
+				self.processBody(Buffer.concat(data),type,options,url);
-		        callback(null);
+				callback(null);
-	        } else {
+			} else {
-	        	if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
+				if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
-	        		return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
+					return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
-	        	} else {
+				} else {
-		        	return callback("Error " + response.statusCode + " retrieving " + url)
+					return callback("Error " + response.statusCode + " retrieving " + url);
-	        	}
+				}
-	        }
+			}
-	   	});
+		});
-	   	response.on("error",function(e) {
+		response.on("error",function(e) {
 			console.log("Error on GET request: " + e);
 			callback(e);
-	   	});
+		});
 	});
 	return null;
 };
@@ -153,18 +153,18 @@ Command.prototype.processBody = function(body,type,options,url) {
 			if(options.transformFilter) {
 				var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0];
 				if(transformedTitle) {
-					self.commander.log("Importing " + title + " as " + transformedTitle)
+					self.commander.log("Importing " + title + " as " + transformedTitle);
 					newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle});
 				}
 			} else {
-				self.commander.log("Importing " + title)
+				self.commander.log("Importing " + title);
 				newTiddler = tiddler;
 			}
 			self.commander.wiki.importTiddler(newTiddler);
 			count++;
 		}
 	});
-	self.commander.log("Imported " + count + " tiddlers")
+	self.commander.log("Imported " + count + " tiddlers");
 };
 
 exports.Command = Command;

core-server/commands/import.js

@@ -22,8 +22,7 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var self = this,
-		fs = require("fs"),
+		fs = require("fs");
-		path = require("path");
 	if(this.params.length < 2) {
 		return "Missing parameters";
 	}

core-server/commands/init.js

@@ -20,8 +20,7 @@ var Command = function(params,commander) {
 };
 
 Command.prototype.execute = function() {
-	var fs = require("fs"),
+	var fs = require("fs");
-		path = require("path");
 	// Check that we don't already have a valid wiki folder
 	if($tw.boot.wikiTiddlersPath || ($tw.utils.isDirectory($tw.boot.wikiPath) && !$tw.utils.isDirectoryEmpty($tw.boot.wikiPath))) {
 		return "Wiki folder is not empty";

core-server/commands/listen.js

@@ -19,7 +19,6 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
-	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core-server/commands/load.js

@@ -21,9 +21,7 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var self = this,
+	var self = this;
-		fs = require("fs"),
-		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing filename";
 	}

core-server/commands/output.js

@@ -21,8 +21,7 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var fs = require("fs"),
+	var path = require("path");
-		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing output path";
 	}

core-server/commands/render.js

@@ -7,59 +7,57 @@ Render individual tiddlers and save the results to the specified files
 
 \*/
 
-	"use strict";
+"use strict";
 	
-	var widget = require("$:/core/modules/widgets/widget.js");
+exports.info = {
+	name: "render",
+	synchronous: true
+};
 	
-	exports.info = {
+var Command = function(params,commander,callback) {
-		name: "render",
+	this.params = params;
-		synchronous: true
+	this.commander = commander;
-	};
+	this.callback = callback;
+};
 	
-	var Command = function(params,commander,callback) {
+Command.prototype.execute = function() {
-		this.params = params;
+	if(this.params.length < 1) {
-		this.commander = commander;
+		return "Missing tiddler filter";
-		this.callback = callback;
+	}
-	};
+	var self = this,
-	
+		fs = require("fs"),
-	Command.prototype.execute = function() {
+		path = require("path"),
-		if(this.params.length < 1) {
+		wiki = this.commander.wiki,
-			return "Missing tiddler filter";
+		tiddlerFilter = this.params[0],
+		filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
+		type = this.params[2] || "text/html",
+		template = this.params[3],
+		variableList = this.params.slice(4),
+		tiddlers = wiki.filterTiddlers(tiddlerFilter),
+		variables =  Object.create(null);
+	while(variableList.length >= 2) {
+		variables[variableList[0]] = variableList[1];
+		variableList = variableList.slice(2);
+	}
+	$tw.utils.each(tiddlers,function(title) {
+		var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
+		if(filenameResults.length > 0) {
+			var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
+			if(self.commander.verbose) {
+				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+			}
+			var parser = wiki.parseTiddler(template || title),
+				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
+				container = $tw.fakeDocument.createElement("div");
+			widgetNode.render(container,null);
+			var text = type === "text/html" ? container.innerHTML : container.textContent;
+			$tw.utils.createFileDirectories(filepath);
+			fs.writeFileSync(filepath,text,"utf8");
+		} else {
+			console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
 		}
-		var self = this,
+	});
-			fs = require("fs"),
+	return null;
-			path = require("path"),
+};
-			wiki = this.commander.wiki,
-			tiddlerFilter = this.params[0],
-			filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
-			type = this.params[2] || "text/html",
-			template = this.params[3],
-			variableList = this.params.slice(4),
-			tiddlers = wiki.filterTiddlers(tiddlerFilter),
-			variables =  Object.create(null);
-			while(variableList.length >= 2) {
-				variables[variableList[0]] = variableList[1];
-				variableList = variableList.slice(2);
-			}
-		$tw.utils.each(tiddlers,function(title) {
-			var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
-			if(filenameResults.length > 0) {
-				var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
-				if(self.commander.verbose) {
-					console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
-				}
-				var parser = wiki.parseTiddler(template || title),
-					widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
-					container = $tw.fakeDocument.createElement("div");
-				widgetNode.render(container,null);
-				var text = type === "text/html" ? container.innerHTML : container.textContent;
-				$tw.utils.createFileDirectories(filepath);
-				fs.writeFileSync(filepath,text,"utf8");
-			} else {
-				console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
-			}
-		});
-		return null;
-	};
 	
-	exports.Command = Command;
+exports.Command = Command;

core-server/commands/rendertiddlers.js

@@ -9,8 +9,6 @@ Command to render several tiddlers to a folder of files
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "rendertiddlers",
 	synchronous: true

core-server/commands/save.js

@@ -7,57 +7,56 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 
 \*/
 
-	"use strict";
+"use strict";
 	
-	exports.info = {
+exports.info = {
-		name: "save",
+	name: "save",
-		synchronous: true
+	synchronous: true
-	};
+};
 	
-	var Command = function(params,commander,callback) {
+var Command = function(params,commander,callback) {
-		this.params = params;
+	this.params = params;
-		this.commander = commander;
+	this.commander = commander;
-		this.callback = callback;
+	this.callback = callback;
-	};
+};
 	
-	Command.prototype.execute = function() {
+Command.prototype.execute = function() {
-		if(this.params.length < 1) {
+	if(this.params.length < 1) {
-			return "Missing filename filter";
+		return "Missing filename filter";
-		}
+	}
-		var self = this,
+	var self = this,
-			fs = require("fs"),
+		path = require("path"),
-			path = require("path"),
+		result = null,
-			result = null,
+		wiki = this.commander.wiki,
-			wiki = this.commander.wiki,
+		tiddlerFilter = this.params[0],
-			tiddlerFilter = this.params[0],
+		filenameFilter = this.params[1] || "[is[tiddler]]",
-			filenameFilter = this.params[1] || "[is[tiddler]]",
+		tiddlers = wiki.filterTiddlers(tiddlerFilter);
-			tiddlers = wiki.filterTiddlers(tiddlerFilter);
+	$tw.utils.each(tiddlers,function(title) {
-		$tw.utils.each(tiddlers,function(title) {
+		if(!result) {
-			if(!result) {
+			var tiddler = self.commander.wiki.getTiddler(title);
-				var tiddler = self.commander.wiki.getTiddler(title);
+			if(tiddler) {
-				if(tiddler) {
+				var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
-					var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
+					directory: path.resolve(self.commander.outputPath),
-						directory: path.resolve(self.commander.outputPath),
+					pathFilters: [filenameFilter],
-						pathFilters: [filenameFilter],
+					wiki: wiki,
-						wiki: wiki,
+					fileInfo: {
-						fileInfo: {
+						overwrite: true
-							overwrite: true
-						}
-					});
-					if(self.commander.verbose) {
-						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
 					}
-					try {
+				});
-						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
+				if(self.commander.verbose) {
-					} catch (err) {
+					console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
-						result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
-					}
-				} else {
-					result = "Tiddler '" + title + "' not found";
 				}
+				try {
+					$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
+				} catch (err) {
+					result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
+				}
+			} else {
+				result = "Tiddler '" + title + "' not found";
 			}
-		});
+		}
-		return result;
+	});
-	};
+	return result;
+};
 	
-	exports.Command = Command;
+exports.Command = Command;

core-server/commands/savetiddlers.js

@@ -9,8 +9,6 @@ Command to save several tiddlers to a folder of files
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "savetiddlers",
 	synchronous: true

core-server/commands/savewikifolder.js

@@ -43,7 +43,7 @@ Command.prototype.execute = function() {
 		namedParames,
 		tiddlerFilter,
 		options = {};
-	if (regFilter.test(this.params[1])) {  
+	if(regFilter.test(this.params[1])) {  
 		namedParames = this.commander.extractNamedParameters(this.params.slice(1));
 		tiddlerFilter = namedParames.filter || "[all[tiddlers]]";
 	} else {
@@ -177,13 +177,13 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 	$tw.utils.each(pluginTiddlers,function(tiddler,title) {
 		if(!tiddler.title) {
 			tiddler.title = title;
-		 }
+		}
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});
 };
 
 WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) {
-	var title = tiddler.fields.title, fileInfo, pathFilters, extFilters;
+	var fileInfo, pathFilters, extFilters;
 	if(this.wiki.tiddlerExists("$:/config/FileSystemPaths")) {
 		pathFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n");
 	}

core-server/commands/server.js

@@ -17,7 +17,6 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
-	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core-server/commands/setfield.js

@@ -9,8 +9,6 @@ Command to modify selected tiddlers to set a field to the text of a template tid
 
 "use strict";
 
-var widget = require("$:/core/modules/widgets/widget.js");
-
 exports.info = {
 	name: "setfield",
 	synchronous: true
@@ -26,8 +24,7 @@ Command.prototype.execute = function() {
 	if(this.params.length < 4) {
 		return "Missing parameters";
 	}
-	var self = this,
+	var wiki = this.commander.wiki,
-		wiki = this.commander.wiki,
 		filter = this.params[0],
 		fieldname = this.params[1] || "text",
 		templatetitle = this.params[2],

core-server/filesystem.js

@@ -26,7 +26,7 @@ exports.getSubdirectories = function(dirPath) {
 		}
 	});
 	return subdirs;
-}
+};
 
 /*
 Recursively (and synchronously) copy a directory and all its content
@@ -46,8 +46,7 @@ exports.copyDirectory = function(srcPath,dstPath) {
 	}
 	// Function to copy a folder full of files
 	var copy = function(srcPath,dstPath) {
-		var srcStats = fs.lstatSync(srcPath),
+		var srcStats = fs.lstatSync(srcPath);
-			dstExists = fs.existsSync(dstPath);
 		if(srcStats.isFile()) {
 			$tw.utils.copyFile(srcPath,dstPath);
 		} else if(srcStats.isDirectory()) {
@@ -83,7 +82,7 @@ exports.copyFile = function(srcPath,dstPath) {
 		dstFile = fs.openSync(dstPath,"w"),
 		bytesRead = 1,
 		pos = 0;
-	while (bytesRead > 0) {
+	while(bytesRead > 0) {
 		bytesRead = fs.readSync(srcFile,fileBuffer,0,FILE_BUFFER_LENGTH,pos);
 		fs.writeSync(dstFile,fileBuffer,0,bytesRead);
 		pos += bytesRead;
@@ -148,7 +147,7 @@ exports.deleteDirectory = function(dirPath) {
 				fs.unlinkSync(currPath);
 			}
 		}
-	fs.rmdirSync(dirPath);
+		fs.rmdirSync(dirPath);
 	}
 	return null;
 };
@@ -218,6 +217,11 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 		fileInfo.isEditableFile = true;
 		fileInfo.originalpath = options.fileInfo.originalpath;
 	}
+	// Propagate the pinFilepath flag (so generateTiddlerFilepath can short-circuit
+	// FileSystemPaths and write back to the original location)
+	if(options.fileInfo && !!options.fileInfo.pinFilepath) {
+		fileInfo.pinFilepath = true;
+	}
 	// Check if the tiddler has any unsafe fields that can't be expressed in a .tid or .meta file: containing control characters, or leading/trailing whitespace
 	var hasUnsafeFields = false;
 	$tw.utils.each(tiddler.getFieldStrings(),function(value,fieldName) {
@@ -255,7 +259,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 					// Overriding to the .tid extension needs special handling
 					fileInfo.type = "application/x-tiddler";
 					fileInfo.hasMetaFile = false;
-				} else if (metaExt === ".json") {
+				} else if(metaExt === ".json") {
 					// Overriding to the .json extension needs special handling
 					fileInfo.type = "application/json";
 					fileInfo.hasMetaFile = false;
@@ -320,9 +324,16 @@ exports.generateTiddlerFilepath = function(title,options) {
 		extension = options.extension || "",
 		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
 		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
+		pinFilepath = !!(options.fileInfo && options.fileInfo.pinFilepath),
 		filepath;
+	// If the tiddler's filepath is pinned via tiddlywiki.files, the originalpath
+	// wins and the path filters are skipped entirely.
+	if(pinFilepath && originalpath) {
+		var pinnedExt = path.extname(originalpath);
+		filepath = originalpath.substring(0,originalpath.length - pinnedExt.length);
+	}
 	// Check if any of the pathFilters applies
-	if(options.pathFilters && options.wiki) {
+	if(!filepath && options.pathFilters && options.wiki) {
 		$tw.utils.each(options.pathFilters,function(filter) {
 			if(!filepath) {
 				var source = options.wiki.makeTiddlerIterator([title]),
@@ -337,26 +348,42 @@ exports.generateTiddlerFilepath = function(title,options) {
 		//Use the originalpath without the extension
 		var ext = path.extname(originalpath);
 		filepath = originalpath.substring(0,originalpath.length - ext.length);
+		// normalise "\" to "/" so the sanitiser keeps subdirectories
+		// (it strips "\", not "/") instead of flattening them.
+		filepath = filepath.split(path.sep).join("/");
 	} else if(!filepath) {
 		filepath = title;
 		// Remove any forward or backward slashes so we don't create directories
 		filepath = filepath.replace(/\/|\\/g,"_");
 	}
-	// Replace any Windows control codes
-	filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
 	// Replace any leading spaces with the same number of underscores
-	filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_")});
+	filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_");});
 	//If the path does not start with "." or ".." && a path seperator, then
 	if(!/^\.{1,2}[/\\]/g.test(filepath)) {
 		// Don't let the filename start with any dots because such files are invisible on *nix
-		filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_")});
+		filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_");});
 	}
 	// Replace any Unicode control codes
 	filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
-	// Replace any characters that can't be used in cross-platform filenames
+	// Replace any characters that can't be used in cross-platform filenames.
-	filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
+	if(!pinFilepath) {
+		filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^|\\/g,"_"));
+	}
+	// Per segment (catches "sub/CON"), MUST be after transliterate which can create a
+	// reserved name. Reserved names are wrapped on every path incl pinned;
+	// trailing dots/spaces (Windows strips) fixed for generated names, not pinned.
+	filepath = filepath.split("/").map(function(segment) {
+		if(segment === "" || segment === "." || segment === "..") {
+			return segment;
+		}
+		segment = segment.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
+		if(!pinFilepath) {
+			segment = segment.replace(/[. ]+$/,function(u) { return u.replace(/[. ]/g,"_"); });
+		}
+		return segment;
+	}).join("/");
 	// Replace any dots or spaces at the end of the extension with the same number of underscores
-	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_")});
+	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_");});
 	// Truncate the extension if it is too long
 	if(extension.length > 32) {
 		extension = extension.substr(0,32);
@@ -382,9 +409,9 @@ exports.generateTiddlerFilepath = function(title,options) {
 	}
 	// Add a uniquifier if the file already exists (default)
 	var fullPath = path.resolve(directory, filepath + extension);
-	if (!overwrite) {
+	if(!overwrite) {
 		var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
-		count = 0;
+			count = 0;
 		do {
 			fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
 			if(oldPath && oldPath == fullPath) break;
@@ -401,7 +428,7 @@ exports.generateTiddlerFilepath = function(title,options) {
 			writePath.indexOf(path.resolve(directory)) == 0 ||
 			writePath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
 			writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
-		}
+	}
 	if(encode) {
 		writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
 	}
@@ -521,12 +548,12 @@ Cleanup old files on disk, by comparing the options values:
 */
 exports.cleanupTiddlerFiles = function(options,callback) {
 	var adaptorInfo = options.adaptorInfo || {},
-	bootInfo = options.bootInfo || {},
+		bootInfo = options.bootInfo || {},
-	title = options.title || "undefined";
+		title = options.title || "undefined";
 	if(adaptorInfo.filepath && bootInfo.filepath && adaptorInfo.filepath !== bootInfo.filepath) {
 		$tw.utils.deleteTiddlerFile(adaptorInfo,function(err) {
 			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
+				if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
 					// Error deleting the previous file on disk, should fail gracefully
 					$tw.syncer.displayError("Server desynchronized. Error cleaning up previous file for tiddler: \""+title+"\"",err);
 					return callback(null,bootInfo);

core-server/server/authenticators/basic.js

@@ -10,9 +10,7 @@ Authenticator for WWW basic authentication
 "use strict";
 
 if($tw.node) {
-	var util = require("util"),
+	var fs = require("fs"),
-		fs = require("fs"),
-		url = require("url"),
 		path = require("path");
 }
 

core-server/server/routes/get-index.js

@@ -19,7 +19,7 @@ exports.info = {
 exports.handler = function(request,response,state) {
 	var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")),
 		responseHeaders = {
-		"Content-Type": state.server.get("root-serve-type")
+			"Content-Type": state.server.get("root-serve-type")
-	};
+		};
 	state.sendResponse(200,responseHeaders,text);
 };

core-server/server/routes/put-tiddler.js

@@ -18,7 +18,7 @@ exports.info = {
 
 exports.handler = function(request,response,state) {
 	var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
-	fields = $tw.utils.parseJSONSafe(state.data);
+		fields = $tw.utils.parseJSONSafe(state.data);
 	// Pull up any subfields in the `fields` object
 	if(fields.fields) {
 		$tw.utils.each(fields.fields,function(field,name) {

core-server/server/server.js

@@ -9,14 +9,14 @@ Serve tiddlers over http
 
 "use strict";
 
+let fs, path, crypto, zlib, URL;
+
 if($tw.node) {
-	var util = require("util"),
+	fs = require("fs"),
-		fs = require("fs"),
+	path = require("path"),
-		url = require("url"),
+	crypto = require("crypto"),
-		path = require("path"),
+	zlib = require("zlib");
-		querystring = require("querystring"),
+	URL = require("url").URL;
-		crypto = require("crypto"),
-		zlib = require("zlib");
 }
 
 /*
@@ -41,7 +41,7 @@ function Server(options) {
 		}
 	}
 	// Setup the default required plugins
-	this.requiredPlugins = this.get("required-plugins").split(',');
+	this.requiredPlugins = this.get("required-plugins").split(",");
 	// Initialise CORS
 	this.corsEnable = this.get("cors-enable") === "yes";
 	// Initialise CSRF
@@ -62,9 +62,9 @@ function Server(options) {
 	this.authorizationPrincipals = {
 		readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
 		writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
-	}
+	};
 	if(this.get("admin") || authorizedUserName !== "(anon)") {
-		this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(',').map($tw.utils.trim)
+		this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(",").map($tw.utils.trim);
 	}
 	// Load and initialise authenticators
 	$tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
@@ -91,7 +91,7 @@ function Server(options) {
 		this.listenOptions = {
 			key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
 			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
-			passphrase: tlsPassphrase || ''
+			passphrase: tlsPassphrase || ""
 		};
 		this.protocol = "https";
 	}
@@ -116,7 +116,7 @@ encoding: the encoding of the data to send (passed to the end method of the resp
 */
 function sendResponse(request,response,statusCode,headers,data,encoding) {
 	if(this.enableBrowserCache && (statusCode == 200)) {
-		var hash = crypto.createHash('md5');
+		var hash = crypto.createHash("md5");
 		// Put everything into the hash that could change and invalidate the data that
 		// the browser already stored. The headers the data and the encoding.
 		hash.update(data);
@@ -211,7 +211,6 @@ Server.prototype.addAuthenticator = function(AuthenticatorClass) {
 Server.prototype.findMatchingRoute = function(request,state) {
 	for(var t=0; t<this.routes.length; t++) {
 		var potentialRoute = this.routes[t],
-			pathRegExp = potentialRoute.path,
 			pathname = state.urlInfo.pathname,
 			match;
 		if(state.pathPrefix) {
@@ -250,7 +249,7 @@ Check whether a given user is authorized for the specified authorizationType ("r
 Server.prototype.isAuthorized = function(authorizationType,username) {
 	var principals = this.authorizationPrincipals[authorizationType] || [];
 	return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
-}
+};
 
 Server.prototype.requestHandler = function(request,response,options) {
 	options = options || {};
@@ -260,8 +259,8 @@ Server.prototype.requestHandler = function(request,response,options) {
 	state.wiki = options.wiki || self.wiki;
 	state.boot = options.boot || self.boot;
 	state.server = self;
-	state.urlInfo = url.parse(request.url);
+	state.urlInfo = new URL(request.url, "http://localhost");
-	state.queryParameters = querystring.parse(state.urlInfo.query);
+	state.queryParameters = Object.fromEntries(state.urlInfo.searchParams);
 	state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
 	// Enable CORS
 	if(this.corsEnable) {
@@ -337,7 +336,7 @@ Server.prototype.requestHandler = function(request,response,options) {
 		request.on("end",function() {
 			state.data = Buffer.concat(data);
 			route.handler(request,response,state);
-		})
+		});
 	} else {
 		response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source);
 		response.end();
@@ -362,8 +361,8 @@ Server.prototype.listen = function(port,host,prefix) {
 	}
 	// Warn if required plugins are missing
 	var missing = [];
-	for (var index=0; index<this.requiredPlugins.length; index++) {
+	for(var index=0; index<this.requiredPlugins.length; index++) {
-		if (!this.wiki.getTiddler(this.requiredPlugins[index])) {
+		if(!this.wiki.getTiddler(this.requiredPlugins[index])) {
 			missing.push(this.requiredPlugins[index]);
 		}
 	}

core-server/utils/base64.js

@@ -9,22 +9,22 @@ Base64 UTF-8 utlity functions.
 
 "use strict";
 
-const{ TextEncoder, TextDecoder } = require("node:util");
+const { TextEncoder, TextDecoder } = require("node:util");
 
-exports.btoa = binstr => Buffer.from(binstr, "binary").toString("base64");
+exports.btoa = (binstr) => Buffer.from(binstr, "binary").toString("base64");
 
-exports.atob = b64 => Buffer.from(b64, "base64").toString("binary");
+exports.atob = (b64) => Buffer.from(b64, "base64").toString("binary");
 
 function base64ToBytes(base64) {
 	const binString = exports.atob(base64);
-	return Uint8Array.from(binString, m => m.codePointAt(0));
+	return Uint8Array.from(binString, (m) => m.codePointAt(0));
 };
 
 function bytesToBase64(bytes) {
-	const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join("");
+	const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
 	return exports.btoa(binString);
 };
 
-exports.base64EncodeUtf8 = str => bytesToBase64(new TextEncoder().encode(str));
+exports.base64EncodeUtf8 = (str) => bytesToBase64(new TextEncoder().encode(str));
 
-exports.base64DecodeUtf8 = str => new TextDecoder().decode(base64ToBytes(str));
+exports.base64DecodeUtf8 = (str) => new TextDecoder().decode(base64ToBytes(str));

core-server/utils/repository.js

@@ -16,8 +16,7 @@ ignoreEnvironmentVariables: defaults to false
 */
 exports.getAllPlugins = function(options) {
 	options = options || {};
-	var fs = require("fs"),
+	var path = require("path"),
-		path = require("path"),
 		tiddlers = {};
 	// Collect up the library plugins
 	var collectPlugins = function(folder) {

core/language/en-GB/ControlPanel.multids

@@ -58,10 +58,14 @@ LayoutSwitcher/Caption: Layout
 LoadedModules/Caption: Loaded Modules
 LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
 Palette/Caption: Palette
+Palette/Customisations/Prompt: Customisations for the current palette: <<palette-link>>
+Palette/Customisations/Reset/Caption: reset customisations
+Palette/Editor/Customised/Prompt: This palette has customisations that override the entries marked below
+Palette/Editor/Customised/Entry: overridden by a customisation
 Palette/Editor/Clone/Caption: clone
 Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
 Palette/Editor/Delete/Hint: delete this entry from the current palette
-Palette/Editor/Names/External/Show: Show color names that are not part of the current palette
+Palette/Editor/Names/External/Show: Show inherited palette entries
 Palette/Editor/Prompt/Modified: This shadow palette has been modified
 Palette/Editor/Prompt: Editing
 Palette/Editor/Reset/Caption: reset
@@ -255,4 +259,5 @@ ViewTemplateTags/Caption: View Template Tags
 ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler.
 WikiInformation/Caption: Wiki Information
 WikiInformation/Hint: This page summarises high level information about the configuration of this ~TiddlyWiki. It is designed to enable users to quickly share relevant aspects of the configuration of their ~TiddlyWiki with others, for example when seeking help in one of the forums. No private or personal information is included, and nothing is shared without being explicitly copied and pasted elsewhere
-WikiInformation/Drag/Caption: Drag this link to copy this tool to another wiki
+WikiInformation/Drag/Caption: Drag this link to copy this tool to another wiki
+WikiInformation/Generate/Caption: Click to generate wiki information report

core/language/en-GB/Import.multids

@@ -15,6 +15,8 @@ Listing/Preview/TextRaw: Text (Raw)
 Listing/Preview/Fields: Fields
 Listing/Preview/Diff: Diff
 Listing/Preview/DiffFields: Diff (Fields)
+Listing/ImportOptions/Caption: Import options
+Listing/ImportOptions/NoMatch: No import options apply to these files.
 Listing/Rename/Tooltip: Rename tiddler before importing
 Listing/Rename/Prompt: Rename to:
 Listing/Rename/ConfirmRename: Rename tiddler

core/language/en-GB/Misc.multids

@@ -30,6 +30,8 @@ Error/DeserializeOperator/MissingOperand: Filter Error: Missing operand for 'des
 Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserializer provided as operand for the 'deserialize' operator
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
+Error/FilterPragma: Filter Error: Unknown filter pragma
+Error/FilterPragmaPosition: Filter Error: Filter pragmas are only allowed at the start of a filter
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
 Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator

core/language/en-GB/TiddlerInfo.multids

@@ -10,7 +10,7 @@ Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text te
 Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
 Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler
 Advanced/CascadeInfo/Heading: Cascade Details
-Advanced/CascadeInfo/Hint: These are the view template segments (tagged <<tag "$:/tags/ViewTemplate">>) using a cascade filter and their resulting template for the current tiddler.
+Advanced/CascadeInfo/Hint: These are the view template segments that are resolved for each of the system view template cascades
 Advanced/CascadeInfo/Detail/View: View
 Advanced/CascadeInfo/Detail/ActiveCascadeFilter: Active cascade filter
 Advanced/CascadeInfo/Detail/Template: Template

core/modules/background-actions.js

@@ -18,13 +18,13 @@ class BackgroundActionDispatcher {
 		// Track the filter for the background actions
 		this.filterTracker.track({
 			filterString: "[all[tiddlers+shadows]tag[$:/tags/BackgroundAction]!is[draft]]",
-			fnEnter: title => this.trackFilter(title),
+			fnEnter: (title) => this.trackFilter(title),
 			fnLeave: (title, enterValue) => this.untrackFilter(enterValue),
 			fnChange: (title, enterValue) => {
 				this.untrackFilter(enterValue);
 				return this.trackFilter(title);
 			},
-			fnProcess: changes => this.process(changes)
+			fnProcess: (changes) => this.process(changes)
 		});
 	}
 
@@ -75,10 +75,9 @@ class BackgroundActionTracker {
 			filterString: this.trackFilter,
 			fnEnter: () => { this.hasChanged = true; },
 			fnLeave: () => { this.hasChanged = true; },
-			fnProcess: changes => {
+			fnProcess: (changes) => {
 				if(this.hasChanged) {
 					this.hasChanged = false;
-					console.log("Processing background action", this.title);
 					const tiddler = this.wiki.getTiddler(this.title);
 					let doActions = true;
 					if(tiddler && tiddler.fields.platforms) {
@@ -89,6 +88,7 @@ class BackgroundActionTracker {
 						}
 					}
 					if(doActions) {
+						console.log("Processing background action", this.title);
 						this.wiki.invokeActionString(
 							this.actions,
 							null,

core/modules/editor/engines/framed.js

@@ -31,8 +31,7 @@ function FramedEngine(options) {
 	this.parentNode.insertBefore(this.iframeNode,this.nextSibling);
 	this.iframeDoc = this.iframeNode.contentWindow.document;
 	// (Firefox requires us to put some empty content in the iframe)
-	var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
+	var colorScheme = (this.widget.wiki.getTiddler("$:/temp/palette-colours") || {fields: {}}).fields["color-scheme"] || "light";
-	var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
 	this.iframeDoc.open();
 	this.iframeDoc.write("<!DOCTYPE html><html><head><meta name='color-scheme' content='" + colorScheme + "'></head><body></body></html>");
 	this.iframeDoc.close();
@@ -156,14 +155,13 @@ Fix the height of textarea to fit content
 FramedEngine.prototype.fixHeight = function() {
 	// Make sure styles are updated
 	this.copyStyles();
-	// If .editRows is initialised, it takes precedence
+	if(this.widget.editTag === "textarea") {
-	if(this.widget.editTag === "textarea" && !this.widget.editRows) {
 		if(this.widget.editAutoHeight) {
 			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
 				var newHeight = $tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
 				this.iframeNode.style.height = newHeight + "px";
 			}
-		} else {
+		} else if(!this.widget.editRows) {
 			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
 			fixedHeight = Math.max(fixedHeight,20);
 			this.domNode.style.height = fixedHeight + "px";
@@ -197,7 +195,7 @@ FramedEngine.prototype.handleFocusEvent = function(event) {
 Handle a keydown event
  */
 FramedEngine.prototype.handleKeydownEvent = function(event) {
-	if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+	if($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
 		return true;
 	}
 

core/modules/editor/engines/simple.js

@@ -28,7 +28,12 @@ function SimpleEngine(options) {
 	if(this.widget.editTag === "textarea") {
 		this.domNode.appendChild(this.widget.document.createTextNode(this.value));
 	} else {
-		this.domNode.value = this.value;
+		if(this.widget.editType === "color") {
+			// The <input type="color"> element requires a six digit hex value
+			this.domNode.value = $tw.utils.convertCSSColorToRGBString(this.value);
+		} else {
+			this.domNode.value = this.value;
+		}
 	}
 	// Set the attributes
 	if(this.widget.editType && this.widget.editTag !== "textarea") {
@@ -83,6 +88,9 @@ Update the DomNode with the new text
 */
 SimpleEngine.prototype.updateDomNodeText = function(text) {
 	try {
+		if(this.widget.editType === "color") {
+			text = $tw.utils.convertCSSColorToRGBString(text);
+		}
 		this.domNode.value = text;
 	} catch(e) {
 		// Ignore
@@ -100,13 +108,12 @@ SimpleEngine.prototype.getText = function() {
 Fix the height of textarea to fit content
 */
 SimpleEngine.prototype.fixHeight = function() {
-	// If .editRows is initialised, it takes precedence
+	if(this.widget.editTag === "textarea") {
-	if((this.widget.editTag === "textarea") && !this.widget.editRows) {
 		if(this.widget.editAutoHeight) {
 			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
 				$tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
 			}
-		} else {
+		} else if(!this.widget.editRows) {
 			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
 			fixedHeight = Math.max(fixedHeight,20);
 			this.domNode.style.height = fixedHeight + "px";

core/modules/editor/factory.js

@@ -55,12 +55,12 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		var editInfo = this.getEditInfo(),
 			Engine = this.editShowToolbar ? toolbarEngine : nonToolbarEngine;
 		this.engine = new Engine({
-				widget: this,
+			widget: this,
-				value: editInfo.value,
+			value: editInfo.value,
-				type: editInfo.type,
+			type: editInfo.type,
-				parentNode: parent,
+			parentNode: parent,
-				nextSibling: nextSibling
+			nextSibling: nextSibling
-			});
+		});
 		// Call the postRender hook
 		if(this.postRender) {
 			this.postRender();
@@ -217,10 +217,11 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	EditTextWidget.prototype.refresh = function(changedTiddlers) {
 		var changedAttributes = this.computeAttributes();
 		// Completely rerender if any of our attributes have changed
-		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
 			this.refreshSelf();
 			return true;
-		} else if (changedTiddlers[this.editRefreshTitle]) {
+		} else if(changedAttributes["default"] || changedTiddlers[this.editRefreshTitle]) {
+			this.editDefault = this.getAttribute("default");
 			this.engine.updateDomNodeText(this.getEditInfo().value);
 		} else if(changedTiddlers[this.editTitle]) {
 			var editInfo = this.getEditInfo();
@@ -274,8 +275,8 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 					});
 				if($tw.keyboardManager.checkKeyDescriptors(event,keyInfoArray)) {
 					var clickEvent = this.document.createEvent("Events");
-				    clickEvent.initEvent("click",true,false);
+					clickEvent.initEvent("click",true,false);
-				    el.dispatchEvent(clickEvent);
+					el.dispatchEvent(clickEvent);
 					event.preventDefault();
 					event.stopPropagation();
 					return true;

core/modules/editor/operations/text/excise.js

@@ -10,7 +10,7 @@ Text editor operation to excise the selection to a new tiddler
 "use strict";
 
 function isMarkdown(mediaType) {
-	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
+	return mediaType === "text/markdown" || mediaType === "text/x-markdown";
 }
 
 exports["excise"] = function(event,operation) {

core/modules/editor/operations/text/wrap-lines.js

@@ -19,7 +19,7 @@ exports["wrap-lines"] = function(event,operation) {
 		operation.cutStart = operation.selStart - (prefix.length + 1);
 		operation.cutEnd = operation.selEnd + suffix.length + 1;
 		// Also cut the following newline (if there is any)
-		if (operation.text[operation.cutEnd] === "\n") {
+		if(operation.text[operation.cutEnd] === "\n") {
 			operation.cutEnd++;
 		}
 		// Replace with selection

core/modules/editor/operations/text/wrap-selection.js

@@ -44,7 +44,7 @@ exports["wrap-selection"] = function(event,operation) {
 				break;
 		}
 		return result;
-	}
+	};
 
 	function togglePrefixSuffix() {
 		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {

core/modules/filter-tracker.js

@@ -69,17 +69,17 @@ class FilterTracker {
 		if(!tracker) return;
 		const results = [];
 		// Evaluate the filter and remove duplicate results
-		$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), title => {
+		$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), (title) => {
 			$tw.utils.pushTop(results, title);
 		});
 		// Process the newly entered results
-		results.forEach(title => {
+		results.forEach((title) => {
 			if(!tracker.previousResults.includes(title) && !tracker.resultValues[title] && tracker.fnEnter) {
 				tracker.resultValues[title] = tracker.fnEnter(title) || true;
 			}
 		});
 		// Process the results that have just left
-		tracker.previousResults.forEach(title => {
+		tracker.previousResults.forEach((title) => {
 			if(!results.includes(title) && tracker.resultValues[title] && tracker.fnLeave) {
 				tracker.fnLeave(title, tracker.resultValues[title]);
 				delete tracker.resultValues[title];
@@ -91,7 +91,7 @@ class FilterTracker {
 
 	processChanges(changes) {
 		for(const tracker of this.trackers.values()) {
-			Object.keys(changes).forEach(title => {
+			Object.keys(changes).forEach((title) => {
 				if(title && tracker.previousResults.includes(title) && tracker.fnChange) {
 					tracker.resultValues[title] = tracker.fnChange(title, tracker.resultValues[title]) || tracker.resultValues[title];
 				}

core/modules/filterrunprefixes/cascade.js

@@ -24,7 +24,7 @@ exports.cascade = function(operationSubFunction,options) {
 					}
 					var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 						"currentTiddler": "" + title,
-						"..currentTiddler": widget.getVariable("currentTiddler","")
+						"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
 					}));
 					if(output.length !== 0) {
 						result = output[0];
@@ -34,5 +34,5 @@ exports.cascade = function(operationSubFunction,options) {
 				results.push(result);
 			});
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/filter.js

@@ -18,7 +18,7 @@ exports.filter = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",""),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length
@@ -30,5 +30,5 @@ exports.filter = function(operationSubFunction,options) {
 			});
 			results.remove(resultsToRemove);
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/intersection.js

@@ -13,14 +13,15 @@ Export our filter prefix function
 exports.intersection = function(operationSubFunction) {
 	return function(results,source,widget) {
 		if(results.length !== 0) {
-			var secondRunResults = operationSubFunction(source,widget);
+			const secondRunResults = operationSubFunction(source,widget),
-			var firstRunResults = results.toArray();
+				secondRunSet = new Set(secondRunResults),
+				firstRunResults = results.toArray();
 			results.clear();
-			$tw.utils.each(firstRunResults,function(title) {
+			firstRunResults.forEach((title) => {
-				if(secondRunResults.indexOf(title) !== -1) {
+				if(secondRunSet.has(title)) {
 					results.push(title);
 				}
 			});
 		}
 	};
-};
+};

core/modules/filterrunprefixes/let.js

@@ -7,8 +7,6 @@ Assign a value to a variable
 
 \*/
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*

core/modules/filterrunprefixes/map.js

@@ -20,7 +20,7 @@ exports.map = function(operationSubFunction,options) {
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",""),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (inputTitles.length - 1 - index),
 					"length": "" + inputTitles.length
@@ -28,12 +28,12 @@ exports.map = function(operationSubFunction,options) {
 				if(filtered.length && flatten) {
 					$tw.utils.each(filtered,function(value) {
 						results.push(value);
-					})
+					});
 				} else {
 					results.push(filtered[0]||"");
 				}
 				++index;
 			});
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/reduce.js

@@ -17,7 +17,7 @@ exports.reduce = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler"),
+					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length,
@@ -31,5 +31,5 @@ exports.reduce = function(operationSubFunction,options) {
 			results.clear();
 			results.push(accumulator);
 		}
-	}
+	};
 };

core/modules/filterrunprefixes/sort.js

@@ -13,35 +13,30 @@ Export our filter prefix function
 exports.sort = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var suffixes = options.suffixes,
+			const suffixes = options.suffixes,
 				sortType = (suffixes[0] && suffixes[0][0]) ? suffixes[0][0] : "string",
-				invert = suffixes[1] ? (suffixes[1].indexOf("reverse") !== -1) : false,
+				invert = suffixes[1] ? suffixes[1].includes("reverse") : false,
-				isCaseSensitive = suffixes[1] ? (suffixes[1].indexOf("casesensitive") !== -1) : false,
+				isCaseSensitive = suffixes[1] ? suffixes[1].includes("casesensitive") : false,
 				inputTitles = results.toArray(),
 				sortKeys = [],
-				indexes = new Array(inputTitles.length),
+				compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive});
-				compareFn;
+			results.each((title) => {
-			results.each(function(title) {
+				const key = operationSubFunction(
-				var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
+					options.wiki.makeTiddlerIterator([title]),
-					"currentTiddler": "" + title,
+					widget.makeFakeWidgetWithVariables({
-					"..currentTiddler": widget.getVariable("currentTiddler")
+						"currentTiddler": "" + title,
-				}));
+						"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
+					})
+				);
 				sortKeys.push(key[0] || "");
 			});
 			results.clear();
 			// Prepare an array of indexes to sort
-			for(var t=0; t<inputTitles.length; t++) {
+			let indexes = Array.from(inputTitles.keys());
-				indexes[t] = t;
+			indexes.sort((a,b) => compareFn(sortKeys[a],sortKeys[b]));
-			}
+			indexes.forEach((index) => {
-			// Sort the indexes
-			compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive});
-			indexes = indexes.sort(function(a,b) {
-					return compareFn(sortKeys[a],sortKeys[b]);
-			});
-			// Add to results in correct order
-			$tw.utils.each(indexes,function(index) {
 				results.push(inputTitles[index]);
 			});
 		}
-	}
+	};
 };

core/modules/filters.js

@@ -43,7 +43,7 @@ function parseFilterOperation(operators,filterString,p) {
 		var bracket = filterString.charAt(nextBracketPos);
 		operator.operator = filterString.substring(p,nextBracketPos);
 		// Any suffix?
-		var colon = operator.operator.indexOf(':');
+		var colon = operator.operator.indexOf(":");
 		if(colon > -1) {
 			// The raw suffix for older filters
 			operator.suffix = operator.operator.substring(colon + 1);
@@ -67,7 +67,7 @@ function parseFilterOperation(operators,filterString,p) {
 		operator.operands = [];
 		var parseOperand = function(bracketType) {
 			var operand = {};
-			switch (bracketType) {
+			switch(bracketType) {
 				case "{": // Curly brackets
 					operand.indirect = true;
 					nextBracketPos = filterString.indexOf("}",p);
@@ -88,8 +88,8 @@ function parseFilterOperation(operators,filterString,p) {
 						rexMatch = rex.exec(filterString.substring(p));
 					if(rexMatch) {
 						operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
-	// DEPRECATION WARNING
+						// DEPRECATION WARNING
-	console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
+						console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
 						nextBracketPos = p + rex.lastIndex - 1;
 					}
 					else {
@@ -108,7 +108,7 @@ function parseFilterOperation(operators,filterString,p) {
 			}
 			operator.operands.push(operand);
 			p = nextBracketPos + 1;
-		}
+		};
 
 		p = nextBracketPos + 1;
 		parseOperand(bracket);
@@ -146,14 +146,16 @@ exports.parseFilter = function(filterString) {
 		match;
 	var whitespaceRegExp = /(\s+)/mg,
 		// Groups:
-		// 1 - entire filter run prefix
+		// 1 - pragma
-		// 2 - filter run prefix itself
+		// 2 - pragma suffix
-		// 3 - filter run prefix suffixes
+		// 3 - entire filter run prefix
-		// 4 - opening square bracket following filter run prefix
+		// 4 - filter run prefix name
-		// 5 - double quoted string following filter run prefix
+		// 5 - filter run prefix suffixes
-		// 6 - single quoted string following filter run prefix
+		// 6 - opening square bracket following filter run prefix
-		// 7 - anything except for whitespace and square brackets
+		// 7 - double quoted string following filter run prefix
-		operandRegExp = /((?:\+|\-|~|(?:=>?)|\:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
+		// 8 - single quoted string following filter run prefix
+		// 9 - anything except for whitespace and square brackets
+		operandRegExp = /(?:::(\w+)(?:\:(\w+))?(?=\s|$)|((?:\+|\-|~|(?:=>?)|:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+)))/mg;
 	while(p < filterString.length) {
 		// Skip any whitespace
 		whitespaceRegExp.lastIndex = p;
@@ -170,18 +172,23 @@ exports.parseFilter = function(filterString) {
 			};
 			match = operandRegExp.exec(filterString);
 			if(match && match.index === p) {
-				// If there is a filter run prefix
 				if(match[1]) {
-					operation.prefix = match[1];
+					// If there is a filter pragma
+					operation.pragma = match[1];
+					operation.suffix = match[2];
+					p = match.index + match[0].length;
+				} else if(match[3]) {
+					// If there is a filter run prefix
+					operation.prefix = match[3];
 					p = p + operation.prefix.length;
 					// Name for named prefixes
-					if(match[2]) {
+					if(match[4]) {
-						operation.namedPrefix = match[2];
+						operation.namedPrefix = match[4];
 					}
 					// Suffixes for filter run prefix
-					if(match[3]) {
+					if(match[5]) {
 						operation.suffixes = [];
-						$tw.utils.each(match[3].split(":"),function(subsuffix) {
+						$tw.utils.each(match[5].split(":"),function(subsuffix) {
 							operation.suffixes.push([]);
 							$tw.utils.each(subsuffix.split(","),function(entry) {
 								entry = $tw.utils.trim(entry);
@@ -193,7 +200,7 @@ exports.parseFilter = function(filterString) {
 					}
 				}
 				// Opening square bracket
-				if(match[4]) {
+				if(match[6]) {
 					p = parseFilterOperation(operation.operators,filterString,p);
 				} else {
 					p = match.index + match[0].length;
@@ -203,9 +210,9 @@ exports.parseFilter = function(filterString) {
 				p = parseFilterOperation(operation.operators,filterString,p);
 			}
 			// Quoted strings and unquoted title
-			if(match[5] || match[6] || match[7]) { // Double quoted string, single quoted string or unquoted title
+			if(match[7] || match[8] || match[9]) { // Double quoted string, single quoted string or unquoted title
 				operation.operators.push(
-					{operator: "title", operands: [{text: match[5] || match[6] || match[7]}]}
+					{operator: "title", operands: [{text: match[7] || match[8] || match[9]}]}
 				);
 			}
 			results.push(operation);
@@ -228,25 +235,28 @@ exports.getFilterRunPrefixes = function() {
 		$tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes);
 	}
 	return this.filterRunPrefixes;
-}
+};
 
-exports.filterTiddlers = function(filterString,widget,source) {
+exports.filterTiddlers = function(filterString,widget,source,options) {
-	var fn = this.compileFilter(filterString);
+	var fn = this.compileFilter(filterString,options);
 	return fn.call(this,source,widget);
 };
 
 /*
-Compile a filter into a function with the signature fn(source,widget) where:
+Compile a filter into a function with the signature fn(source,widget,options) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
 widget: an optional widget node for retrieving the current tiddler etc.
 */
-exports.compileFilter = function(filterString) {
+exports.compileFilter = function(filterString,options) {
+	var defaultFilterRunPrefix = (options || {}).defaultFilterRunPrefix || "or",
+		seenNonPragmaOperation = false;
+	var cacheKey = filterString + "|" + defaultFilterRunPrefix;
 	if(!this.filterCache) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	if(this.filterCache[filterString] !== undefined) {
+	if(this.filterCache[cacheKey] !== undefined) {
-		return this.filterCache[filterString];
+		return this.filterCache[cacheKey];
 	}
 	var filterParseTree;
 	try {
@@ -296,7 +306,7 @@ exports.compileFilter = function(filterString) {
 						var varTree = $tw.utils.parseFilterVariable(operand.text);
 						var resultList = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source});
 						if((resultList.length > 0 && resultList[0] !== undefined) || resultList.length === 0) {
-							operand.multiValue = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source}) || [];
+							operand.multiValue = resultList || [];
 							operand.value = operand.multiValue[0] || "";
 						} else {
 							operand.value = "";
@@ -314,19 +324,20 @@ exports.compileFilter = function(filterString) {
 
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
-							operator: operator.operator,
+					operator: operator.operator,
-							operand: operands.length > 0 ? operands[0] : undefined,
+					operand: operands.length > 0 ? operands[0] : undefined,
-							operands: operands,
+					operands: operands,
-							multiValueOperands: multiValueOperands,
+					multiValueOperands: multiValueOperands,
-							isMultiValueOperand: isMultiValueOperand,
+					isMultiValueOperand: isMultiValueOperand,
-							prefix: operator.prefix,
+					prefix: operator.prefix,
-							suffix: operator.suffix,
+					suffix: operator.suffix,
-							suffixes: operator.suffixes,
+					suffixes: operator.suffixes,
-							regexp: operator.regexp
+					regexp: operator.regexp
-						},{
+				},{
-							wiki: self,
+					wiki: self,
-							widget: widget
+					widget: widget,
-						});
+					defaultFilterRunPrefix: defaultFilterRunPrefix
+				});
 				if($tw.utils.isArray(results)) {
 					accumulator = self.makeTiddlerIterator(results);
 				} else {
@@ -346,29 +357,60 @@ exports.compileFilter = function(filterString) {
 		var filterRunPrefixes = self.getFilterRunPrefixes();
 		// Wrap the operator functions in a wrapper function that depends on the prefix
 		operationFunctions.push((function() {
-			var options = {wiki: self, suffixes: operation.suffixes || []};
+			if(operation.pragma) {
-			switch(operation.prefix || "") {
+				// Pragmas are only allowed at the start of a filter, before any runs
-				case "": // No prefix means that the operation is unioned into the result
+				if(seenNonPragmaOperation) {
-					return filterRunPrefixes["or"](operationSubFunction, options);
+					return function(results,source,widget) {
-				case "=": // The results of the operation are pushed into the result without deduplication
+						results.clear();
-					return filterRunPrefixes["all"](operationSubFunction, options);
+						results.push($tw.language.getString("Error/FilterPragmaPosition"));
-				case "-": // The results of this operation are removed from the main result
+					};
-					return filterRunPrefixes["except"](operationSubFunction, options);
+				}
-				case "+": // This operation is applied to the main results so far
+				switch(operation.pragma) {
-					return filterRunPrefixes["and"](operationSubFunction, options);
+					case "defaultprefix":
-				case "~": // This operation is unioned into the result only if the main result so far is empty
+						defaultFilterRunPrefix = operation.suffix || "or";
-					return filterRunPrefixes["else"](operationSubFunction, options);
+						break;
-				case "=>": // This operation is applied to the main results so far, and the results are assigned to a variable
+					default:
-					return filterRunPrefixes["let"](operationSubFunction, options);
-				default: 
-					if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
-						return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
-					} else {
 						return function(results,source,widget) {
 							results.clear();
-							results.push($tw.language.getString("Error/FilterRunPrefix"));
+							results.push($tw.language.getString("Error/FilterPragma"));
 						};
-					}
+				}
+				return function(results,source,widget) {
+					// Dummy response
+				};
+			} else {
+				seenNonPragmaOperation = true;
+				var options = {wiki: self, suffixes: operation.suffixes || []};
+				switch(operation.prefix || "") {
+					case "": // Use the default filter run prefix if none is specified
+						if(filterRunPrefixes[defaultFilterRunPrefix]) {
+							return filterRunPrefixes[defaultFilterRunPrefix](operationSubFunction, options);
+						} else {
+							return function(results,source,widget) {
+								results.clear();
+								results.push($tw.language.getString("Error/FilterRunPrefix"));
+							};
+						}
+					case "=": // The results of the operation are pushed into the result without deduplication
+						return filterRunPrefixes["all"](operationSubFunction, options);
+					case "-": // The results of this operation are removed from the main result
+						return filterRunPrefixes["except"](operationSubFunction, options);
+					case "+": // This operation is applied to the main results so far
+						return filterRunPrefixes["and"](operationSubFunction, options);
+					case "~": // This operation is unioned into the result only if the main result so far is empty
+						return filterRunPrefixes["else"](operationSubFunction, options);
+					case "=>": // This operation is applied to the main results so far, and the results are assigned to a variable
+						return filterRunPrefixes["let"](operationSubFunction, options);
+					default: 
+						if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
+							return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
+						} else {
+							return function(results,source,widget) {
+								results.clear();
+								results.push($tw.language.getString("Error/FilterRunPrefix"));
+							};
+						}
+				}
 			}
 		})());
 	});
@@ -407,7 +449,7 @@ exports.compileFilter = function(filterString) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	this.filterCache[filterString] = fnMeasured;
+	this.filterCache[cacheKey] = fnMeasured;
 	this.filterCacheCount++;
 	return fnMeasured;
 };

core/modules/filters/changecount.js

@@ -0,0 +1,21 @@
+/*\
+title: $:/core/modules/filters/changecount.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for retrieving the changecount for each title in the list.
+
+\*/
+
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.changecount = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(options.wiki.getChangeCount(title) + "");
+	});
+	return results;
+};

core/modules/filters/colour-ops.js

@@ -0,0 +1,158 @@
+/*\
+title: $:/core/modules/filters/colour-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for colour operations
+
+\*/
+
+"use strict";
+
+var Color = require("$:/core/modules/utils/dom/color.js").Color,
+	colourSpacesList = Object.keys(Color.spaces),
+	hueAdjustersList = ["raw","increasing","decreasing","longer","shorter"];
+
+exports["colour-lighten"] = makeSerialColourOperator(function (colour, operator, options) {
+	return colour.lighten($tw.utils.parseNumber(operator.operand)).display().toString();
+});
+
+exports["colour-darken"] = makeSerialColourOperator(function (colour, operator, options) {
+	return colour.darken($tw.utils.parseNumber(operator.operand)).display().toString();
+});
+
+exports["colour-get-oklch"] = makeSerialColourOperator(function (colour, operator, options) {
+	var prop = ((operator.suffixes || [])[0] || ["l"])[0];
+	if(["l","c","h"].indexOf(prop) !== -1) {
+		colour = colour.oklch[prop];
+		// Hue is null for achromatic colours
+		if(colour === null || colour === undefined || Number.isNaN(colour)) {
+			return "";
+		}
+	}
+	return colour.toString();
+});
+
+exports["colour-set-oklch"] = makeSerialColourOperator(function (colour, operator, options) {
+	var prop = ((operator.suffixes || [])[0] || ["l"])[0];
+	if(["l","c","h"].indexOf(prop) !== -1) {
+		colour.oklch[prop] = $tw.utils.parseNumber(operator.operand);
+	}
+	return colour.display().toString();
+});
+
+exports["colour-set-alpha"] = makeSerialColourOperator(function (colour, operator, options) {
+	colour.alpha = $tw.utils.parseNumber(operator.operand);
+	return colour.display().toString();
+});
+
+exports["colour-composite"] = makeSerialColourOperator(function (colour, operator, options) {
+	// Composite each translucent input colour over the backdrop given in the operand
+	var backdrop = $tw.utils.parseCSSColorObject(operator.operand);
+	if(backdrop && colour.alpha < 1) {
+		var alpha = colour.alpha;
+		colour.alpha = 1;
+		colour = backdrop.mix(colour,alpha,{space: "srgb"});
+	}
+	return colour.display().toString();
+});
+
+exports["colour-contrast"] = makeParallelColourOperator(function (colours, operator, options) {
+	var colourContrasts = [];
+	$tw.utils.each(colours,function(colour,index) {
+		if(!colour) {
+			colour = $tw.utils.parseCSSColorObject("white");
+			colours[index] = colour;
+		}
+		if(index > 0) {
+			colourContrasts.push(colour.contrast(colours[index - 1],"DeltaPhi").toString());
+		}
+	});
+	return colourContrasts;
+});
+
+exports["colour-best-contrast"] = makeParallelColourOperator(function (colours, operator, options, originalColours) {
+	var bestContrast = 0,
+		bestColour = null;
+	if(colours.length < 2) {
+		return [];
+	}
+	var targetColour = colours[colours.length - 1];
+	if(!targetColour) {
+		return [];
+	}
+	for(var t=0; t<colours.length; t++) {
+		var colour = colours[t];
+		if(colour) {
+			var contrast = colour.contrast(targetColour,"DeltaPhi");
+			if(contrast > bestContrast) {
+				bestContrast = contrast;
+				bestColour = originalColours[t];
+			}
+		}
+	}
+	if(bestColour) {
+		return [bestColour];
+	} else {
+		return [];
+	}
+});
+
+exports["colour-interpolate"] = function(source,operator,options) {
+	// Get the colour space suffix
+	var space = ((((operator.suffixes || [])[0] || ["srgb"])[0]) || "").toLowerCase();
+	if(colourSpacesList.indexOf(space) === -1) {
+		space = "lch";
+	}
+	// Get the hue adjuster suffix
+	var hueAdjuster = ((((operator.suffixes || [])[1] || ["shorter"])[0]) || "").toLowerCase();
+	if(hueAdjustersList.indexOf(hueAdjuster) === -1) {
+		hueAdjuster = "shorter";
+	}
+	// Get the colours
+	if(operator.operands.length < 2) {
+		return [];
+	}
+	var colourA = $tw.utils.parseCSSColorObject(operator.operands[0]),
+		colourB = $tw.utils.parseCSSColorObject(operator.operands[1]);
+	if(!colourA || !colourB) {
+		return [];
+	}
+	var rangefn = colourA.range(colourB,{space: space, hue: hueAdjuster});
+	// Cycle through the weights
+	var results = [];
+	source(function(tiddler,title) {
+		var index = $tw.utils.parseNumber(title);
+		var colour = rangefn(index);
+		results.push(colour.display().toString());
+	});
+	return results;
+};
+
+function makeSerialColourOperator(fn) {
+	return function (source, operator, options) {
+		var results = [];
+		source(function (tiddler, title) {
+			var c = $tw.utils.parseCSSColorObject(title);
+			if(c) {
+				c = fn(c, operator, options);
+				results.push(c);
+			} else {
+				results.push("");
+			}
+		});
+		return results;
+	};
+}
+
+function makeParallelColourOperator(fn) {
+	return function (source, operator, options) {
+		var originalColours = [],
+			colours = [];
+		source(function (tiddler, title) {
+			originalColours.push(title);
+			colours.push($tw.utils.parseCSSColorObject(title));
+		});
+		return fn(colours, operator, options, originalColours);
+	};
+}

core/modules/filters/compare.js

@@ -32,4 +32,4 @@ var modes = {
 	"gt": function(value) {return value > 0;},
 	"lteq": function(value) {return value <= 0;},
 	"lt": function(value) {return value < 0;}
-}
+};

core/modules/filters/deserialize.js

@@ -31,4 +31,4 @@ exports["deserialize"] = function(source,operator,options) {
 		return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
 	}
 	return results;
-}
+};

core/modules/filters/each.js

@@ -15,8 +15,8 @@ Export our filter function
 */
 exports.each = function(source,operator,options) {
 	var results =[] ,
-	value,values = {},
+		value,values = {},
-	field = operator.operand || "title";
+		field = operator.operand || "title";
 	if(operator.suffix === "value" && field === "title") {
 		source(function(tiddler,title) {
 			if(!$tw.utils.hop(values,title)) {

core/modules/filters/field.js

@@ -53,7 +53,7 @@ exports.field = function(source,operator,options) {
 			if(source.byField && operator.operand) {
 				indexedResults = source.byField(fieldname,operator.operand);
 				if(indexedResults) {
-					return indexedResults
+					return indexedResults;
 				}
 			}
 			source(function(tiddler,title) {

core/modules/filters/fields.js

@@ -24,7 +24,7 @@ exports.fields = function(source,operator,options) {
 				for(fieldName in tiddler.fields) {
 					(operand.indexOf(fieldName) !== -1) ? $tw.utils.pushTop(results,fieldName) : "";
 				}
-			} else if (suffixes.indexOf("exclude") !== -1) {
+			} else if(suffixes.indexOf("exclude") !== -1) {
 				for(fieldName in tiddler.fields) {
 					(operand.indexOf(fieldName) !== -1) ? "" : $tw.utils.pushTop(results,fieldName);
 				}

core/modules/filters/filter.js

@@ -13,13 +13,15 @@ Filter operator returning those input titles that pass a subfilter
 Export our filter function
 */
 exports.filter = function(source,operator,options) {
-	var filterFn = options.wiki.compileFilter(operator.operand),
+	var suffixes = operator.suffixes || [],
+		defaultFilterRunPrefix = (suffixes[0] && suffixes[0][0]) || options.defaultFilterRunPrefix || "or",
+		filterFn = options.wiki.compileFilter(operator.operand,{defaultFilterRunPrefix}),
 		results = [],
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
 			"currentTiddler": "" + title,
-			"..currentTiddler": options.widget.getVariable("currentTiddler","")
+			"..currentTiddler": options.widget.getVariable("currentTiddler",{defaultValue:""})
 		}));
 		if((list.length > 0) === target) {
 			results.push(title);

core/modules/filters/format/timestamp.js

@@ -12,7 +12,7 @@ Export our filter function
 exports.timestamp = function(source,operand,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		if (title.match(/^-?\d+$/)) {
+		if(title.match(/^-?\d+$/)) {
 			var value = new Date(Number(title));
 			results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX"));
 		}

core/modules/filters/getindex.js

@@ -13,7 +13,7 @@ returns the value at a given index of datatiddlers
 Export our filter function
 */
 exports.getindex = function(source,operator,options) {
-	var data,title,results = [];
+	var data,results = [];
 	if(operator.operand){
 		source(function(tiddler,title) {
 			title = tiddler ? tiddler.fields.title : title;

core/modules/filters/json-ops.js

@@ -157,13 +157,13 @@ function convertDataItemValueToStrings(item) {
 	if(item === undefined) {
 		return undefined;
 	} else if(item === null) {
-		return ["null"]
+		return ["null"];
 	} else if(typeof item === "object") {
 		var results = [],i,t;
 		if(Array.isArray(item)) {
 			// Return all the items in arrays recursively
 			for(i=0; i<item.length; i++) {
-				t = convertDataItemValueToStrings(item[i])
+				t = convertDataItemValueToStrings(item[i]);
 				if(t !== undefined) {
 					results.push.apply(results,t);
 				}
@@ -231,7 +231,7 @@ function getItemAtIndex(item,index) {
 		return item[index];
 	} else if(Array.isArray(item)) {
 		index = $tw.utils.parseInt(index);
-		if(index < 0) { index = index + item.length };
+		if(index < 0) { index = index + item.length; };
 		return item[index]; // Will be undefined if index was out-of-bounds
 	} else {
 		return undefined;
@@ -289,7 +289,7 @@ function setDataItem(data,indexes,value) {
 	var lastIndex = indexes[indexes.length - 1];
 	if(Array.isArray(current)) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
+		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
 	}
 	// Only set indexes on objects and arrays
 	if(typeof current === "object") {
@@ -316,7 +316,7 @@ function deleteDataItem(data,indexes) {
 	var lastIndex = indexes[indexes.length - 1];
 	if(Array.isArray(current) && current !== null) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
+		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
 		// Check if index is valid before splicing
 		if(lastIndex >= 0 && lastIndex < current.length) {
 			current.splice(lastIndex,1);

core/modules/filters/listops.js

@@ -9,69 +9,56 @@ Filter operators for manipulating the current selection list
 
 "use strict";
 
+/*
+	Fetch titles from the current list
+*/
+const prepare_results = (source) => {
+	const results = [];
+	source((tiddler,title) => results.push(title));
+	return results;
+};
+
 /*
 Order a list
 */
 exports.order = function(source,operator,options) {
-	var results = [];
+	const results = prepare_results(source);
-	if(operator.operand.toLowerCase() === "reverse") {
+	return operator.operand.toLowerCase() === "reverse" ?
-		source(function(tiddler,title) {
+		results.reverse() :
-			results.unshift(title);
+		results;
-		});
-	} else {
-		source(function(tiddler,title) {
-			results.push(title);
-		});
-	}
-	return results;
 };
 
 /*
 Reverse list
 */
 exports.reverse = function(source,operator,options) {
-	var results = [];
+	return prepare_results(source).reverse();
-	source(function(tiddler,title) {
-		results.unshift(title);
-	});
-	return results;
 };
 
 /*
 First entry/entries in list
 */
 exports.first = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
+	const count = $tw.utils.getInt(operator.operand,1);
-		results = [];
+	return prepare_results(source).slice(0,count);
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(0,count);
 };
 
 /*
 Last entry/entries in list
 */
 exports.last = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
+	const count = $tw.utils.getInt(operator.operand,1);
-		results = [];
+	return count === 0 ?
-	if(count === 0) return results;
+		[] :
-	source(function(tiddler,title) {
+		prepare_results(source).slice(-count);
-		results.push(title);
-	});
-	return results.slice(-count);
 };
 
 /*
 All but the first entry/entries of the list
 */
 exports.rest = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
+	const count = $tw.utils.getInt(operator.operand,1);
-		results = [];
+	return prepare_results(source).slice(count);
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count);
 };
 exports.butfirst = exports.rest;
 exports.bf = exports.rest;
@@ -80,12 +67,9 @@ exports.bf = exports.rest;
 All but the last entry/entries of the list
 */
 exports.butlast = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
+	const count = $tw.utils.getInt(operator.operand,1),
-		results = [];
+		results = prepare_results(source),
-	source(function(tiddler,title) {
+		index = count === 0 ? results.length : -count;
-		results.push(title);
-	});
-	var index = count === 0 ? results.length : -count;
 	return results.slice(0,index);
 };
 exports.bl = exports.butlast;
@@ -94,22 +78,14 @@ exports.bl = exports.butlast;
 The nth member of the list
 */
 exports.nth = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
+	const count = $tw.utils.getInt(operator.operand,1);
-		results = [];
+	return prepare_results(source).slice(count - 1,count);
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count - 1,count);
 };
 
 /*
 The zero based nth member of the list
 */
 exports.zth = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,0),
+	const count = $tw.utils.getInt(operator.operand,0);
-		results = [];
+	return prepare_results(source).slice(count,count + 1);
-	source(function(tiddler,title) {
+};
-		results.push(title);
-	});
-	return results.slice(count,count + 1);
-};

core/modules/filters/lookup.js

@@ -25,7 +25,7 @@ exports.lookup = function(source,operator,options) {
 		indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
 		target;
 	if(operator.operands.length == 2) {
-		target = operator.operands[1]
+		target = operator.operands[1];
 	} else {
 		target = indexSuffix ? "0": "text";
 	}

core/modules/filters/math.js

@@ -17,35 +17,35 @@ Note that strings are converted to numbers automatically. Trailing non-digits ar
 "use strict";
 
 exports.negate = makeNumericBinaryOperator(
-	function(a) {return -a}
+	function(a) {return -a;}
 );
 
 exports.abs = makeNumericBinaryOperator(
-	function(a) {return Math.abs(a)}
+	function(a) {return Math.abs(a);}
 );
 
 exports.ceil = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(a)}
+	function(a) {return Math.ceil(a);}
 );
 
 exports.floor = makeNumericBinaryOperator(
-	function(a) {return Math.floor(a)}
+	function(a) {return Math.floor(a);}
 );
 
 exports.round = makeNumericBinaryOperator(
-	function(a) {return Math.round(a)}
+	function(a) {return Math.round(a);}
 );
 
 exports.trunc = makeNumericBinaryOperator(
-	function(a) {return Math.trunc(a)}
+	function(a) {return Math.trunc(a);}
 );
 
 exports.untrunc = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a)}
+	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a);}
 );
 
 exports.sign = makeNumericBinaryOperator(
-	function(a) {return Math.sign(a)}
+	function(a) {return Math.sign(a);}
 );
 
 exports.add = makeNumericBinaryOperator(
@@ -103,29 +103,29 @@ exports.log = makeNumericBinaryOperator(
 );
 
 exports.sum = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0 // Initial value
 );
 
 exports.product = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator * value},
+	function(accumulator,value) {return accumulator * value;},
 	1 // Initial value
 );
 
 exports.maxall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.max(accumulator,value)},
+	function(accumulator,value) {return Math.max(accumulator,value);},
 	-Infinity // Initial value
 );
 
 exports.minall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.min(accumulator,value)},
+	function(accumulator,value) {return Math.min(accumulator,value);},
 	Infinity // Initial value
 );
 
 exports.median = makeNumericArrayOperator(
 	function(values) {
 		var len = values.length, median;
-		values.sort(function(a,b) {return a-b});
+		values.sort(function(a,b) {return a-b;});
 		if(len % 2) { 
 			// Odd, return the middle number
 			median = values[(len - 1) / 2];
@@ -138,7 +138,7 @@ exports.median = makeNumericArrayOperator(
 );
 
 exports.average = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0, // Initial value
 	function(finalValue,numberOfValues) {
 		return finalValue/numberOfValues;
@@ -146,7 +146,7 @@ exports.average = makeNumericReducingOperator(
 );
 
 exports.variance = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		return getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -154,7 +154,7 @@ exports.variance = makeNumericReducingOperator(
 );
 
 exports["standard-deviation"] = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value},
+	function(accumulator,value) {return accumulator + value;},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -164,31 +164,31 @@ exports["standard-deviation"] = makeNumericReducingOperator(
 
 //trigonometry
 exports.cos = makeNumericBinaryOperator(
-	function(a) {return Math.cos(a)}
+	function(a) {return Math.cos(a);}
 );
 
 exports.sin = makeNumericBinaryOperator(
-	function(a) {return Math.sin(a)}
+	function(a) {return Math.sin(a);}
 );
 
 exports.tan = makeNumericBinaryOperator(
-	function(a) {return Math.tan(a)}
+	function(a) {return Math.tan(a);}
 );
 
 exports.acos = makeNumericBinaryOperator(
-	function(a) {return Math.acos(a)}
+	function(a) {return Math.acos(a);}
 );
 
 exports.asin = makeNumericBinaryOperator(
-	function(a) {return Math.asin(a)}
+	function(a) {return Math.asin(a);}
 );
 
 exports.atan = makeNumericBinaryOperator(
-	function(a) {return Math.atan(a)}
+	function(a) {return Math.atan(a);}
 );
 
 exports.atan2 = makeNumericBinaryOperator(
-	function(a,b) {return Math.atan2(a,b)}
+	function(a,b) {return Math.atan2(a,b);}
 );
 
 //Calculate the variance of a population of numbers in an array given its mean
@@ -222,8 +222,8 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
 			return [];
 		}
 		var value = result.reduce(function(accumulator,currentValue) {
-				return fnCalc(accumulator,currentValue);
+			return fnCalc(accumulator,currentValue);
-			},initialValue);
+		},initialValue);
 		if(fnFinal) {
 			value = fnFinal(value,result.length,result);
 		}

core/modules/filters/prefix.js

@@ -13,37 +13,22 @@ Filter operator for checking if a title starts with a prefix
 Export our filter function
 */
 exports.prefix = function(source,operator,options) {
-	var results = [],
+	const results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
+		suffixes = (operator.suffixes || [])[0] || [],
-	if(suffixes.indexOf("caseinsensitive") !== -1) {
+		caseInsensitive = suffixes.includes("caseinsensitive"),
-		var operand = operator.operand.toLowerCase();
+		negate = operator.prefix === "!";
-		if(operator.prefix === "!") {
+
-			source(function(tiddler,title) {
+	const operand = caseInsensitive ?
-				if(title.toLowerCase().substr(0,operand.length) !== operand) {
+		operator.operand.toLowerCase() :
-					results.push(title);
+		operator.operand;
-				}
+
-			});
+	source((tiddler,title) => {
-		} else {
+		const value = caseInsensitive ? title.toLowerCase() : title,
-			source(function(tiddler,title) {
+			matches = value.startsWith(operand);
-				if(title.toLowerCase().substr(0,operand.length) === operand) {
+		if(negate ? !matches : matches) {
-					results.push(title);
+			results.push(title);
-				}
-			});
 		}
-	} else {
+	});
-		if(operator.prefix === "!") {
+
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) !== operator.operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) === operator.operand) {
-					results.push(title);
-				}
-			});
-		}
-	}
 	return results;
-};
+};

core/modules/filters/range.js

@@ -21,7 +21,7 @@ exports.range = function(source,operator,options) {
 	}
 	// Process the parts
 	var beg, end, inc, i, fixed = 0;
-	for (i=0; i<parts.length; i++) {
+	for(i=0; i<parts.length; i++) {
 		// Validate real number
 		if(!/^\s*[+-]?((\d+(\.\d*)?)|(\.\d+))\s*$/.test(parts[i])) {
 			return ["range: bad number \"" + parts[i] + "\""];
@@ -36,10 +36,10 @@ exports.range = function(source,operator,options) {
 	switch(parts.length) {
 		case 1:
 			end = parts[0];
-			if (end >= 1) {
+			if(end >= 1) {
 				beg = 1;
 			}
-			else if (end <= -1) {
+			else if(end <= -1) {
 				beg = -1;
 			}
 			else {
@@ -72,7 +72,7 @@ exports.range = function(source,operator,options) {
 	end += direction * 0.5 * Math.pow(0.1,fixed);
 	var safety = 10010;
 	// Enumerate the range
-	if (end<beg) {
+	if(end<beg) {
 		for(i=beg; i>end; i+=inc) {
 			results.push(i.toFixed(fixed));
 			if(--safety<0) {

core/modules/filters/removesuffix.js

@@ -15,7 +15,7 @@ Export our filter function
 exports.removesuffix = function(source,operator,options) {
 	var results = [],
 		suffixes = (operator.suffixes || [])[0] || [];
-	if (!operator.operand) {
+	if(!operator.operand) {
 		source(function(tiddler,title) {
 			results.push(title);
 		});

core/modules/filters/sort.js

@@ -14,31 +14,31 @@ Export our filter function
 */
 exports.sort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,false,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,false);
 	return results;
 };
 
 exports.nsort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,true,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,true);
 	return results;
 };
 
 exports.sortan = function(source, operator, options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results, operator.operands[0] || "title", operator.prefix === "!",false,false,true,operator.operands[1]);
+	options.wiki.sortTiddlers(results, operator.operand || "title", operator.prefix === "!",false,false,true);
 	return results;
 };
 
 exports.sortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,false,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,false);
 	return results;
 };
 
 exports.nsortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,true,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,true);
 	return results;
 };
 

core/modules/filters/sortsub.js

@@ -14,13 +14,13 @@ Export our filter function
 */
 exports.sortsub = function(source,operator,options) {
 	// Compile the subfilter
-	var filterFn = options.wiki.compileFilter(operator.operand);
+	let filterFn = options.wiki.compileFilter(operator.operand);
 	// Collect the input titles and the corresponding sort keys
-	var inputTitles = [],
+	let inputTitles = [],
 		sortKeys = [];
 	source(function(tiddler,title) {
 		inputTitles.push(title);
-		var r = filterFn.call(options.wiki,function(iterator) {
+		let r = filterFn.call(options.wiki,function(iterator) {
 			iterator(options.wiki.getTiddler(title),title);
 		},options.widget.makeFakeWidgetWithVariables({
 			"currentTiddler": "" + title,
@@ -29,17 +29,12 @@ exports.sortsub = function(source,operator,options) {
 		sortKeys.push(r[0] || "");
 	});
 	// Rather than sorting the titles array, we'll sort the indexes so that we can consult both arrays
-	var indexes = new Array(inputTitles.length);
+	let indexes = Array.from(inputTitles.keys());
-	for(var t=0; t<inputTitles.length; t++) {
-		indexes[t] = t;
-	}
 	// Sort the indexes
-	var compareFn = $tw.utils.makeCompareFunction(operator.suffix,{defaultType: "string",invert: operator.prefix === "!"});
+	let compareFn = $tw.utils.makeCompareFunction(operator.suffix,{defaultType: "string",invert: operator.prefix === "!"});
-	indexes = indexes.sort(function(a,b) {
+	indexes = indexes.sort((a,b) => compareFn(sortKeys[a],sortKeys[b]));
-		return compareFn(sortKeys[a],sortKeys[b]);
-	});
 	// Make the results array in order
-	var results = [];
+	let results = [];
 	$tw.utils.each(indexes,function(index) {
 		results.push(inputTitles[index]);
 	});

core/modules/filters/strings.js

@@ -91,22 +91,35 @@ function diffLineWordMode(text1,text2,mode) {
 	return diffs;
 }
 
-exports.makepatches = function(source,operator,options) {
+exports.makepatches = function(source, operator, options) {
-	var suffix = operator.suffix || "",
+	const suffixes = operator.suffixes || [],
-		result = [];
+		[modeArg = [], formatArg = []] = suffixes,
-		
+		modeSuffix = modeArg[0] || operator.suffix || "",
-	source(function(tiddler,title) {
+		mode = ["lines", "words"].includes(modeSuffix) ? modeSuffix : "",
-		let diffs, patches;
+		isJson = formatArg[0] === "json",
-		if(suffix === "lines" || suffix === "words") {
+		results = [];
-			diffs = diffLineWordMode(title,operator.operand,suffix);
+
-			patches = dmp.patchMake(title,diffs);
+	source((tiddler, title) => {
+		if (isJson) {
+			const diffs = (mode === "lines" || mode === "words") 
+				? diffLineWordMode(title, operator.operand, mode) 
+				: dmp.diffMain(title, operator.operand);
+
+			const jsonOutput = diffs.map(([typeCode, text]) => ({
+				type: typeCode === 1 ? "insert" : (typeCode === -1 ? "delete" : "equal"),
+				text
+			}));
+			results.push(JSON.stringify(jsonOutput));
 		} else {
-			patches = dmp.patchMake(title,operator.operand);
+			const patches = (mode === "lines" || mode === "words") 
+				? dmp.patchMake(title, diffLineWordMode(title, operator.operand, mode)) 
+				: dmp.patchMake(title, operator.operand);
+			
+			results.push(dmp.patchToText(patches));
 		}
-		Array.prototype.push.apply(result,[dmp.patchToText(patches)]);
 	});
 
-	return result;
+	return results;
 };
 
 exports.applypatches = makeStringBinaryOperator(
@@ -235,4 +248,4 @@ exports.charcode = function(source,operator,options) {
 		}
 	});
 	return [chars.join("")];
-};
+};

core/modules/filters/subfilter.js

@@ -13,11 +13,14 @@ Filter operator returning its operand evaluated as a filter
 Export our filter function
 */
 exports.subfilter = function(source,operator,options) {
-	var list = options.wiki.filterTiddlers(operator.operand,options.widget,source);
+	var suffixes = operator.suffixes || [],
+		defaultFilterRunPrefix = (suffixes[0] && suffixes[0][0]) || options.defaultFilterRunPrefix || "or";
+	var list = options.wiki.filterTiddlers(operator.operand,options.widget,source,{defaultFilterRunPrefix});
 	if(operator.prefix === "!") {
-		var results = [];
+		const results = [],
-		source(function(tiddler,title) {
+			listSet = new Set(list);
-			if(list.indexOf(title) === -1) {
+		source((tiddler,title) => {
+			if(!listSet.has(title)) {
 				results.push(title);
 			}
 		});

core/modules/filters/suffix.js

@@ -13,41 +13,27 @@ Filter operator for checking if a title ends with a suffix
 Export our filter function
 */
 exports.suffix = function(source,operator,options) {
-	var results = [],
+	const results = [],
 		suffixes = (operator.suffixes || [])[0] || [];
-	if (!operator.operand) {
+
-		source(function(tiddler,title) {
+	if(!operator.operand) {
+		source((tiddler,title) => {
 			results.push(title);
 		});
-	} else if(suffixes.indexOf("caseinsensitive") !== -1) {
+		return results;
-		var operand = operator.operand.toLowerCase();
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(-operand.length) !== operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(-operand.length) === operand) {
-					results.push(title);
-				}
-			});
-		}
-	} else {
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.substr(-operator.operand.length) !== operator.operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.substr(-operator.operand.length) === operator.operand) {
-					results.push(title);
-				}
-			});
-		}
 	}
+
+	const caseInsensitive = suffixes.indexOf("caseinsensitive") !== -1,
+		negate = operator.prefix === "!",
+		operand = caseInsensitive ? operator.operand.toLowerCase() : operator.operand;
+
+	source((tiddler,title) => {
+		const value = caseInsensitive ? title.toLowerCase() : title,
+			matches = value.endsWith(operand);
+		if(negate ? !matches : matches) {
+			results.push(title);
+		}
+	});
+
 	return results;
 };

core/modules/filters/tag.js

@@ -22,12 +22,11 @@ exports.tag = function(source,operator,options) {
 		});
 	} else {
 		// Old semantics:
-		var tiddlers;
 		if(operator.prefix === "!") {
 			// Returns a copy of the input if operator.operand is missing
-			tiddlers = options.wiki.getTiddlersWithTag(operator.operand);
+			const excludeTagSet = new Set(options.wiki.getTiddlersWithTag(operator.operand));
 			source(function(tiddler,title) {
-				if(tiddlers.indexOf(title) === -1) {
+				if(!excludeTagSet.has(title)) {
 					results.push(title);
 				}
 			});
@@ -39,9 +38,9 @@ exports.tag = function(source,operator,options) {
 					return indexedResults;
 				}
 			} else {
-				tiddlers = options.wiki.getTiddlersWithTag(operator.operand);
+				const includeTagSet = new Set(options.wiki.getTiddlersWithTag(operator.operand));
 				source(function(tiddler,title) {
-					if(tiddlers.indexOf(title) !== -1) {
+					if(includeTagSet.has(title)) {
 						results.push(title);
 					}
 				});

core/modules/filters/variables.js

@@ -24,4 +24,4 @@ exports.variables = function(source,operator,options) {
 		}
 	}
 	return names.sort();
-};
+};

core/modules/filters/x-listops.js

@@ -7,224 +7,213 @@ Extended filter operators to manipulate the current list.
 
 \*/
 
-	"use strict";
+"use strict";
 
-	/*
+/*
 	Fetch titles from the current list
-	*/
+*/
-	var prepare_results = function (source) {
+const prepare_results = (source) => {
-	var results = [];
+	const results = [];
-		source(function (tiddler, title) {
+	source((tiddler,title) => results.push(title));
-			results.push(title);
+	return results;
-		});
+};
-		return results;
-	};
 
-	/*
+/*
 	Moves a number of items from the tail of the current list before the item named in the operand
-	*/
+*/
-	exports.putbefore = function (source, operator) {
+exports.putbefore = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand),
+		index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
+		count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
+	return (index === -1) ?
-			results.slice(0, -1) :
+		results.slice(0, -1) :
-			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
+		results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
-	};
+};
 
-	/*
+/*
 	Moves a number of items from the tail of the current list after the item named in the operand
-	*/
+*/
-	exports.putafter = function (source, operator) {
+exports.putafter = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand),
+		index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
+		count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
+	return (index === -1) ?
-			results.slice(0, -1) :
+		results.slice(0, -1) :
-			results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+		results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-	};
+};
 
-	/*
+/*
 	Replaces the item named in the operand with a number of items from the tail of the current list
-	*/
+*/
-	exports.replace = function (source, operator) {
+exports.replace = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand),
+		index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1);
+		count = $tw.utils.getInt(operator.suffix,1);
-		return (index === -1) ?
+	return (index === -1) ?
-			results.slice(0, -count) :
+		results.slice(0, -count) :
-			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+		results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-	};
+};
 
-	/*
+/*
 	Moves a number of items from the tail of the current list to the head of the list
-	*/
+*/
-	exports.putfirst = function (source, operator) {
+exports.putfirst = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,1);
+		count = $tw.utils.getInt(operator.suffix,1);
-		return results.slice(-count).concat(results.slice(0, -count));
+	return [...results.slice(-count), ...results.slice(0, -count)];
-	};
+};
 
-	/*
+/*
 	Moves a number of items from the head of the current list to the tail of the list
-	*/
+*/
-	exports.putlast = function (source, operator) {
+exports.putlast = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,1);
+		count = $tw.utils.getInt(operator.suffix,1);
-		return results.slice(count).concat(results.slice(0, count));
+	return [...results.slice(count), ...results.slice(0, count)];
-	};
+};
 
-	/*
+/*
 	Moves the item named in the operand a number of places forward or backward in the list
-	*/
+*/
-	exports.move = function (source, operator) {
+exports.move = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand),
+		index = results.indexOf(operator.operand),
-			count = $tw.utils.getInt(operator.suffix,1),
+		count = $tw.utils.getInt(operator.suffix,1),
-			marker = results.splice(index, 1),
+		marker = results.splice(index, 1),
-			offset =  (index + count) > 0 ? index + count : 0;
+		offset = (index + count) > 0 ? index + count : 0;
-		return results.slice(0, offset).concat(marker).concat(results.slice(offset));
+	return results.slice(0, offset).concat(marker).concat(results.slice(offset));
-	};
+};
 
-	/*
+/*
 	Returns the items from the current list that are after the item named in the operand
-	*/
+*/
-	exports.allafter = function (source, operator) {
+exports.allafter = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand);
+		index = results.indexOf(operator.operand);
-		return (index === -1) ? [] :
+	return (index === -1) ? [] :
-			(operator.suffix) ? results.slice(index) :
+		(operator.suffix) ? results.slice(index) :
 			results.slice(index + 1);
-	};
+};
 
-	/*
+/*
 	Returns the items from the current list that are before the item named in the operand
-	*/
+*/
-	exports.allbefore = function (source, operator) {
+exports.allbefore = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			index = results.indexOf(operator.operand);
+		index = results.indexOf(operator.operand);
-		return (index === -1) ? [] :
+	return (index === -1) ? [] :
-			(operator.suffix) ? results.slice(0, index + 1) :
+		(operator.suffix) ? results.slice(0, index + 1) :
 			results.slice(0, index);
-	};
+};
 
-	/*
+/*
 	Appends the items listed in the operand array to the tail of the current list
-	*/
+*/
-	exports.append = function (source, operator) {
+exports.append = function(source,operator) {
-		var append = $tw.utils.parseStringArray(operator.operand, "true"),
+	const append = $tw.utils.parseStringArray(operator.operand,"true"),
-			results = prepare_results(source),
+		results = prepare_results(source),
-			count = parseInt(operator.suffix) || append.length;
+		count = parseInt(operator.suffix) || append.length;
-		return (append.length === 0) ? results :
+	return (append.length === 0) ? results :
-			(operator.prefix) ? results.concat(append.slice(-count)) :
+		(operator.prefix) ? results.concat(append.slice(-count)) :
 			results.concat(append.slice(0, count));
-	};
+};
 
-	/*
+/*
 	Prepends the items listed in the operand array to the head of the current list
-	*/
+*/
-	exports.prepend = function (source, operator) {
+exports.prepend = function(source,operator) {
-		var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
+	const prepend = $tw.utils.parseStringArray(operator.operand,"true"),
-			results = prepare_results(source),
+		results = prepare_results(source),
-			count = $tw.utils.getInt(operator.suffix,prepend.length);
+		count = $tw.utils.getInt(operator.suffix,prepend.length);
-		return (prepend.length === 0) ? results :
+	return (prepend.length === 0) ? results :
-			(operator.prefix) ? prepend.slice(-count).concat(results) :
+		(operator.prefix) ? prepend.slice(-count).concat(results) :
 			prepend.slice(0, count).concat(results);
-	};
+};
 
-	/*
+/*
 	Returns all items from the current list except the items listed in the operand array
-	*/
+*/
-	exports.remove = function (source, operator) {
+exports.remove = function(source, operator) {
-		var array = $tw.utils.parseStringArray(operator.operand, "true"),
+	const array = $tw.utils.parseStringArray(operator.operand, "true"),
-			results = prepare_results(source),
+		results = prepare_results(source);
-			count = parseInt(operator.suffix) || array.length,
-			p,
-			len,
-			index;
-		len = array.length - 1;
-		for (p = 0; p < count; ++p) {
-			if (operator.prefix) {
-				index = results.indexOf(array[len - p]);
-			} else {
-				index = results.indexOf(array[p]);
-			}
-			if (index !== -1) {
-				results.splice(index, 1);
-			}
-		}
-		return results;
-	};
 
-	/*
+	if(array.length === 0) {
+		return results;
+	}
+	const count = parseInt(operator.suffix, 10) || array.length,
+		targetItems = operator.prefix ? array.slice(-count).reverse() : array.slice(0, count);
+
+	for(const item of targetItems) {
+		const index = results.indexOf(item);
+		if(index !== -1) {
+			results.splice(index, 1);
+		}
+	}
+	return results;
+};
+
+/*
 	Returns all items from the current list sorted in the order of the items in the operand array
-	*/
+*/
-	exports.sortby = function (source, operator) {
+exports.sortby = function(source,operator) {
-		var results = prepare_results(source);
+	const results = prepare_results(source);
-		if (!results || results.length < 2) {
+	if(!results || results.length < 2) {
-			return results;
-		}
-		var lookup = $tw.utils.parseStringArray(operator.operand, "true");
-		results.sort(function (a, b) {
-			return lookup.indexOf(a) - lookup.indexOf(b);
-		});
 		return results;
-	};
+	}
+	const lookup = $tw.utils.parseStringArray(operator.operand,"true");
+	return results.sort((a,b) => lookup.indexOf(a) - lookup.indexOf(b));
+};
 
-	/*
+
+/*
 	Removes all duplicate items from the current list
-	*/
+*/
-	exports.unique = function (source, operator) {
+exports.unique = function(source, operator) {
-		var results = prepare_results(source);
+	return Array.from(new Set(prepare_results(source)));
-		var set = results.reduce(function (a, b) {
+};
-			if (a.indexOf(b) < 0) {
-				a.push(b);
-			}
-			return a;
-		}, []);
-		return set;
-	};
 
-	var cycleValueInArray = function(results,operands,stepSize) {
+const cycleValueInArray = function(results,operands,stepSize) {
-		var resultsIndex,
+	let resultsIndex,
-			step = stepSize || 1,
+		step = stepSize || 1,
-			i = 0,
+		i = 0,
-			opLength = operands.length,
+		nextOperandIndex;
-			nextOperandIndex;
+	const opLength = operands.length;
-		for(i; i < opLength; i++) {
+
-			resultsIndex = results.indexOf(operands[i]);
+	for(; i < opLength; i++) {
-			if(resultsIndex !== -1) {
+		resultsIndex = results.indexOf(operands[i]);
-				break;
-			}
-		}
 		if(resultsIndex !== -1) {
-			i = i + step;
+			break;
-			nextOperandIndex = (i < opLength ? i : i % opLength);
+		}
-			if(operands.length > 1) {
+	}
-				results.splice(resultsIndex,1,operands[nextOperandIndex]);
+	if(resultsIndex !== -1) {
-			} else {
+		i = i + step;
-				results.splice(resultsIndex,1);
+		nextOperandIndex = (i < opLength ? i : i % opLength);
-			}
+		if(operands.length > 1) {
+			results.splice(resultsIndex,1,operands[nextOperandIndex]);
 		} else {
-			results.push(operands[0]);
+			results.splice(resultsIndex,1);
 		}
-		return results;
+	} else {
+		results.push(operands[0]);
 	}
+	return results;
+};
 
-	/*
+/*
 	Toggles an item in the current list.
-	*/
+*/
-	exports.toggle = function(source,operator) {
+exports.toggle = function(source,operator) {
-		return cycleValueInArray(prepare_results(source),operator.operands);
+	return cycleValueInArray(prepare_results(source),operator.operands);
-	}
+};
 
-	exports.cycle = function(source,operator) {
+exports.cycle = function(source,operator) {
-		var results = prepare_results(source),
+	const results = prepare_results(source),
-			operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
+		operands = operator.operand.length ? $tw.utils.parseStringArray(operator.operand,"true") : [""];
-			step = $tw.utils.getInt(operator.operands[1]||"",1);
+	let step = $tw.utils.getInt(operator.operands[1] || "",1);
-		if(step < 0) {
+
-			operands.reverse();
+	if(step < 0) {
-			step = Math.abs(step);
+		operands.reverse();
-		}
+		step = Math.abs(step);
-		return cycleValueInArray(results,operands,step);
 	}
+	return cycleValueInArray(results,operands,step);
+};

core/modules/indexers/back-indexer.js

@@ -46,7 +46,7 @@ function BackSubIndexer(indexer,extractor) {
 BackSubIndexer.prototype.init = function() {
 	// lazy init until first lookup
 	this.index = null;
-}
+};
 
 BackSubIndexer.prototype._init = function() {
 	this.index = Object.create(null);
@@ -60,11 +60,11 @@ BackSubIndexer.prototype._init = function() {
 			self.index[target][sourceTitle] = true;
 		});
 	});
-}
+};
 
 BackSubIndexer.prototype.rebuild = function() {
 	this.index = null;
-}
+};
 
 /*
 * Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
@@ -78,7 +78,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
 	}
 	return [];
-}
+};
 
 BackSubIndexer.prototype.update = function(updateDescriptor) {
 	// lazy init/update until first lookup
@@ -86,12 +86,13 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
 		return;
 	}
 	var newTargets = [],
-	    oldTargets = [],
+		oldTargets = [],
-	    self = this;
+		self = this;
-	if(updateDescriptor.old.exists) {
+	// System tiddlers are never indexed as sources, matching the _init() scan
+	if(updateDescriptor.old.exists && !this.wiki.isSystemTiddler(updateDescriptor.old.tiddler.fields.title)) {
 		oldTargets = this._getTarget(updateDescriptor.old.tiddler);
 	}
-	if(updateDescriptor.new.exists) {
+	if(updateDescriptor.new.exists && !this.wiki.isSystemTiddler(updateDescriptor.new.tiddler.fields.title)) {
 		newTargets = this._getTarget(updateDescriptor.new.tiddler);
 	}
 
@@ -106,7 +107,7 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
 		}
 		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
 	});
-}
+};
 
 BackSubIndexer.prototype.lookup = function(title) {
 	if(!this.index) {
@@ -117,6 +118,6 @@ BackSubIndexer.prototype.lookup = function(title) {
 	} else {
 		return [];
 	}
-}
+};
 
 exports.BackIndexer = BackIndexer;

core/modules/indexers/field-indexer.js

@@ -19,7 +19,7 @@ FieldIndexer.prototype.init = function() {
 	this.index = null;
 	this.maxIndexedValueLength = DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH;
 	this.addIndexMethods();
-}
+};
 
 // Provided for testing
 FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
@@ -33,14 +33,14 @@ FieldIndexer.prototype.addIndexMethods = function() {
 	this.wiki.each.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.tiddlerExists(title)
+			return self.wiki.tiddlerExists(title);
 		});
 	};
 	// get shadow tiddlers, including shadow tiddlers that is overwritten
 	this.wiki.eachShadow.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.isShadowTiddler(title)
+			return self.wiki.isShadowTiddler(title);
 		});
 	};
 	this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

core/modules/info/dimensions.js

@@ -14,12 +14,12 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
 			this.updateCallback = updateCallback;
 			this.resizeHandlers = new Map();
 			this.dimensionsInfo = [
-				["outer/width", win => win.outerWidth],
+				["outer/width", (win) => win.outerWidth],
-				["outer/height", win => win.outerHeight],
+				["outer/height", (win) => win.outerHeight],
-				["inner/width", win => win.innerWidth],
+				["inner/width", (win) => win.innerWidth],
-				["inner/height", win => win.innerHeight],
+				["inner/height", (win) => win.innerHeight],
-				["client/width", win => win.document.documentElement.clientWidth],
+				["client/width", (win) => win.document.documentElement.clientWidth],
-				["client/height", win => win.document.documentElement.clientHeight]
+				["client/height", (win) => win.document.documentElement.clientHeight]
 			];
 		}
 

core/modules/keyboard.js

@@ -140,7 +140,7 @@ function KeyboardManager(options) {
 	this.shortcutParsedList = []; // Stores the parsed key descriptors
 	this.shortcutPriorityList = []; // Stores the parsed shortcut priority
 	this.lookupNames = ["shortcuts"];
-	this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac")
+	this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac");
 	this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
 	this.lookupNames.push($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux");
 	this.updateShortcutLists(this.getShortcutTiddlerList());
@@ -161,7 +161,7 @@ KeyboardManager.prototype.getModifierKeys = function() {
 		91, // Meta (left)
 		93, // Meta (right)
 		224 // Meta (Firefox)
-	]
+	];
 };
 
 /*
@@ -187,8 +187,7 @@ KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor,options) {
 			metaKey: false
 		};
 	for(var t=0; t<components.length; t++) {
-		var s = components[t].toLowerCase(),
+		var s = components[t].toLowerCase();
-			c = s.charCodeAt(0);
 		// Look for modifier keys
 		if(s === "ctrl") {
 			info.ctrlKey = true;
@@ -266,7 +265,7 @@ KeyboardManager.prototype.getPrintableShortcuts = function(keyInfoArray) {
 		}
 	});
 	return result;
-}
+};
 
 KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
 	return keyInfo &&
@@ -293,15 +292,15 @@ KeyboardManager.prototype.getMatchingKeyDescriptor = function(event,keyInfoArray
 KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
 	return event.ctrlKey && !event.shiftKey	&& !event.altKey && !event.metaKey ? "ctrl" : 
 		event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" : 
-		event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : 
+			event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : 
-		event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : 
+				event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : 
-		event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : 
+					event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : 
-		event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : 
+						event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : 
-		event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : 
+							event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : 
-		event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : 
+								event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : 
-		event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
+									event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
-		event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
+										event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
-		event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
+											event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
 };
 
 KeyboardManager.prototype.getShortcutTiddlerList = function() {
@@ -371,8 +370,8 @@ KeyboardManager.prototype.handleShortcutChanges = function(changedTiddlers) {
 	var newList = this.getShortcutTiddlerList();
 	var hasChanged = $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) ? true :
 		($tw.utils.hopArray(changedTiddlers,newList) ? true :
-		(this.detectNewShortcuts(changedTiddlers))
+			(this.detectNewShortcuts(changedTiddlers))
-	);
+		);
 	// Re-cache shortcuts if something changed
 	if(hasChanged) {
 		this.updateShortcutLists(newList);

core/modules/macros/contrastcolour.js

@@ -26,25 +26,26 @@ exports.params = [
 Run the macro
 */
 exports.run = function(target,fallbackTarget,colourA,colourB) {
-	var rgbTarget = $tw.utils.parseCSSColor(target) || $tw.utils.parseCSSColor(fallbackTarget);
+	var rgbTarget = $tw.utils.parseCSSColorObject(target) || $tw.utils.parseCSSColorObject(fallbackTarget);
 	if(!rgbTarget) {
 		return colourA;
 	}
-	var rgbColourA = $tw.utils.parseCSSColor(colourA),
+	var rgbColourA = $tw.utils.parseCSSColorObject(colourA),
-		rgbColourB = $tw.utils.parseCSSColor(colourB);
+		rgbColourB = $tw.utils.parseCSSColorObject(colourB);
 	if(rgbColourA && !rgbColourB) {
-		return rgbColourA;
+		return colourA;
 	}
 	if(rgbColourB && !rgbColourA) {
-		return rgbColourB;
+		return colourB;
 	}
 	if(!rgbColourA && !rgbColourB) {
 		// If neither colour is readable, return a crude inverse of the target
-		return [255 - rgbTarget[0],255 - rgbTarget[1],255 - rgbTarget[2],rgbTarget[3]];
+		rgbTarget.srgb.r = 1 - rgbTarget.srgb.r;
+		rgbTarget.srgb.g = 1 - rgbTarget.srgb.g;
+		rgbTarget.srgb.b = 1 - rgbTarget.srgb.b;
+		return rgbTarget.display();
 	}
-	// Colour brightness formula derived from http://www.w3.org/WAI/ER/WD-AERT/#color-contrast
+	var aContrast = rgbColourA.contrast(rgbTarget,"DeltaPhi"),
-	var brightnessTarget = rgbTarget[0] * 0.299 + rgbTarget[1] * 0.587 + rgbTarget[2] * 0.114,
+		bContrast = rgbColourB.contrast(rgbTarget,"DeltaPhi");
-		brightnessA = rgbColourA[0] * 0.299 + rgbColourA[1] * 0.587 + rgbColourA[2] * 0.114,
+	return aContrast > bContrast ? colourA : colourB;
-		brightnessB = rgbColourB[0] * 0.299 + rgbColourB[1] * 0.587 + rgbColourB[2] * 0.114;
-	return Math.abs(brightnessTarget - brightnessA) > Math.abs(brightnessTarget - brightnessB) ? colourA : colourB;
 };

core/modules/macros/csvtiddlers.js

@@ -24,8 +24,7 @@ exports.params = [
 Run the macro
 */
 exports.run = function(filter,format) {
-	var self = this,
+	var tiddlers = this.wiki.filterTiddlers(filter),
-		tiddlers = this.wiki.filterTiddlers(filter),
 		tiddler,
 		fields = [],
 		t,f;
@@ -46,24 +45,24 @@ exports.run = function(filter,format) {
 		var p = fields.indexOf(value);
 		if(p !== -1) {
 			fields.splice(p,1);
-			fields.unshift(value)
+			fields.unshift(value);
 		}
 	});
 	// Output the column headings
 	var output = [], row = [];
 	fields.forEach(function(value) {
-		row.push(quoteAndEscape(value))
+		row.push(quoteAndEscape(value));
 	});
 	output.push(row.join(","));
 	// Output each tiddler
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			if(tiddler) {
+		if(tiddler) {
-				for(f=0; f<fields.length; f++) {
+			for(f=0; f<fields.length; f++) {
-					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-				}	
+			}	
-			}
+		}
 		output.push(row.join(","));
 	}
 	return output.join("\n");

core/modules/macros/displayshortcuts.js

@@ -31,8 +31,8 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
 	}));
 	if(shortcutArray.length > 0) {
 		shortcutArray.sort(function(a,b) {
-		    return a.toLowerCase().localeCompare(b.toLowerCase());
+			return a.toLowerCase().localeCompare(b.toLowerCase());
-		})
+		});
 		return prefix + shortcutArray.join(separator) + suffix;
 	} else {
 		return "";

core/modules/parsers/audioparser.js

@@ -7,19 +7,17 @@ The audio parser parses an audio tiddler into an embeddable HTML element
 
 \*/
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var AudioParser = function(type,text,options) {
 	var element = {
-			type: "element",
+		type: "element",
-			tag: "$audio", // Using $audio to enable widget interception
+		tag: "$audio", // Using $audio to enable widget interception
-			attributes: {
+		attributes: {
-				controls: {type: "string", value: "controls"},
+			controls: {type: "string", value: "controls"},
-				style: {type: "string", value: "width: 100%; object-fit: contain"}
+			style: {type: "string", value: "width: 100%; object-fit: contain"}
-			}
+		}
-		};
+	};
 		
 	// Pass through source information
 	if(options._canonical_uri) {

core/modules/parsers/binaryparser.js

@@ -59,7 +59,7 @@ var BinaryParser = function(type,text,options) {
 			class: {type: "string", value: "tc-binary-warning"}
 		},
 		children: [warn, link]
-	}
+	};
 	this.tree = [element];
 	this.source = text;
 	this.type = type;

core/modules/parsers/csvparser.js

@@ -45,7 +45,7 @@ var CsvParser = function(type,text,options) {
 			row.children.push({
 				"type": "element", "tag": tag, "children": [{
 					"type": "text",
-					"text": columns[column] || ''
+					"text": columns[column] || ""
 				}]
 			});
 		}

core/modules/parsers/parseutils.js

@@ -45,7 +45,7 @@ exports.parseWhiteSpace = function(source,pos) {
 			type: "whitespace",
 			start: pos,
 			end: p
-		}
+		};
 	}
 };
 
@@ -107,7 +107,7 @@ exports.parseStringLiteral = function(source,pos) {
 		type: "string",
 		start: pos
 	};
-	var reString = /(?:"""([\s\S]*?)"""|"([^"]*)")|(?:'([^']*)')|\[\[((?:[^\]]|\](?!\]))*)\]\]/g;
+	var reString = /(?:"""([\s\S]*?)"""|"([^"]*)")|(?:'([^']*)')|\[\[((?:[^\]]|\](?!\]))*)\]\]/y;
 	reString.lastIndex = pos;
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
@@ -170,7 +170,7 @@ exports.parseMacroParameters = function(node,source,pos) {
 	}
 	node.end = pos;
 	return node;
-}
+};
 
 /*
 Look for a macro invocation parameter. Returns null if not found, or {type: "macro-parameter", name:, value:, start:, end:}
@@ -192,16 +192,16 @@ exports.parseMacroParameter = function(source,pos) {
 	pos = token.end;
 	// Get the parameter details
 	node.value = token.match[2] !== undefined ? token.match[2] : (
-					token.match[3] !== undefined ? token.match[3] : (
+		token.match[3] !== undefined ? token.match[3] : (
-						token.match[4] !== undefined ? token.match[4] : (
+			token.match[4] !== undefined ? token.match[4] : (
-							token.match[5] !== undefined ? token.match[5] : (
+				token.match[5] !== undefined ? token.match[5] : (
-								token.match[6] !== undefined ? token.match[6] : (
+					token.match[6] !== undefined ? token.match[6] : (
-									""
+						""
-								)
-							)
-						)
 					)
-				);
+				)
+			)
+		)
+	);
 	if(token.match[1]) {
 		node.name = token.match[1];
 	}
@@ -221,7 +221,7 @@ exports.parseMacroInvocationAsTransclusion = function(source,pos) {
 		orderedAttributes: []
 	};
 	// Define our regexps
-	var reVarName = /([^\s>"'=:]+)/g;
+	var reVarName = /([^\s>"'=:]+)/y;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Look for a double opening angle bracket
@@ -237,9 +237,11 @@ exports.parseMacroInvocationAsTransclusion = function(source,pos) {
 	}
 	$tw.utils.addAttributeToParseTreeNode(node,"$variable",token.match[1]);
 	pos = token.end;
-	// Check that the tag is terminated by a space or >>
+	// Check that the tag is terminated by a space or >>, and that there is a closing >> somewhere ahead
-	if(!$tw.utils.parseWhiteSpace(source,pos) && !(source.charAt(pos) === ">" && source.charAt(pos + 1) === ">") ) {
+	if(!(source.charAt(pos) === ">" && source.charAt(pos + 1) === ">") ) {
-		return null;
+		if(source.indexOf(">>",pos) === -1) {
+			return null;
+		}
 	}
 	// Process attributes
 	pos = $tw.utils.parseMacroParametersAsAttributes(node,source,pos);
@@ -267,7 +269,7 @@ exports.parseMVVReferenceAsTransclusion = function(source,pos) {
 		orderedAttributes: []
 	};
 	// Define our regexps
-	var reVarName = /([^\s>"'=:)]+)/g;
+	var reVarName = /([^\s>"'=:)]+)/y;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Look for a double opening parenthesis
@@ -323,18 +325,24 @@ exports.parseMacroParameterAsAttribute = function(source,pos) {
 		start: pos
 	};
 	// Define our regexps
-	var reAttributeName = /([^\/\s>"'`=:]+)/g,
+	var reAttributeName = /([^\/\s>"'`=:]+)/y,
-		reUnquotedAttribute = /((?:(?:>(?!>))|[^\s>"'])+)/g,
+		reStrictIdentifier = /^[A-Za-z0-9\-_]+$/,
-		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/g,
+		reUnquotedAttribute = /(?!<<)((?:(?:>(?!>))|[^\s>"'])+)/y,
-		reIndirectValue = /\{\{([^\}]+)\}\}/g,
+		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/y,
-		reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/g;
+		reIndirectValue = /\{\{([^\}]+)\}\}/y,
+		reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/y;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Get the attribute name and the separator token
 	var nameToken = $tw.utils.parseTokenRegExp(source,pos,reAttributeName),
 		namePos = nameToken && $tw.utils.skipWhiteSpace(source,nameToken.end),
-		separatorToken = nameToken && $tw.utils.parseTokenRegExp(source,namePos,/=|:/g),
+		separatorToken = nameToken && $tw.utils.parseTokenRegExp(source,namePos,/=|:/y),
 		isNewStyleSeparator = false; // If there is no separator then we don't allow new style values
+	// Colon separator requires a strict identifier name to avoid mis-parsing values like $:/foo
+	if(nameToken && separatorToken && separatorToken.match[0] === ":" && !reStrictIdentifier.test(nameToken.match[1])) {
+		nameToken = null;
+		separatorToken = null;
+	}
 	// If we have a name and a separator then we have a named attribute
 	if(nameToken && separatorToken) {
 		node.name = nameToken.match[1];
@@ -345,64 +353,78 @@ exports.parseMacroParameterAsAttribute = function(source,pos) {
 	}
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
-	// Look for a string literal
+
-	var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
+	do {
-	if(stringLiteral) {
+		// Look for a string literal
-		pos = stringLiteral.end;
+		var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
-		node.type = "string";
+		if(stringLiteral) {
-		node.value = stringLiteral.value;
+			pos = stringLiteral.end;
-		// Mark the value as having been quoted in the source
+			node.type = "string";
-		node.quoted = true;
+			node.value = stringLiteral.value;
-	} else {
+			// Mark the value as having been quoted in the source
-		// Look for a filtered value
+			node.quoted = true;
-		var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue);
+			break;
-		if(filteredValue && isNewStyleSeparator) {
+		}
-			pos = filteredValue.end;
+
-			node.type = "filtered";
+		if(isNewStyleSeparator) {
-			node.filter = filteredValue.match[1];
+			// Look for a filtered value
-		} else {
+			var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue);
+			if(filteredValue) {
+				pos = filteredValue.end;
+				node.type = "filtered";
+				node.filter = filteredValue.match[1];
+				break;
+			}
+
 			// Look for an indirect value
 			var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
-			if(indirectValue && isNewStyleSeparator) {
+			if(indirectValue) {
 				pos = indirectValue.end;
 				node.type = "indirect";
 				node.textReference = indirectValue.match[1];
-			} else {
+				break;
-				// Look for a macro invocation value
+			}
-				var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
+
-				if(macroInvocation && isNewStyleSeparator) {
+			// Look for a macro invocation value
-					pos = macroInvocation.end;
+			var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
-					node.type = "macro";
+			if(macroInvocation) {
-					node.value = macroInvocation;
+				pos = macroInvocation.end;
-				} else {
+				node.type = "macro";
-					// Look for an MVV reference value
+				node.value = macroInvocation;
-					var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
+				break;
-					if(mvvReference && isNewStyleSeparator) {
+			}
-						pos = mvvReference.end;
+
-						node.type = "macro";
+			// Look for an MVV reference value
-						node.value = mvvReference;
+			var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
-						node.isMVV = true;
+			if(mvvReference) {
-					} else {
+				pos = mvvReference.end;
-						var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
+				node.type = "macro";
-						if(substitutedValue && isNewStyleSeparator) {
+				node.value = mvvReference;
-							pos = substitutedValue.end;
+				node.isMVV = true;
-							node.type = "substituted";
+				break;
-							node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
+			}
-						} else {
+
-							// Look for a unquoted value
+			// Look for a substituted value
-							var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
+			var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
-							if(unquotedValue) {
+			if(substitutedValue) {
-								pos = unquotedValue.end;
+				pos = substitutedValue.end;
-								node.type = "string";
+				node.type = "substituted";
-								node.value = unquotedValue.match[1];
+				node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
-							} else {
+				break;
-							}
-						}
-					}
-				}
 			}
 		}
-	}
+
+		// Look for a unquoted value
+		var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
+		if(unquotedValue) {
+			pos = unquotedValue.end;
+			node.type = "string";
+			node.value = unquotedValue.match[1];
+			break; // redundant, but leaving for consistency
+		}
+
+	} while(false);
+
 	// Bail if we don't have a value
 	if(!node.type) {
 		return null;
@@ -506,64 +528,79 @@ exports.parseAttribute = function(source,pos) {
 		pos = token.end;
 		// Skip whitespace
 		pos = $tw.utils.skipWhiteSpace(source,pos);
-		// Look for a string literal
+		do {
-		var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
+			// Look for a string literal
-		if(stringLiteral) {
+			var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
-			pos = stringLiteral.end;
+			if(stringLiteral) {
-			node.type = "string";
+				pos = stringLiteral.end;
-			node.value = stringLiteral.value;
+				node.type = "string";
-		} else {
+				node.value = stringLiteral.value;
+				break;
+			}
+
 			// Look for a filtered value
 			var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue);
 			if(filteredValue) {
 				pos = filteredValue.end;
 				node.type = "filtered";
 				node.filter = filteredValue.match[1];
-			} else {
+				break;
-				// Look for an indirect value
-				var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
-				if(indirectValue) {
-					pos = indirectValue.end;
-					node.type = "indirect";
-					node.textReference = indirectValue.match[1];
-				} else {
-					// Look for a macro invocation value
-					var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
-					if(macroInvocation) {
-						pos = macroInvocation.end;
-						node.type = "macro";
-						node.value = macroInvocation;
-					} else {
-						// Look for an MVV reference value
-						var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
-						if(mvvReference) {
-							pos = mvvReference.end;
-							node.type = "macro";
-							node.value = mvvReference;
-							node.isMVV = true;
-						} else {
-							var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
-							if(substitutedValue) {
-								pos = substitutedValue.end;
-								node.type = "substituted";
-								node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
-							} else {
-								// Look for a unquoted value
-								var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
-								if(unquotedValue) {
-									pos = unquotedValue.end;
-									node.type = "string";
-									node.value = unquotedValue.match[1];
-								} else {
-									node.type = "string";
-									node.value = "true";
-								}
-							}
-						}
-					}
-				}
 			}
-		}
+
+			// Look for an indirect value
+			var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
+			if(indirectValue) {
+				pos = indirectValue.end;
+				node.type = "indirect";
+				node.textReference = indirectValue.match[1];
+				break;
+			}
+
+			// Look for a macro invocation value
+			var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
+			if(macroInvocation) {
+				pos = macroInvocation.end;
+				node.type = "macro";
+				node.value = macroInvocation;
+				break;
+			}
+
+			// Look for an MVV reference value
+			var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
+			if(mvvReference) {
+				pos = mvvReference.end;
+				node.type = "macro";
+				node.value = mvvReference;
+				node.isMVV = true;
+				break;
+			}
+
+			// Look for a substituted value
+			var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
+			if(substitutedValue) {
+				pos = substitutedValue.end;
+				node.type = "substituted";
+				node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
+				break;
+			}
+
+			// Look for a unquoted value
+			var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
+			if(unquotedValue) {
+				pos = unquotedValue.end;
+				node.type = "string";
+				node.value = unquotedValue.match[1];
+				break;
+			}
+
+			if(source.charAt(pos) === "<" && source.charAt(pos + 1) === "<" && source.indexOf(">>",pos) !== -1) {
+				// Value looks like a macro invocation (starts with << with a closing >> ahead) but does not parse as one. Return null so the enclosing tag fails to parse rather than silently binding the attribute to "true" and treating the remainder as further attributes (restores v5.3.8 behaviour)
+				return null;
+			}
+
+			node.type = "string";
+			node.value = "true";
+		} while(false);
 	} else {
 		// If there is no equals sign or colon, then this is an attribute with no value, defaulting to "true"
 		node.type = "string";

core/modules/parsers/pdfparser.js

@@ -11,11 +11,10 @@ The PDF parser embeds a PDF viewer
 
 var ImageParser = function(type,text,options) {
 	var element = {
-			type: "element",
+		type: "element",
-			tag: "iframe",
+		tag: "iframe",
-			attributes: {}
+		attributes: {}
-		},
+	};
-		src;
 	if(options._canonical_uri) {
 		element.attributes.src = {type: "string", value: options._canonical_uri};
 	} else if(text) {

core/modules/parsers/videoparser.js

@@ -11,14 +11,13 @@ The video parser parses a video tiddler into an embeddable HTML element
 
 var VideoParser = function(type,text,options) {
 	var element = {
-			type: "element",
+		type: "element",
-			tag: "video",
+		tag: "video",
-			attributes: {
+		attributes: {
-				controls: {type: "string", value: "controls"},
+			controls: {type: "string", value: "controls"},
-				style: {type: "string", value: "width: 100%; object-fit: contain"}
+			style: {type: "string", value: "width: 100%; object-fit: contain"}
-			}
+		}
-		},
+	};
-		src;
 	if(options._canonical_uri) {
 		element.attributes.src = {type: "string", value: options._canonical_uri};
 	} else if(text) {

core/modules/parsers/wikiparser/rules/codeblock.js

@@ -25,7 +25,7 @@ exports.init = function(parser) {
 };
 
 exports.parse = function() {
-	var reEnd = /(\r?\n```$)/mg;
+	var reEnd = /(^|\r?\n)```$/mg;
 	var languageStart = this.parser.pos + 3,
 		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
@@ -46,10 +46,10 @@ exports.parse = function() {
 	}
 	// Return the $codeblock widget
 	return [{
-			type: "codeblock",
+		type: "codeblock",
-			attributes: {
+		attributes: {
-					code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
+			code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
-					language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
+			language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
-			}
+		}
 	}];
 };

core/modules/parsers/wikiparser/rules/codeinline.js

@@ -31,13 +31,16 @@ exports.parse = function() {
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
 		text,
-		start = this.parser.pos;
+		start = this.parser.pos,
+		textEnd;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
+		textEnd = match.index;
 		this.parser.pos = match.index + match[0].length;
 	} else {
 		text = this.parser.source.substr(this.parser.pos);
+		textEnd = this.parser.sourceLength;
 		this.parser.pos = this.parser.sourceLength;
 	}
 	return [{
@@ -47,7 +50,7 @@ exports.parse = function() {
 			type: "text",
 			text: text,
 			start: start,
-			end: this.parser.pos
+			end: textEnd
 		}]
 	}];
 };

core/modules/parsers/wikiparser/rules/commentblock.js

@@ -51,10 +51,10 @@ exports.parse = function() {
 	var commentStart = this.match.index;
 	var commentEnd = this.endMatch.index + this.endMatch[0].length;
 	return [{
-			type: "void",
+		type: "void",
-			children: [],
+		children: [],
-			text: this.parser.source.slice(commentStart, commentEnd),
+		text: this.parser.source.slice(commentStart, commentEnd),
-			start: commentStart,
+		start: commentStart,
-			end: commentEnd
+		end: commentEnd
 	}];
 };