tiddlywiki 5.1.23 → 5.2.2

package/editions/test/tiddlers/tests/test-html-parser.js

@@ -90,7 +90,7 @@ describe("HTML tag new parser tests", function() {
 			{ type : 'macro-parameter', start : 0, value : 'one two three', end : 17 }
 		);
 		expect($tw.utils.parseMacroParameter("myparam>",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'myparam', end : 7 }
+			{ type : 'macro-parameter', start : 0, value : 'myparam>', end : 8 }
 		);
 	});
 
@@ -128,6 +128,21 @@ describe("HTML tag new parser tests", function() {
 		expect($tw.utils.parseAttribute("p=\"blah\"  ",0)).toEqual(
 			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 8 }
 		);
+		expect($tw.utils.parseAttribute("p=\"bl\nah\"  ",0)).toEqual(
+			{ type : 'string', start : 0, name : 'p', value : 'bl\nah', end : 9 }
+		);
+		expect($tw.utils.parseAttribute("p={{{blah}}}  ",0)).toEqual(
+			{ type : 'filtered', start : 0, name : 'p', filter : 'blah', end : 12 }
+		);
+		expect($tw.utils.parseAttribute("p={{{bl\nah}}}  ",0)).toEqual(
+			{ type : 'filtered', start : 0, name : 'p', filter : 'bl\nah', end : 13 }
+		);
+		expect($tw.utils.parseAttribute("p={{{ [{$:/layout}] }}}  ",0)).toEqual(
+			{ type : 'filtered', start : 0, name : 'p', filter : ' [{$:/layout}] ', end : 23 }
+		);
+		expect($tw.utils.parseAttribute("p={{blah}}  ",0)).toEqual(
+			{ type : 'indirect', start : 0, name : 'p', textReference : 'blah', end : 10 }
+		);
 		expect($tw.utils.parseAttribute("p=blah  ",0)).toEqual(
 			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 6 }
 		);
