TiddlyWiki · Jermolene · Mar 4, 2023 · May 10, 2023 · May 10, 2023 · May 10, 2023
diff --git a/boot/boot.js b/boot/boot.js
diff --git a/core/modules/filters.js b/core/modules/filters.js
@@ -171,15 +171,15 @@ exports.parseFilter = function(filterString) {
 				}
 				if(match[3]) {
 					operation.suffixes = [];
-					 $tw.utils.each(match[3].split(":"),function(subsuffix) {
+						$tw.utils.each(match[3].split(":"),function(subsuffix) {
 						operation.suffixes.push([]);
 						$tw.utils.each(subsuffix.split(","),function(entry) {
 							entry = $tw.utils.trim(entry);
 							if(entry) {
 								operation.suffixes[operation.suffixes.length -1].push(entry);
 							}
 						});
-					 });
+						});
 				}
 			}
 			if(match[4]) { // Opening square bracket
@@ -225,13 +225,16 @@ source: an iterator function for the source tiddlers, called source(iterator), w
 widget: an optional widget node for retrieving the current tiddler etc.
 */
 exports.compileFilter = function(filterString) {
+	// Set up the filter function cache
 	if(!this.filterCache) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
+	// Use the cached version of this filter function if it exists
 	if(this.filterCache[filterString] !== undefined) {
 		return this.filterCache[filterString];
 	}
+	// Parse the filter string
 	var filterParseTree;
 	try {
 		filterParseTree = this.parseFilter(filterString);
@@ -334,8 +337,8 @@ exports.compileFilter = function(filterString) {
 			}
 		})());
 	});
-	// Return a function that applies the operations to a source iterator of tiddler titles
-	var fnMeasured = $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
+	// Make the filter function
+	var fnFilter = function filterFunction(source,widget) {
 		if(!source) {
 			source = self.each;
 		} else if(typeof source === "object") { // Array or hashmap
@@ -355,7 +358,10 @@ exports.compileFilter = function(filterString) {
 		}
 		self.filterRecursionCount = self.filterRecursionCount - 1;
 		return results.toArray();
-	});
+	};
+	// Return a function that applies the operations to a source iterator of tiddler titles
+	var fnMeasured = $tw.perf.measure("filter: " + filterString,fnFilter);
+	// Cache the measured filter function
 	if(this.filterCacheCount >= 2000) {
 		// To prevent memory leak, we maintain an upper limit for cache size.
 		// Reset if exceeded. This should give us 95% of the benefit
@@ -369,3 +375,4 @@ exports.compileFilter = function(filterString) {
 };
 
 })();
+
diff --git a/core/modules/tiddler.js b/core/modules/tiddler.js
@@ -24,21 +24,6 @@ exports.isDraft = function() {
 	return this.hasField("draft.of");
 };
 
-exports.getFieldString = function(field,defaultValue) {
-	var value = this.fields[field];
-	// Check for a missing field
-	if(value === undefined || value === null) {
-		return defaultValue || "";
-	}
-	// Stringify the field with the associated tiddler field module (if any)
-	var fieldModule = $tw.Tiddler.fieldModules[field];
-	if(fieldModule && fieldModule.stringify) {
-		return fieldModule.stringify.call(this,value);
-	} else {
-		return value.toString();
-	}
-};
-
 /*
 Get the value of a field as a list
 */
@@ -51,24 +36,6 @@ exports.getFieldList = function(field) {
 	return $tw.utils.parseStringArray(value);
 };
 
