Add new sortsub operator

core/modules/filters/compare.js

@@ -16,7 +16,7 @@ exports.compare = function(source,operator,options) {
 	var suffixes = operator.suffixes || [],
 		type = (suffixes[0] || [])[0],
 		mode = (suffixes[1] || [])[0],
-		typeFn = types[type] || types.number,
+		typeFn = $tw.utils.makeCompareFunction(type,{defaultType: "number"}),
 		modeFn = modes[mode] || modes.eq,
 		invert = operator.prefix === "!",
 		results = [];
@@ -28,42 +28,6 @@ exports.compare = function(source,operator,options) {
 	return results;
 };
 
-var types = {
-	"number": function(a,b) {
-		return compare($tw.utils.parseNumber(a),$tw.utils.parseNumber(b));
-	},
-	"integer": function(a,b) {
-		return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
-	},
-	"string": function(a,b) {
-		return compare("" + a,"" +b);
-	},
-	"date": function(a,b) {
-		var dateA = $tw.utils.parseDate(a),
-			dateB = $tw.utils.parseDate(b);
-		if(!isFinite(dateA)) {
-			dateA = new Date(0);
-		}
-		if(!isFinite(dateB)) {
-			dateB = new Date(0);
-		}
-		return compare(dateA,dateB);
-	},
-	"version": function(a,b) {
-		return $tw.utils.compareVersions(a,b);
-	}
-};
-
-function compare(a,b) {
-	if(a > b) {
-		return +1;
-	} else if(a < b) {
-		return -1;
-	} else {
-		return 0;
-	}
-};
-
 var modes = {
 	"eq": function(value) {return value === 0;},
 	"ne": function(value) {return value !== 0;},

core/modules/filters/sortsub.js

@@ -0,0 +1,44 @@
+/*\
+title: $:/core/modules/filters/sortsub.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for sorting by a subfilter
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.sortsub = function(source,operator,options) {
+	// Collect the input titles
+	var inputTitles = [];
+	source(function(tiddler,title) {
+		inputTitles.push(title);
+	});
+	// Pass them through the subfilter to get the sort keys
+	var sortKeys = options.wiki.filterTiddlers(operator.operand,options.widget,options.wiki.makeTiddlerIterator(inputTitles));
+	// Rather than sorting the titles array, we'll sort the indexes so that we can consult both arrays
+	var indexes = [];
+	while(inputTitles.length > indexes.length) {
+		indexes.push(indexes.length);
+	}
+	// Sort the indexes
+	var compareFn = $tw.utils.makeCompareFunction(operator.suffix,{defaultType: "string",invert: operator.prefix === "!"});
+	indexes = indexes.sort(function(a,b) {
+		return compareFn(sortKeys[a],sortKeys[b]);
+	});
+	// Make the results array in order
+	var results = [];
+	$tw.utils.each(indexes,function(index) {
+		results.push(inputTitles[index]);
+	});
+	return results;
+};
+
+})();

core/modules/utils/utils.js

@@ -813,4 +813,45 @@ exports.stringifyNumber = function(num) {
 	return num + "";
 };
 
+exports.makeCompareFunction = function(type,options) {
+	options = options || {};
+	var gt = options.invert ? -1 : +1,
+		lt = options.invert ? +1 : -1,
+		compare = function(a,b) {
+			if(a > b) {
+				return gt ;
+			} else if(a < b) {
+				return lt;
+			} else {
+				return 0;
+			}
+		},
+		types = {
+			"number": function(a,b) {
+				return compare($tw.utils.parseNumber(a),$tw.utils.parseNumber(b));
+			},
+			"integer": function(a,b) {
+				return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
+			},
+			"string": function(a,b) {
+				return compare("" + a,"" +b);
+			},
+			"date": function(a,b) {
+				var dateA = $tw.utils.parseDate(a),
+					dateB = $tw.utils.parseDate(b);
+				if(!isFinite(dateA)) {
+					dateA = new Date(0);
+				}
+				if(!isFinite(dateB)) {
+					dateB = new Date(0);
+				}
+				return compare(dateA,dateB);
+			},
+			"version": function(a,b) {
+				return $tw.utils.compareVersions(a,b);
+			}
+		};
+	return (types[type] || types[options.defaultType] || types.number);
+};
+
 })();