From 05b582a2026417d42d2bcfa574eaaac974ef860b Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Tue, 26 Apr 2022 12:32:46 +0100
Subject: [PATCH] Fix and test missing target handling

---
 core/modules/widgets/ubertransclude.js        | 12 +++--
 .../data/ubertransclusion/MissingTarget.tid   | 48 +++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid

diff --git a/core/modules/widgets/ubertransclude.js b/core/modules/widgets/ubertransclude.js
index 2ece2a0ff..31a76576e 100644
--- a/core/modules/widgets/ubertransclude.js
+++ b/core/modules/widgets/ubertransclude.js
@@ -47,22 +47,26 @@ UberTranscludeWidget.prototype.execute = function() {
 	this.transcludeIndex = this.getAttribute("$index");
 	this.transcludeMode = this.getAttribute("$mode");
 	this.recursionMarker = this.getAttribute("$recursionMarker","yes");
-	// Find the value widgets in our parse tree
+	// Find the value widgets in our child parse tree
 	this.slotValueParseTrees = Object.create(null);
-	this.slotValueParseTrees.missing = this.parseTreeNode.children;
-	var searchParseTreeNodes = function(nodes) {
+	var noValueWidgetsFound = true,
+		searchParseTreeNodes = function(nodes) {
 		$tw.utils.each(nodes,function(node) {
 			if(node.type === "value" && node.tag === "$value") {
 				if(node.attributes["$name"] && node.attributes["$name"].type === "string") {
 					var slotValueName = node.attributes["$name"].value;
 					self.slotValueParseTrees[slotValueName] = node.children;
 				}
+				noValueWidgetsFound = false;
 			} else {
 				searchParseTreeNodes(node.children);
 			}
 		});
 	};
 	searchParseTreeNodes(this.parseTreeNode.children);
+	if(noValueWidgetsFound) {
+		this.slotValueParseTrees["missing"] = this.parseTreeNode.children;
+	}
 	// Parse the text reference
 	var parseAsInline = !this.parseTreeNode.isBlock;
 	if(this.transcludeMode === "inline") {
@@ -83,7 +87,7 @@ UberTranscludeWidget.prototype.execute = function() {
 				subTiddler: this.transcludeSubTiddler
 			});
 	}
-	var parseTreeNodes = parser ? parser.tree : this.parseTreeNode.children;
+	var parseTreeNodes = parser ? parser.tree : (this.slotValueParseTrees["missing"] || []);
 	this.sourceText = parser ? parser.source : null;
 	this.parserType = parser? parser.type : null;
 	// Set context variables for recursion detection
diff --git a/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid b/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid
new file mode 100644
index 000000000..023384939
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/ubertransclusion/MissingTarget.tid
@@ -0,0 +1,48 @@
+title: Ubertransclude/MissingTarget
+description: Transcluding a missing target
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$ubertransclude $tiddler='TiddlerOne' one='Ferret'>
+	<$parameters one='Ferret'>
+		Badger
+		<$text text=<<one>>/>
+	</$parameters>
+</$ubertransclude>
+<$ubertransclude $tiddler='TiddlerOne' one='Ferret'>
+	<$value $name="missing">
+		<$parameters one='Ferret'>
+			Badger
+			<$text text=<<one>>/>
+		</$parameters>
+	</$value>
+</$ubertransclude>
+<$ubertransclude $tiddler='MissingTiddler' one='Ferret'>
+	<$parameters one='Ferret'>
+		Badger
+		<$text text=<<one>>/>
+	</$parameters>
+</$ubertransclude>
+<$ubertransclude $tiddler='MissingTiddler' one='Ferret'>
+	<$value $name="missing">
+		<$parameters one='Ferret'>
+			Badger
+			<$text text=<<one>>/>
+		</$parameters>
+	</$value>
+</$ubertransclude>
+_
+title: TiddlerOne
+
+\whitespace trim
+<$parameters one='Kangaroo'>
+	Piranha
+	<$text text=<<one>>/>
+</$parameters>
+_
+title: ExpectedResult
+
+<p>PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret</p>
\ No newline at end of file