tiddlywiki 5.3.7 → 5.4.0

package/plugins/tiddlywiki/freelinks/text.js

@@ -1,33 +1,34 @@
 /*\
+
 title: $:/core/modules/widgets/text.js
 type: application/javascript
 module-type: widget
 
-An override of the core text widget that automatically linkifies the text
+Optimized override of the core text widget that automatically linkifies text.
+- Supports non-Latin languages like Chinese.
+- Global longest-match priority, then removes overlaps.
+- Excludes current tiddler title from linking.
+- Uses Aho-Corasick for performance.
 
 \*/
 
 "use strict";
 
 var TITLE_TARGET_FILTER = "$:/config/Freelinks/TargetFilter";
+var WORD_BOUNDARY_TIDDLER = "$:/config/Freelinks/WordBoundary";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget,
 	LinkWidget = require("$:/core/modules/widgets/link.js").link,
 	ButtonWidget = require("$:/core/modules/widgets/button.js").button,
-	ElementWidget = require("$:/core/modules/widgets/element.js").element;
+	ElementWidget = require("$:/core/modules/widgets/element.js").element,
+	AhoCorasick = require("$:/core/modules/utils/aho-corasick.js").AhoCorasick;
 
 var TextNodeWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
 };
 
-/*
-Inherit from the base widget class
-*/
 TextNodeWidget.prototype = new Widget();
 
-/*
-Render this widget into the DOM
-*/
 TextNodeWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
@@ -35,129 +36,244 @@ TextNodeWidget.prototype.render = function(parent,nextSibling) {
 	this.renderChildren(parent,nextSibling);
 };
 
