Initial approach

boot/boot.js

@@ -575,9 +575,8 @@ var globalCheck =[
 	"    configurable: true",
 	"  });",
 	"  if(Object.keys(__temp__).length){",
-	"    console.log(Object.keys(__temp__));",
+	"    console.log(\"Warning: Global assignment detected\",Object.keys(__temp__));",
 	"    delete Object.prototype.__temp__;",
-	"    throw \"Global assignment is not allowed within modules on node.\";",
 	"  }",
 	"  delete Object.prototype.__temp__;",
 ].join('\n');

core/modules/widgets/transclude.js

@@ -41,43 +41,30 @@ TranscludeWidget.prototype.execute = function() {
 	this.collectAttributes();
 	this.collectStringParameters();
 	this.collectSlotFillParameters();
-	// Determine whether we're being used in inline or block mode
-	var parseAsInline = !this.parseTreeNode.isBlock;
-	if(this.transcludeMode === "inline") {
-		parseAsInline = true;
-	} else if(this.transcludeMode === "block") {
-		parseAsInline = false;
-	}
+	// Get the target text and parse tree nodes that we are transcluding
+	var target = this.getTransclusionTarget(),
+		parseTreeNodes;
+	this.sourceText = target.text;
+	this.parserType = target.type;
+	this.parseAsInline = target.parseAsInline;
 	// Set 'thisTiddler'
 	this.setVariable("thisTiddler",this.transcludeTitle);
-	var parseTreeNodes, target;
 	// Process the transclusion according to the output type
 	switch(this.transcludeOutput || "text/html") {
 		case "text/html":
-			// Return the parse tree nodes of the target
-			target = this.parseTransclusionTarget(parseAsInline);
-			this.parseAsInline = target.parseAsInline;
+			// Return the parse tree nodes
 			parseTreeNodes = target.parseTreeNodes;
 			break;
 		case "text/raw":
 			// Just return the raw text
-			target = this.getTransclusionTarget();
-			parseTreeNodes = [{type: "text", text: target.text}];
+			parseTreeNodes = [{type: "text", text: this.sourceText}];
 			break;
 		default:
-			// "text/plain" is the plain text result of wikifying the text
-			target = this.parseTransclusionTarget(parseAsInline);
-			var widgetNode = this.wiki.makeWidget(target.parser,{
-				parentWidget: this,
-				document: $tw.fakeDocument
-			});
-			var container = $tw.fakeDocument.createElement("div");
-			widgetNode.render(container,null);
-			parseTreeNodes = [{type: "text", text: container.textContent}];
+			// text/plain
+			var plainText = this.wiki.renderText("text/plain",this.parserType,this.sourceText,{parentWidget: this});
+			parseTreeNodes = [{type: "text", text: plainText}];
 			break;
 	}
-	this.sourceText = target.text;
-	this.parserType = target.type;
 	// Set the legacy transclusion context variables only if we're not transcluding a variable
 	if(!this.transcludeVariable) {
 		var recursionMarker = this.makeRecursionMarker();
@@ -174,44 +161,17 @@ TranscludeWidget.prototype.collectSlotFillParameters = function() {
 };
 
 /*
-Get transcluded details as an object {text:,type:}
+Get transcluded parse tree nodes as an object {text:,type:,parseTreeNodes:,parseAsInline:}
 */
 TranscludeWidget.prototype.getTransclusionTarget = function() {
 	var self = this;
-	var text;
-	// Return the text and type of the target
-	if(this.hasAttribute("$variable")) {
-		if(this.transcludeVariable) {
-			// Transcluding a variable
-			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-			text = variableInfo.text;
-			return {
-				text: variableInfo.text,
-				type: this.transcludeType
-			};
-		}
-	} else {
-		// Transcluding a text reference
-		var parserInfo = this.wiki.getTextReferenceParserInfo(
-						this.transcludeTitle,
-						this.transcludeField,
-						this.transcludeIndex,
-						{
-							subTiddler: this.transcludeSubTiddler,
-							defaultType: this.transcludeType
-						});
-		return {
-			text: parserInfo.text,
-			type: parserInfo.type
-		};
+	// Determine whether we're being used in inline or block mode
+	var parseAsInline = !this.parseTreeNode.isBlock;
+	if(this.transcludeMode === "inline") {
+		parseAsInline = true;
+	} else if(this.transcludeMode === "block") {
+		parseAsInline = false;
 	}
-};
-
-/*
-Get transcluded parse tree nodes as an object {text:,type:,parseTreeNodes:,parseAsInline:}
-*/
-TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
-	var self = this;
 	var parser;
 	// Get the parse tree
 	if(this.hasAttribute("$variable")) {
@@ -277,7 +237,7 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 							}
 							$tw.utils.addAttributeToParseTreeNode(parser.tree[0],name,param["default"])
 						});
-					} else if(srcVariable && !srcVariable.isFunctionDefinition) {
+					} else if(srcVariable && (srcVariable.isMacroDefinition || !srcVariable.isFunctionDefinition)) {
 						// For macros and ordinary variables, wrap the parse tree in a vars widget assigning the parameters to variables named "__paramname__"
 						parser = {
 							tree: [
@@ -309,13 +269,22 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 						});
 	}
 	// Return the parse tree
-	return {
-		parser: parser,
-		parseTreeNodes: parser ? parser.tree : (this.slotFillParseTrees["ts-missing"] || []),
-		parseAsInline: parseAsInline,
-		text: parser && parser.source,
-		type: parser && parser.type
-	};
+	if(parser) {
+		return {
+			parseTreeNodes: parser.tree,
+			parseAsInline: parseAsInline,
+			text: parser.source,
+			type: parser.type
+		};
+	} else {
+		// If there's no parse tree then return the missing slot value
+		return {
+			parseTreeNodes: (this.slotFillParseTrees["ts-missing"] || []),
+			parseAsInline: parseAsInline,
+			text: null,
+			type: null
+		};
+	}
 };
 
 /*

editions/test/tiddlers/tests/data/functions/WikifiedFunctions.tid

@@ -33,4 +33,4 @@ $param$ with a ''buffalo''
 +
 title: ExpectedResult
 
-<p>Going to lunch with a ''buffalo''</p><p>Going to breakfastwith a<strong>buffalo</strong></p><p>Going to dinner with a <strong>buffalo</strong></p>Going to lunch with a ''buffalo''Going to breakfastwith abuffaloGoing to dinner with a buffalo
+<p>Going to lunch with a ''buffalo''</p><p>Going to breakfastwith a<strong>buffalo</strong></p><p>Going to dinner with a <strong>buffalo</strong></p>Going to lunch with a buffalo with a buffaloGoing to dinner with a buffalo

editions/test/tiddlers/tests/data/transclude/Procedures-Double-Underscore.tid

@@ -1,26 +0,0 @@
-title: Procedures/Double/Underscore
-description: Checking that procedures don't expose parameters as variables wrapped in double underscores
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-\procedure mamacro(one:"red",two:"green")
-It is $one$ and $two$<<__one__>><<__two__>>.
-\end
-
-<$macrocall $name="mamacro"/>
-
-<$transclude $variable="mamacro"/>
-
-<$transclude $variable="mamacro" one="orange"/>
-
-<$transclude $variable="mamacro" 0="pink"/>
-
-<$transclude $variable="mamacro" one="purple" 1="pink"/>
-
-+
-title: ExpectedResult
-
-<p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p>