From a3bf9c0f1cc3bf41ec890e889cc7d269ec6fe893 Mon Sep 17 00:00:00 2001
From: lin onetwo <linonetwo012@gmail.com>
Date: Wed, 12 Jun 2024 22:07:00 +0800
Subject: [PATCH] feat: support old <$transclude tiddler param

---
 core/modules/wiki.js                           | 18 +++++++++++-------
 .../tiddlers/tests/test-backtranscludes.js     |  5 +++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 44e09cfde..94b3e37a4 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -559,13 +559,17 @@ exports.extractTranscludes = function(parseTreeRoot, title) {
 		checkParseTree = function(parseTree, parentNode) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
-				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
-					var value;
-					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-						value = parentNode.attributes.tiddler.value;
-					} else {
-						value = parseTreeNode.attributes.$tiddler.value;
+				if(parseTreeNode.type === "transclude") {
+					if(parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+						var value;
+						// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+						if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+							value = parentNode.attributes.tiddler.value;
+						} else {
+							value = parseTreeNode.attributes.$tiddler.value;
+						}
+					} else if(parseTreeNode.attributes.tiddler && parseTreeNode.attributes.tiddler.type === "string") {
+						value = parseTreeNode.attributes.tiddler.value;
 					}
 					// ignore empty value (like `{{!!field}}`), and deduplicate
 					if(value && transcludes.indexOf(value) === -1 && value !== title) {
diff --git a/editions/test/tiddlers/tests/test-backtranscludes.js b/editions/test/tiddlers/tests/test-backtranscludes.js
index f0ecd26f0..d9aa0277f 100644
--- a/editions/test/tiddlers/tests/test-backtranscludes.js
+++ b/editions/test/tiddlers/tests/test-backtranscludes.js
@@ -219,14 +219,15 @@ describe('Backtranscludes and transclude filter tests', function() {
 
 		wiki.addTiddler({
 			title: 'TestOutgoing',
-			text: "<$tiddler tiddler='TestIncoming'><$transclude $tiddler /></$tiddler>"});
+			text: "<$tiddler tiddler='TestIncoming'><$transclude $tiddler /></$tiddler>\n\n<$transclude tiddler='TiddlyWiki Pre-release'/>"});
 
 		it('should have a transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming');
+			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming,TiddlyWiki Pre-release');
 		});
 
 		it('should have a back transclude', function() {
 			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+			expect(wiki.filterTiddlers('[[TiddlyWiki Pre-release]] +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
 		});
 	});
 });