-/*
-Get all the fields as a hashmap of strings. Options:
-	exclude: an array of field names to exclude
-*/
-exports.getFieldStrings = function(options) {
-	options = options || {};
-	var exclude = options.exclude || [];
-	var fields = {};
-	for(var field in this.fields) {
-		if($tw.utils.hop(this.fields,field)) {
-			if(exclude.indexOf(field) === -1) {
-				fields[field] = this.getFieldString(field);
-			}
-		}
-	}
-	return fields;
-};
-
 /*
 Get all the fields as a name:value block. Options:
 	exclude: an array of field names to exclude

diff --git a/core/wiki/config/PerformanceInstrumentation.tid b/core/wiki/config/PerformanceInstrumentation.tid
@@ -1,2 +1,2 @@
 title: $:/config/Performance/Instrumentation
-text: no
+text: yes
diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info
@@ -1,6 +1,7 @@
 {
 	"description": "Empty edition",
 	"plugins": [
+		"tiddlywiki/sqlite3store"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",

diff --git a/editions/prerelease/tiddlers/system/configPerformanceInstrumentation.tid b/editions/prerelease/tiddlers/system/configPerformanceInstrumentation.tid
@@ -0,0 +1,2 @@
+title: $:/config/Performance/Instrumentation
+text: yes
diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info
@@ -1,31 +1,11 @@
 {
 	"description": "Content for the current prerelease",
 	"plugins": [
-		"tiddlywiki/browser-sniff",
-		"tiddlywiki/help",
-		"tiddlywiki/stacked-view",
-		"tiddlywiki/powered-by-tiddlywiki",
-		"tiddlywiki/internals",
-		"tiddlywiki/highlight",
-		"tiddlywiki/bibtex",
-		"tiddlywiki/savetrail",
-		"tiddlywiki/external-attachments",
-		"tiddlywiki/dynaview",
-		"tiddlywiki/dynannotate",
-		"tiddlywiki/codemirror",
-		"tiddlywiki/menubar",
-		"tiddlywiki/jszip"
+		"tiddlywiki/sqlite3store"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
-		"tiddlywiki/snowwhite",
-		"tiddlywiki/starlight",
-		"tiddlywiki/seamless",
-		"tiddlywiki/centralised",
-		"tiddlywiki/heavier",
-		"tiddlywiki/tight",
-		"tiddlywiki/tight-heavier",
-		"tiddlywiki/readonly"
+		"tiddlywiki/snowwhite"
 	],
 	"languages": [
 	],

diff --git a/editions/test/tiddlywiki.info b/editions/test/tiddlywiki.info
@@ -1,7 +1,8 @@
 {
 	"description": "TiddlyWiki core tests",
 	"plugins": [
-		"tiddlywiki/jasmine"
+		"tiddlywiki/jasmine",
+		"tiddlywiki/sqlite3store"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",

diff --git a/editions/tw5.com/tiddlers/system/configPerformanceInstrumentation.tid b/editions/tw5.com/tiddlers/system/configPerformanceInstrumentation.tid
@@ -0,0 +1,2 @@
+title: $:/config/Performance/Instrumentation
+text: yes
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
@@ -1,24 +1,11 @@
 {
 	"description": "Documentation from https://tiddlywiki.com",
 	"plugins": [
-		"tiddlywiki/nodewebkitsaver",
-		"tiddlywiki/browser-sniff",
-		"tiddlywiki/railroad",
-		"tiddlywiki/evernote",
-		"tiddlywiki/internals",
-		"tiddlywiki/menubar",
-		"tiddlywiki/qrcode"
+		"tiddlywiki/sqlite3store"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
-		"tiddlywiki/snowwhite",
-		"tiddlywiki/starlight",
-		"tiddlywiki/seamless",
-		"tiddlywiki/centralised",
-		"tiddlywiki/tight",
-		"tiddlywiki/heavier",
-		"tiddlywiki/tight-heavier",
-		"tiddlywiki/readonly"
+		"tiddlywiki/snowwhite"
 	],
 	"languages": [
 	],

diff --git a/plugins/tiddlywiki/demo-alternate-store/plugin.info b/plugins/tiddlywiki/demo-alternate-store/plugin.info
@@ -0,0 +1,6 @@
+{
+	"title": "$:/plugins/tiddlywiki/demo-alternate-store",
+	"name": "Demo alternate store",
+	"description": "Developer demo of an alternate wiki store implementation",
+	"list": "readme"
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		title: $:/config/Performance/Instrumentation
		text: yes