@@ -156,46 +171,52 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect(parser.parseTag("<mytag>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { }, tag : 'mytag', end : 7 }
+			{ type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'mytag', end : 7 }
 		);
 		expect(parser.parseTag("<mytag attrib1>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, tag : 'mytag', end : 15 }
+			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 14 } ], tag : 'mytag', end : 15 }
 		);
 		expect(parser.parseTag("<mytag attrib1/>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, tag : 'mytag', isSelfClosing : true, end : 16 }
+			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 14 } ], tag : 'mytag', isSelfClosing : true, end : 16 }
 		);
 		expect(parser.parseTag("<$view field=\"title\" format=\"link\"/>",0)).toEqual(
-			{ type : 'view', start : 0, attributes : { field : { start : 6, name : 'field', type : 'string', value : 'title', end : 20 }, format : { start : 20, name : 'format', type : 'string', value : 'link', end : 34 } }, tag : '$view', isSelfClosing : true, end : 36 }
+			{ type : 'view', start : 0, attributes : { field : { start : 6, name : 'field', type : 'string', value : 'title', end : 20 }, format : { start : 20, name : 'format', type : 'string', value : 'link', end : 34 } }, orderedAttributes: [ { start: 6, name: 'field', type: 'string', value: 'title', end: 20 }, { start: 20, name: 'format', type: 'string', value: 'link', end: 34 } ], tag : '$view', isSelfClosing : true, end : 36 }
 		);
 		expect(parser.parseTag("<mytag attrib1='something'>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 6, name : 'attrib1', value : 'something', end : 26 } }, tag : 'mytag', end : 27 }
+			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 6, name : 'attrib1', value : 'something', end : 26 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'something', end: 26 } ], tag : 'mytag', end : 27 }
+		);
+		expect(parser.parseTag("<mytag attrib1 attrib1='something'>",0)).toEqual(
+			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 15, name : 'attrib1', value : 'something', end : 34 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 15 }, { start: 15, name: 'attrib1', type: 'string', value: 'something', end: 34 } ], tag : 'mytag', end : 35 }
+		);
+		expect(parser.parseTag("<mytag attrib1 attrib1='something' attrib1='else'>",0)).toEqual(
+			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 34, name : 'attrib1', value : 'else', end : 49 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 15 }, { start: 15, name: 'attrib1', type: 'string', value: 'something', end: 34 }, { start: 34, name: 'attrib1', type: 'string', value: 'else', end: 49 } ], tag : 'mytag', end : 50 }
 		);
 		expect(parser.parseTag("<$mytag attrib1='something' attrib2=else thing>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 46 } }, tag : '$mytag', end : 47 }
+			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 46 } }, orderedAttributes: [ { start: 7, name: 'attrib1', type: 'string', value: 'something', end: 27 }, { start: 27, name: 'attrib2', type: 'string', value: 'else', end: 40 }, { start: 40, name: 'thing', type: 'string', value: 'true', end: 46 } ], tag : '$mytag', end : 47 }
 		);
 		expect(parser.parseTag("< $mytag attrib1='something' attrib2=else thing>",0)).toEqual(
 			null
 		);
 		expect(parser.parseTag("<$mytag attrib3=<<myMacro one:two three:'four and five'>>>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib3 : { type : 'macro', start : 7, name : 'attrib3', value : { type : 'macrocall', start : 16, params : [ { type : 'macro-parameter', start : 25, value : 'two', name : 'one', end : 33 }, { type : 'macro-parameter', start : 33, value : 'four and five', name : 'three', end : 55 } ], name : 'myMacro', end : 57 }, end : 57 } }, tag : '$mytag', end : 58 }
+			{ type : 'mytag', start : 0, attributes : { attrib3 : { type : 'macro', start : 7, name : 'attrib3', value : { type : 'macrocall', start : 16, params : [ { type : 'macro-parameter', start : 25, value : 'two', name : 'one', end : 33 }, { type : 'macro-parameter', start : 33, value : 'four and five', name : 'three', end : 55 } ], name : 'myMacro', end : 57 }, end : 57 } }, orderedAttributes: [ { type : 'macro', start : 7, name : 'attrib3', value : { type : 'macrocall', start : 16, params : [ { type : 'macro-parameter', start : 25, value : 'two', name : 'one', end : 33 }, { type : 'macro-parameter', start : 33, value : 'four and five', name : 'three', end : 55 } ], name : 'myMacro', end : 57 }, end : 57 } ], tag : '$mytag', end : 58 }
 		);
 		expect(parser.parseTag("<$mytag attrib1='something' attrib2=else thing attrib3=<<myMacro one:two three:'four and five'>>>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 47 }, attrib3 : { type : 'macro', start : 47, name : 'attrib3', value : { type : 'macrocall', start : 55, params : [ { type : 'macro-parameter', start : 64, value : 'two', name : 'one', end : 72 }, { type : 'macro-parameter', start : 72, value : 'four and five', name : 'three', end : 94 } ], name : 'myMacro', end : 96 }, end : 96 } }, tag : '$mytag', end : 97 }
+			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 47 }, attrib3 : { type : 'macro', start : 47, name : 'attrib3', value : { type : 'macrocall', start : 55, params : [ { type : 'macro-parameter', start : 64, value : 'two', name : 'one', end : 72 }, { type : 'macro-parameter', start : 72, value : 'four and five', name : 'three', end : 94 } ], name : 'myMacro', end : 96 }, end : 96 } }, orderedAttributes: [ { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, { type : 'string', start : 40, name : 'thing', value : 'true', end : 47 }, { type : 'macro', start : 47, name : 'attrib3', value : { type : 'macrocall', start : 55, params : [ { type : 'macro-parameter', start : 64, value : 'two', name : 'one', end : 72 }, { type : 'macro-parameter', start : 72, value : 'four and five', name : 'three', end : 94 } ], name : 'myMacro', end : 96 }, end : 96 } ], tag : '$mytag', end : 97 }
 		);
 	});
 
 	it("should find and parse HTML tags", function() {
 		expect(parser.findNextTag("<something <mytag>",1)).toEqual(
-			{ type : 'element', start : 11, attributes : {  }, tag : 'mytag', end : 18 }
+			{ type : 'element', start : 11, attributes : {  }, orderedAttributes: [ ], tag : 'mytag', end : 18 }
 		);
 		expect(parser.findNextTag("something else </mytag>",0)).toEqual(
 			null
 		);
 		expect(parser.findNextTag("<<some other stuff>> <mytag>",0)).toEqual(
-			{ type : 'element', start : 1, attributes : { other : { type : 'string', value : 'true', start : 6, name : 'other', end : 13 }, stuff : { type : 'string', value : 'true', start : 13, name : 'stuff', end : 18 } }, tag : 'some', end : 19 }
+			{ type : 'element', start : 1, attributes : { other : { type : 'string', value : 'true', start : 6, name : 'other', end : 13 }, stuff : { type : 'string', value : 'true', start : 13, name : 'stuff', end : 18 } }, orderedAttributes: [ { type : 'string', value : 'true', start : 6, name : 'other', end : 13 }, { type : 'string', value : 'true', start : 13, name : 'stuff', end : 18 } ], tag : 'some', end : 19 }
 		);
 		expect(parser.findNextTag("<<some other stuff>> <mytag>",2)).toEqual(
-			{ type : 'element', start : 21, attributes : {  }, tag : 'mytag', end : 28 }
+			{ type : 'element', start : 21, attributes : {  }, orderedAttributes: [ ], tag : 'mytag', end : 28 }
 		);
 	});
 