-/*
-Compute the internal state of the widget
-*/
 TextNodeWidget.prototype.execute = function() {
-	var self = this,
-		ignoreCase = self.getVariable("tv-freelinks-ignore-case",{defaultValue:"no"}).trim() === "yes";
-	// Get our parameters
+	var self = this;
+	var ignoreCase = self.getVariable("tv-freelinks-ignore-case",{defaultValue:"no"}).trim() === "yes";
+
 	var childParseTree = [{
-			type: "plain-text",
-			text: this.getAttribute("text",this.parseTreeNode.text || "")
-		}];
-	// Only process links if not disabled and we're not within a button or link widget
-	if(this.getVariable("tv-wikilinks",{defaultValue:"yes"}).trim() !== "no" && this.getVariable("tv-freelinks",{defaultValue:"no"}).trim() === "yes" && !this.isWithinButtonOrLink()) {
-		// Get the information about the current tiddler titles, and construct a regexp
-		this.tiddlerTitleInfo = this.wiki.getGlobalCache("tiddler-title-info-" + (ignoreCase ? "insensitive" : "sensitive"),function() {
-			var targetFilterText = self.wiki.getTiddlerText(TITLE_TARGET_FILTER),
-				titles = !!targetFilterText ? self.wiki.filterTiddlers(targetFilterText,$tw.rootWidget) : self.wiki.allTitles(),
-				sortedTitles = titles.sort(function(a,b) {
-					var lenA = a.length,
-						lenB = b.length;
-					// First sort by length, so longer titles are first
-					if(lenA !== lenB) {
-						if(lenA < lenB) {
-							return +1;
-						} else {
-							return -1;
-						}
-					} else {
-					// Then sort alphabetically within titles of the same length
-						if(a < b) {
-							return -1;
-						} else if(a > b) {
-							return +1;
-						} else {
-							return 0;
-						}
-					}
-				}),
-				titles = [],
-				reparts = [];
-			$tw.utils.each(sortedTitles,function(title) {
-				if(title.substring(0,3) !== "$:/") {
-					titles.push(title);
-					reparts.push("(" + $tw.utils.escapeRegExp(title) + ")");
-				}
-			});
-			var regexpStr = "\\b(?:" + reparts.join("|") + ")\\b";
-			return {
-				titles: titles,
-				regexp: new RegExp(regexpStr,ignoreCase ? "i" : "")
-			};
+		type: "plain-text",
+		text: this.getAttribute("text",this.parseTreeNode.text || "")
+	}];
+
+	var text = childParseTree[0].text;
+	if(!text || text.length < 2) {
+		this.makeChildWidgets(childParseTree);
+		return;
+	}
+
+	if(this.getVariable("tv-wikilinks",{defaultValue:"yes"}) !== "no" &&
+		this.getVariable("tv-freelinks",{defaultValue:"no"}) === "yes" &&
+		!this.isWithinButtonOrLink()) {
+
+		var currentTiddlerTitle = this.getVariable("currentTiddler") || "";
+		var useWordBoundary = self.wiki.getTiddlerText(WORD_BOUNDARY_TIDDLER,"no") === "yes";
+
+		var cacheKey = "tiddler-title-info-" + (ignoreCase ? "insensitive" : "sensitive");
+		this.tiddlerTitleInfo = this.wiki.getGlobalCache(cacheKey,function() {
+			return computeTiddlerTitleInfo(self,ignoreCase);
 		});
-		// Repeatedly linkify
-		if(this.tiddlerTitleInfo.titles.length > 0) {
-			var index,text,match,matchEnd;
-			do {
-				index = childParseTree.length - 1;
-				text = childParseTree[index].text;
-				match = this.tiddlerTitleInfo.regexp.exec(text);
-				if(match) {
-					// Make a text node for any text before the match
-					if(match.index > 0) {
-						childParseTree[index].text = text.substring(0,match.index);
-						index += 1;
-					}
-					// Make a link node for the match
-					childParseTree[index] = {
-						type: "link",
-						attributes: {
-							to: {type: "string", value: ignoreCase ? this.tiddlerTitleInfo.titles[match.indexOf(match[0],1) - 1] : match[0]},
-							"class": {type: "string", value: "tc-freelink"}
-						},
-						children: [{
-							type: "plain-text", text: match[0]
-						}]
-					};
-					index += 1;
-					// Make a text node for any text after the match
-					matchEnd = match.index + match[0].length;
-					if(matchEnd < text.length) {
-						childParseTree[index] = {
-							type: "plain-text",
-							text: text.substring(matchEnd)
-						};					
-					}
-				}
-			} while(match && childParseTree[childParseTree.length - 1].type === "plain-text");			
+
+		if(this.tiddlerTitleInfo && this.tiddlerTitleInfo.titles && this.tiddlerTitleInfo.titles.length > 0 && this.tiddlerTitleInfo.ac) {
+			var newParseTree = this.processTextWithMatches(text,currentTiddlerTitle,ignoreCase,useWordBoundary);
+			if(newParseTree && newParseTree.length > 0 &&
+				(newParseTree.length > 1 || newParseTree[0].type !== "plain-text")) {
+				childParseTree = newParseTree;
+			}
 		}
 	}
-	// Make the child widgets
+
 	this.makeChildWidgets(childParseTree);
 };
 
+TextNodeWidget.prototype.processTextWithMatches = function(text,currentTiddlerTitle,ignoreCase,useWordBoundary) {
+	if(!text || text.length === 0) {
+		return [{type: "plain-text", text: text}];
+	}
+
+	var matches;
+	try {
+		matches = this.tiddlerTitleInfo.ac.search(text, useWordBoundary, ignoreCase);
+	} catch(e) {
+		return [{type: "plain-text", text: text}];
+	}
+
+	if(!matches || matches.length === 0) {
+		return [{type: "plain-text", text: text}];
+	}
+
+	var titleToCompare = ignoreCase ?
+		(currentTiddlerTitle ? currentTiddlerTitle.toLowerCase() : "") :
+		currentTiddlerTitle;
+
+	matches.sort(function(a,b) {
+		if(b.length !== a.length) return b.length - a.length;
+		return a.index - b.index;
+	});
+
+	var occupied = new Uint8Array(text.length);
+	var validMatches = [];
+
+	for(var i = 0; i < matches.length; i++) {
+		var m = matches[i];
+		var start = m.index;
+		var end = start + m.length;
+		if(start < 0 || end > text.length) continue;
+
+		var matchedTitle = this.tiddlerTitleInfo.titles[m.titleIndex];
+		if(!matchedTitle) continue;
+
+		var matchedTitleToCompare = ignoreCase ? matchedTitle.toLowerCase() : matchedTitle;
+		if(titleToCompare && matchedTitleToCompare === titleToCompare) continue;
+
+		var overlapping = false;
+		for(var j = start; j < end; j++) {
+			if(occupied[j]) { overlapping = true; break; }
+		}
+		if(overlapping) continue;
+
+		validMatches.push(m);
+		for(var k = start; k < end; k++) {
+			occupied[k] = 1;
+		}
+	}
+
+	if(validMatches.length === 0) {
+		return [{type: "plain-text", text: text}];
+	}
+
+	validMatches.sort(function(a,b){ return a.index - b.index; });
+
+	var newParseTree = [];
+	var curPos = 0;
+
+	for(var x = 0; x < validMatches.length; x++) {
+		var mm = validMatches[x];
+		var s = mm.index;
+		var e = s + mm.length;
+
+		if(s > curPos) {
+			newParseTree.push({ type: "plain-text", text: text.substring(curPos,s) });
+		}
+
+		var toTitle = this.tiddlerTitleInfo.titles[mm.titleIndex];
+		var matchedText = text.substring(s,e);
+
+		newParseTree.push({
+			type: "link",
+			attributes: {
+				to: {type: "string", value: toTitle},
+				"class": {type: "string", value: "tc-freelink"}
+			},
+			children: [{
+				type: "plain-text",
+				text: matchedText
+			}]
+		});
+
+		curPos = e;
+	}
+
+	if(curPos < text.length) {
+		newParseTree.push({ type: "plain-text", text: text.substring(curPos) });
+	}
+
+	return newParseTree;
+};
+
+function computeTiddlerTitleInfo(self,ignoreCase) {
+	var targetFilterText = self.wiki.getTiddlerText(TITLE_TARGET_FILTER),
+		titles = targetFilterText ?
+			self.wiki.filterTiddlers(targetFilterText,$tw.rootWidget) :
+			self.wiki.allTitles();
+
+	if(!titles || titles.length === 0) {
+		return { titles: [], ac: new AhoCorasick() };
+	}
+
+	var validTitles = [];
+	for(var i = 0; i < titles.length; i++) {
+		var t = titles[i];
+		if(t && t.length > 0 && t.substring(0,3) !== "$:/") {
+			validTitles.push(t);
+		}
+	}
+
+	validTitles.sort(function(a,b) {
+		var d = b.length - a.length;
+		if(d !== 0) return d;
+		return a < b ? -1 : a > b ? 1 : 0;
+	});
+
+	var ac = new AhoCorasick();
+	for(var j = 0; j < validTitles.length; j++) {
+		var title = validTitles[j];
+		var pattern = ignoreCase ? title.toLowerCase() : title;
+		ac.addPattern(pattern,j);
+	}
+
+	try {
+		ac.buildFailureLinks();
+	} catch(e) {
+		return { titles: [], ac: new AhoCorasick() };
+	}
+
+	return { titles: validTitles, ac: ac };
+}
+
 TextNodeWidget.prototype.isWithinButtonOrLink = function() {
-	var withinButtonOrLink = false,
-		widget = this.parentWidget;
-	while(!withinButtonOrLink && widget) {
-		withinButtonOrLink = widget instanceof ButtonWidget || widget instanceof LinkWidget || ((widget instanceof ElementWidget) && widget.parseTreeNode.tag === "a");
+	var widget = this.parentWidget;
+	while(widget) {
+		if(widget instanceof ButtonWidget ||
+			widget instanceof LinkWidget ||
+			((widget instanceof ElementWidget) && widget.parseTreeNode.tag === "a")) {
+			return true;
+		}
 		widget = widget.parentWidget;
 	}
-	return withinButtonOrLink;
+	return false;
 };
 
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
 TextNodeWidget.prototype.refresh = function(changedTiddlers) {
-	var self = this,
-		changedAttributes = this.computeAttributes(),
-		titlesHaveChanged = false;
-	$tw.utils.each(changedTiddlers,function(change,title) {
-		if(change.isDeleted) {
-			titlesHaveChanged = true;
-		} else {
-			titlesHaveChanged = titlesHaveChanged || !self.tiddlerTitleInfo || self.tiddlerTitleInfo.titles.indexOf(title) === -1;
+	var self = this;
+	var changedAttributes = this.computeAttributes();
+	var titlesHaveChanged = false;
+
+	if(changedTiddlers) {
+		$tw.utils.each(changedTiddlers,function(change,title) {
+			if(titlesHaveChanged) return;
+
+			if(title === WORD_BOUNDARY_TIDDLER || title === TITLE_TARGET_FILTER) {
+				titlesHaveChanged = true;
+				return;
+			}
+
+			if(title.substring(0,3) === "$:/") {
+				return;
+			}
+
+			if(change && change.isDeleted) {
+				if(self.tiddlerTitleInfo && self.tiddlerTitleInfo.titles && self.tiddlerTitleInfo.titles.indexOf(title) !== -1) {
+					titlesHaveChanged = true;
+				}
+				return;
+			}
+
+			var tiddler = self.wiki.getTiddler(title);
+			if(tiddler && tiddler.hasField("draft.of")) {
+				return;
+			}
+
+			if(!self.tiddlerTitleInfo || !self.tiddlerTitleInfo.titles || self.tiddlerTitleInfo.titles.indexOf(title) === -1) {
+				titlesHaveChanged = true;
+			}
+		});
+	}
+
+	var wordBoundaryChanged = !!(changedTiddlers && changedTiddlers[WORD_BOUNDARY_TIDDLER]);
+
+	if(changedAttributes.text || titlesHaveChanged || wordBoundaryChanged) {
+		if(titlesHaveChanged) {
+			self.wiki.clearCache("tiddler-title-info-insensitive");
+			self.wiki.clearCache("tiddler-title-info-sensitive");
 		}
-	});
-	if(changedAttributes.text || titlesHaveChanged) {
 		this.refreshSelf();
 		return true;
-	} else {
-		return false;	
 	}
+
+	if(changedTiddlers) {
+		return this.refreshChildren(changedTiddlers);
+	}
+	return false;
 };
 
 exports.text = TextNodeWidget;

package/plugins/tiddlywiki/geospatial/geotools.js

@@ -17,7 +17,7 @@ Parse a string as a GeoJSON Point
 exports.parsePoint = function(str) {
 	var defaultResult = function() {
 		return turf.point([0,0,0]);
-	}
+	};
 	// If the string is missing then return 0,0,0
 	if(!str) {
 		return defaultResult();
@@ -33,4 +33,4 @@ exports.parsePoint = function(str) {
 	}
 	// Return the string now we know it is a valid GeoJSON Point
 	return json;
-}
+};

package/plugins/tiddlywiki/geospatial/operators/lookup.js

@@ -20,7 +20,7 @@ exports.geolookup = function(source,operator,options) {
 		source(function(tiddler,title) {
 			var point = geotools.parsePoint(title),
 				result = getPolygonsContainingPoint(jsonObject,point);
-			output.push(JSON.stringify(result))
+			output.push(JSON.stringify(result));
 		});
 	}
 	// Perform the transformation

package/plugins/tiddlywiki/geospatial/operators/olc.js

@@ -10,13 +10,12 @@ Filter operators for open location code conversions
 "use strict";
 
 var openlocationcode = require("$:/plugins/tiddlywiki/geospatial/openlocationcode.js"),
-	turf = require("$:/plugins/tiddlywiki/geospatial/turf.js"),
-	geotools = require("$:/plugins/tiddlywiki/geospatial/geotools.js");
+	turf = require("$:/plugins/tiddlywiki/geospatial/turf.js");
 
 exports["olc-decode"] = function(source,operator,options) {
 	var olc;
 	try {
-		olc = openlocationcode.decode(operator.operands[0] || "")
+		olc = openlocationcode.decode(operator.operands[0] || "");
 	} catch(e) {
 		return [];
 	}
@@ -44,7 +43,7 @@ exports["olc-encode"] = function(source,operator,options) {
 	try {
 		olc = openlocationcode.encode(lat,long,codelength);
 	} catch(e) {
-		return []
+		return [];
 	}
 	return [olc];
 };

package/plugins/tiddlywiki/geospatial/operators/transformation.js

@@ -9,8 +9,7 @@ Filter operators for geospatial transformation
 
 "use strict";
 
-var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js"),
-	geotools = require("$:/plugins/tiddlywiki/geospatial/geotools.js");
+var turf = require("$:/plugins/tiddlywiki/geospatial/turf.js");
 
 exports.geounion = makeTransformation("union");
 
@@ -25,7 +24,7 @@ function makeTransformation(methodName) {
 		source(function(tiddler,title) {
 			var jsonObject = $tw.utils.parseJSONSafe(title,null);
 			if(jsonObject) {
-				jsonObjects.push(jsonObject)
+				jsonObjects.push(jsonObject);
 			}
 		});
 		// Perform the transformation

package/plugins/tiddlywiki/geospatial/widgets/geomap.js

@@ -133,7 +133,7 @@ GeomapWidget.prototype.refreshMap = function() {
 			attribution: layerInfo.attribution
 		});
 		if(self.renderedBaseLayers.length === 0) {
-			baseLayer.addTo(self.map)
+			baseLayer.addTo(self.map);
 		}
 		var name = layerInfo.name || ("Untitled " + untitledCount++);
 		self.renderedBaseLayers.push({name: name, layer: baseLayer});
@@ -201,7 +201,7 @@ GeomapWidget.prototype.refreshMap = function() {
 				style: function(geoJsonFeature) {
 					return {
 						color: widget.getAttribute("color","yellow")
-					}
+					};
 				},
 				pointToLayer: function(geoJsonPoint,latlng) {
 					var marker = $tw.Leaflet.marker(latlng,{icon: myIcon,draggable: draggable});
@@ -220,13 +220,13 @@ GeomapWidget.prototype.refreshMap = function() {
 					if(popupTemplateTitle) {
 						layer.bindPopup(function() {
 							var widget = self.wiki.makeTranscludeWidget(popupTemplateTitle, {
-									document: self.document,
-									parentWidget: self,
-									parseAsInline: false,
-									importPageMacros: true,
-									variables: {
-										feature: JSON.stringify(feature)
-									}
+								document: self.document,
+								parentWidget: self,
+								parseAsInline: false,
+								importPageMacros: true,
+								variables: {
+									feature: JSON.stringify(feature)
+								}
 							});
 							var container = self.document.createElement("div");
 							widget.render(container,null);

package/plugins/tiddlywiki/googleanalytics/googleanalytics.js

@@ -25,7 +25,7 @@ exports.startup = function() {
 			var gaMeasurementID = $tw.wiki.getTiddlerText("$:/GoogleAnalyticsMeasurementID","").replace(/\n/g,"");
 			var url ="https://www.googletagmanager.com/gtag/js?id=" + gaMeasurementID;
 			window.dataLayer = window.dataLayer || [];
-			window.gtag = function() { window.dataLayer?.push(arguments); };
+			window.gtag = function() { if(window.dataLayer) window.dataLayer.push(arguments); };
 			window.gtag("js",new Date());
 			window.gtag("config",gaMeasurementID);
 			const scriptElement = window.document.createElement("script");