package/editions/test/tiddlers/tests/test-linked-list.js

@@ -8,10 +8,18 @@ Tests the utils.LinkedList class.
 LinkedList was built to behave exactly as $tw.utils.pushTop and
 Array.prototype.push would behave with an array.
 
-Many of these tests function by performing operations on a LinkedList while
-performing the equivalent actions on an array with the old utility methods.
+Many of these tests function by performing operations on a paired set of
+an array and LinkedList. It uses equivalent actions on both.
 Then we confirm that the two come out functionally identical.
 
+NOTE TO FURTHER LINKED LIST DEVELOPERS:
+
+	If you want to add new functionality, like 'shift' or 'unshift', you'll
+	probably need to deal with the fact that Linked List will insert undefined
+	as a first entry into an item's 'prev' array when it's at the front of
+	the list, but it doesn't do the same for the 'next' array when it's at
+	the end. I think you'll probably be better off preventing 'prev' from ever
+	adding undefined.
 \*/
 (function(){
 
@@ -21,127 +29,230 @@ Then we confirm that the two come out functionally identical.
 
 describe("LinkedList class tests", function() {
 
+	// creates and initializes a new {array, list} pair for testing
+	function newPair(initialArray) {
+		var pair = {array: [], list: new $tw.utils.LinkedList()};
+		if (initialArray) {
+			push(pair, initialArray);
+		}
+		return pair;
+	};
+
 	// pushTops a value or array of values into both the array and linked list.
-	function pushTop(array, linkedList, valueOrValues) {
-		$tw.utils.pushTop(array, valueOrValues);
-		linkedList.pushTop(valueOrValues);
+	function pushTop(pair, valueOrValues) {
+		pair.list.pushTop(valueOrValues);
+		$tw.utils.pushTop(pair.array, valueOrValues);
+		return pair;
 	};
 
 	// pushes values into both the array and the linked list.
-	function push(array, linkedList/*, other values */) {
-		var values = Array.prototype.slice(arguments, 2);
-		array.push.apply(array, values);
-		linkedList.push.apply(linkedList, values);
+	function push(pair, values) {
+		pair.list.push(values);
+		pair.array.push.apply(pair.array, values);
+		return pair;
 	};
 
 	// operates a remove action on an array and a linked list in parallel.
-	function remove(array, linkedList, valueOrValues) {
-		$tw.utils.removeArrayEntries(array, valueOrValues);
-		linkedList.remove(valueOrValues);
+	function remove(pair, valueOrValues) {
+		pair.list.remove(valueOrValues);
+		$tw.utils.removeArrayEntries(pair.array, valueOrValues);
+		return pair;
 	};
 
 	// compares an array and a linked list to make sure they match up
-	function compare(array, linkedList) {
-		expect(linkedList.toArray()).toEqual(array);
-		expect(linkedList.length).toBe(array.length);
+	function compare(pair) {
+		expect(pair.list.toArray()).toEqual(pair.array);
+		expect(pair.list.length).toBe(pair.array.length);
+		return pair;
 	};
 
 	it("can pushTop", function() {
-		var array = [];
-		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'B', 'C');
+		var pair = newPair(["A", "B", "C"]);
 		// singles
-		pushTop(array, list, 'X');
-		pushTop(array, list, 'B');
-		compare(array, list); // A C X B
+		pushTop(pair, "X");
+		pushTop(pair, "B");
+		compare(pair); // ACXB
 		//arrays
-		pushTop(array, list, ['X', 'A', 'G', 'A']);
+		pushTop(pair, ["X", "A", "G", "A"]);
 		// If the pushedTopped list has duplicates, they go in unempeded.
-		compare(array, list); // C B X A G A
+		compare(pair); // CBXAGA
 	});
 
 	it("can pushTop with tricky duplicates", function() {
-		var array = [];
-		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'B', 'A', 'C', 'A', 'end');
+		var pair = newPair(["A", "B", "A", "C", "A", "e"]);
 		// If the original list contains duplicates, only one instance is cut
-		pushTop(array, list, 'A');
-		compare(array, list); // B A C A end A
+		compare(pushTop(pair, "A")); // BACAeA
 
 		// And the Llist properly knows the next 'A' to cut if pushed again
-		pushTop(array, list, ['X', 'A']);
-		compare(array, list); // B C A end A X A
+		compare(pushTop(pair, ["X", "A"])); // BCAeAXA
 
 		// One last time, to make sure we maintain the linked chain of copies
-		pushTop(array, list, 'A');
-		compare(array, list); // B C end A X A A
+		compare(pushTop(pair, "A")); // BCeAXAA
+	});
+
+	it("can pushTop a single-value list with itself", function() {
+		// This simple case actually requires special handling in LinkedList.
+		compare(pushTop(newPair(["A"]), "A")); // A
+	});
+
+	it("can remove all instances of a multi-instance value", function() {
+		var pair = compare(remove(newPair(["A", "A"]), ["A", "A"])); //
+		// Now add 'A' back in, since internally it might be using arrays,
+		// even though those arrays must be empty.
+		compare(pushTop(pair, "A")); // A
+		// Same idea, but push something else before readding 'A'
+		compare(pushTop(remove(newPair(["A", "A"]), ["A", "A"]), ["B", "A"])); // BA
+
+		// Again, but this time with other values mixed in
+		compare(remove(newPair(["B", "A", "A", "C"]), ["A", "A"])) // BC;
+		// And again, but this time with value inbetween too.
+		compare(remove(newPair(["B", "A", "X", "Y", "Z", "A", "C"]), ["A", "A"])); // BXYZC
+
+		// One last test, where removing a pair from the end could corrupt
+		// list.last.
+		pair = remove(newPair(["D", "C", "A", "A"]), ["A", "A"]);
+		// But I can't figure out another way to test this. It's wrong
+		// for list.last to be anything other than a string, but I
+		// can't figure out how to make that corruption manifest a problem.
+		// So I dig into its private members. Bleh...
+		expect(typeof pair.list.last).toBe("string");
+	});
+
+	it("can pushTop value linked to by a repeat item", function() {
+		var pair = newPair(["A", "B", "A", "C", "A", "C", "D"]);
+		// This is tricky because that 'C' is referenced by a second 'A'
+		// It WAS a crash before
+		pushTop(pair, "C");
+		compare(pair); // ABAACDC
+	});
+
+	it("can pushTop last value after pair", function() {
+		// The 'next' ptrs for A would be polluted with an extraneous
+		// undefined after the pop, which would make pushing the 'X'
+		// back on problematic.
+		compare(pushTop(newPair(["A", "A", "X"]), "X")); // AACX
+		// And lets try a few other manipulations around pairs
+		compare(pushTop(newPair(["A", "A", "X", "C"]), "X")); // AACX
+		compare(pushTop(newPair(["X", "A", "A"]), "X")); // AAX
+		compare(pushTop(newPair(["C", "X", "A", "A"]), "X")); // CAAX
 	});
 
 	it("can handle particularly nasty pushTop pitfall", function() {
-		var array = [];
-		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'B', 'A', 'C');
-		pushTop(array, list, 'A'); // BACA
-		pushTop(array, list, 'X'); // BACAX
-		remove(array, list, 'A');  // BCAX
-		pushTop(array, list, 'A'); // BCXA
-		remove(array, list, 'A');  // BCX
+		var pair = newPair(["A", "B", "A", "C"]);
+		pushTop(pair, "A"); // BACA
+		pushTop(pair, "X"); // BACAX
+		remove(pair, "A");  // BCAX
+		pushTop(pair, "A"); // BCXA
+		remove(pair, "A");  // BCX
 
 		// But! The way I initially coded the copy chains, a mystery A could
 		// hang around.
-		compare(array, list); // B C X
+		compare(pair); // BCX
+	});
+
+	it("can handle past-duplicate items when pushing", function() {
+		var pair = newPair(["X", "Y", "A", "C", "A"]);
+		// Removing an item, when it has a duplicat at the list's end
+		remove(pair, "A");
+		compare(pair); // XYCA
+		// This actually caused an infinite loop once. So important test here.
+		push(pair, ["A"]);
+		compare(pair); // XYCAA
+		pushTop(pair, "A") // switch those last As
+		compare(pair); // XYCAA
+		remove(pair, ["A", "A"]); // Remove all As, then add them back
+		pushTop(pair, ["A", "A"])
+		compare(pair); // XYCAA
 	});
 
 	it("can push", function() {
-		var array = [];
 		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'B', 'C');
 		// singles
-		push(array, list, 'B');
-		compare(array, list); // A B C B
-
+		expect(list.push("A")).toBe(1);
+		expect(list.push("B")).toBe(2);
 		// multiple args
-		push(array, list, 'A', 'B', 'C');
-		compare(array, list); // A B C B A B C
+		expect(list.push("C", "D", "E")).toBe(5);
+		// array arg allowed
+		expect(list.push(["F", "G"])).toBe(7);
+		// No-op
+		expect(list.push()).toBe(7);
+		expect(list.toArray()).toEqual(["A", "B", "C", "D", "E", "F", "G"]);
+	});
+
+	it("can handle empty string", function() {
+		compare(newPair(["", "", ""])); // ___
+		compare(push(newPair([""]), [""])); // __
+		compare(pushTop(newPair(["", "", ""]), ["A", ""])); // __A_
+		compare(remove(newPair(["", "A"]), "A")); // _
+		compare(push(newPair(["", "A"]), ["A"])); // _AA
+		compare(remove(newPair(["A", ""]), "A")); // _
+		compare(push(newPair(["A", ""]), ["A"])); // A_A
+
+		// This one is tricky but precise. Remove 'B', and 'A' might mistake
+		// it as being first in the list since it's before ''. 'C' would get
+		// blasted from A's prev reference array.
+		compare(remove(newPair(["C", "A", "", "B", "A"]), ["B", "A"])); // C_A
+		// Same idea, but with A mistaking B for being at the list's end, and
+		// thus removing C from its 'next' reference array.
+		compare(remove(newPair(["A", "B", "", "A", "C"]), ["B", "A"])); // _AC
+	});
+
+	it("will throw if told to push non-strings", function() {
+		var message = "Linked List only accepts string values, not ";
+		var list = new $tw.utils.LinkedList();
+		expect(() => list.push(undefined)).toThrow(message + "undefined");
+		expect(() => list.pushTop(undefined)).toThrow(message + "undefined");
+		expect(() => list.pushTop(["c", undefined])).toThrow(message + "undefined");
+		expect(() => list.pushTop(5)).toThrow(message + "5");
+		expect(() => list.pushTop(null)).toThrow(message + "null");
+
+		// now lets do a quick test to make sure this exception
+		// doesn't leave any side-effects
+		// A.K.A Strong guarantee
+		var pair = newPair(["A", "5", "B", "C"]);
+		expect(() => pushTop(pair, 5)).toThrow(message + "5");
+		compare(pair);
+		expect(() => push(pair, ["D", 7])).toThrow(message + "7");
+		compare(pair);
+		expect(() => remove(pair, 5)).toThrow(message + "5");
+		compare(pair);
+		// This is the tricky one. 'A' and 'B' should not be removed or pushed.
+		expect(() => pushTop(pair, ["A", "B", null])).toThrow(message + "null");
+		compare(pair);
+		expect(() => remove(pair, ["A", "B", null])).toThrow(message + "null");
+		compare(pair);
 	});
 
 	it("can clear", function() {
 		var list = new $tw.utils.LinkedList();
-		list.push('A', 'B', 'C');
+		list.push("A", "B", "C");
 		list.clear();
 		expect(list.toArray()).toEqual([]);
 		expect(list.length).toBe(0);
 	});
 
 	it("can remove", function() {
-		var array = [];
 		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'x', 'C', 'x', 'D', 'x', 'E', 'x');
+		list.push(["A", "x", "C", "x", "D", "x", "E", "x"]);
 		// single
-		remove(array, list, 'x');
-		compare(array, list); // A C x D x E x
-
+		list.remove("x");
 		// arrays
-		remove(array, list, ['x', 'A', 'x']);
-		compare(array, list); // C D E x
+		list.remove(["x", "A", "XXX", "x"]);
+		expect(list.toArray()).toEqual(["C", "D", "E", "x"]);
 	});
 
-	it('can ignore removal of nonexistent items', function() {
-		var array = [];
-		var list = new $tw.utils.LinkedList();
-		push(array, list, 'A', 'B', 'C', 'D');
+	it("can ignore removal of nonexistent items", function() {
+		var pair = newPair(["A", "B", "C", "D"]);
 		// single
-		remove(array, list, 'Z');
-		compare(array, list); // A B C D
+		compare(remove(pair, "Z")); // ABCD
 
 		// array
-		remove(array, list, ['Z', 'B', 'X']);
-		compare(array, list); // A C D
+		compare(remove(pair, ["Z", "B", "X"])); // ACD
 	});
 
-	it('can iterate with each', function() {
+	it("can iterate with each", function() {
 		var list = new $tw.utils.LinkedList();
-		list.push('0', '1', '2', '3');
+		list.push("0", "1", "2", "3");
 		var counter = 0;
 		list.each(function(value) {
 			expect(value).toBe(counter.toString());
@@ -149,6 +260,11 @@ describe("LinkedList class tests", function() {
 		});
 		expect(counter).toBe(4);
 	});
+
+	it("can iterate a list of the same item", function() {
+		// Seems simple. Caused an infinite loop during development.
+		compare(newPair(["A", "A"]));
+	});
 });
 
 })();

package/editions/test/tiddlers/tests/test-parsetextreference.js

@@ -0,0 +1,132 @@
+/*\
+title: test-parsetextreference.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests for source attribute in parser returned from wiki.parseTextReference
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe("Wiki.parseTextReference tests", function() {
+
+	// Create a wiki
+	var wiki = new $tw.Wiki();
+	wiki.addTiddler({
+		title: "TiddlerOne",
+		text: "The quick brown fox in $:/TiddlerTwo",
+		tags: ["one"],
+		authors: "Joe Bloggs",
+		modifier: "JoeBloggs",
+		modified: "201304152222"});
+	wiki.addTiddler({
+		title: "$:/TiddlerTwo",
+		tags: ["two"],
+		authors: "[[John Doe]]",
+		modifier: "John",
+		modified: "201304152211"});
+	wiki.addTiddler({
+		title: "Tiddler Three",
+		text: '{"oct":31,"nov":30,"dec":31,"jan":""}',
+		tags: ["one","two"],
+		type: "application/json",
+		modifier: "John",
+		modified: "201304162202"});
+	wiki.addTiddler({
+		title: "TiddlerFour",
+		text: "The quick brown fox in $:/TiddlerTwo",
+		tags: ["one"],
+		type: "text/vnd.tiddlywiki",
+		authors: "",
+		modifier: "JoeBloggs",
+		modified: "201304152222"});
+	// Add a plugin containing some shadow tiddlers
+	var shadowTiddlers = {
+		tiddlers: {
+			"$:/TiddlerFive": {
+				title: "$:/TiddlerFive",
+				text: "Everything in federation",
+				tags: ["two"]
+			},
+			"TiddlerSix": {
+				title: "TiddlerSix",
+				text: "Missing inaction from TiddlerOne",
+				filter: "[[one]] [[a a]] [subfilter{hasList!!list}]",
+				tags: []
+			},
+			"TiddlerSeventh": {
+				title: "TiddlerSeventh",
+				text: "",
+				list: "TiddlerOne [[Tiddler Three]] [[a fourth tiddler]] MissingTiddler",
+				tags: ["one"]
+			},
+			"Tiddler8": {
+				title: "Tiddler8",
+				text: "Tidd",
+				tags: ["one"],
+				"test-field": "JoeBloggs",
+				"myfield":""
+			}
+		}
+	};
+	wiki.addTiddler({
+		title: "$:/ShadowPlugin",
+		text: JSON.stringify(shadowTiddlers),
+		"plugin-type": "plugin",
+		type: "application/json"});
+	wiki.addTiddler({
+		title: "TiddlerNine",
+		text: "this is plain text",
+		type: "text/plain"
+	});
+
+	// Define a parsing shortcut for souce attribute of parser returned by wiki.parseTextReference
+	var parseAndGetSource = function(title,field,index,subTiddler) {
+		var parser = wiki.parseTextReference(title,field,index,{subTiddler: subTiddler});
+		return parser ? parser.source : null;
+	};
+
+	it("should parse text references and return correct source attribute", function(){
+		// Existing tiddler with a text field, no field argument specified
+		expect(parseAndGetSource("TiddlerOne")).toEqual("The quick brown fox in $:/TiddlerTwo");
+		// Existing tiddler with a text field, field argument specified as text
+		expect(parseAndGetSource("TiddlerOne","text")).toEqual("The quick brown fox in $:/TiddlerTwo");
+		// Existing tiddler with no text field
+		expect(parseAndGetSource("$:/TiddlerTwo")).toEqual("");
+		// Existing tiddler, field argument specified as authors
+		expect(parseAndGetSource("TiddlerOne","authors")).toEqual("Joe Bloggs");
+		// Non-existent tiddler, no field argument
+		expect(parseAndGetSource("MissingTiddler")).toEqual(null);
+		// Non-existent tiddler, field argument
+		expect(parseAndGetSource("MissingTiddler","missing-field")).toEqual(null);
+		// Non-existent tiddler, index specified
+		expect(parseAndGetSource("MissingTiddler",null,"missing-index")).toEqual(null);
+		// Existing tiddler with non existent field
+		expect(parseAndGetSource("TiddlerOne","missing-field")).toEqual(null);
+		// Existing tiddler with blank field
+		expect(parseAndGetSource("TiddlerFour","authors")).toEqual("");
+		// Data tiddler with index specified
+		expect(parseAndGetSource("Tiddler Three",null,"oct")).toEqual("31");
+		// Data tiddler with blank index
+		expect(parseAndGetSource("Tiddler Three",null,"jan")).toEqual("");
+		// Data tiddler with non-existent index
+		expect(parseAndGetSource("Tiddler Three",null,"feb")).toEqual(null);
+		// Existing tiddler with a text field, type set to vnd.tiddlywiki
+		expect(parseAndGetSource("TiddlerFour")).toEqual("The quick brown fox in $:/TiddlerTwo");
+		// Existing subtiddler of a plugin
+		expect(parseAndGetSource("$:/ShadowPlugin","text",null,"Tiddler8")).toEqual("Tidd");
+		// Existing blank field of a subtiddler of a plugin
+		expect(parseAndGetSource("$:/ShadowPlugin","myfield",null,"Tiddler8")).toEqual("");
+		// Non-existent subtiddler of a plugin
+		expect(parseAndGetSource("$:/ShadowPlugin","text",null,"MyMissingTiddler")).toEqual(null);
+		// Plain text tiddler
+		expect(parseAndGetSource("TiddlerNine")).toEqual(undefined);
+	});
+
+});
+
+})();