From 683414f51ee440f3c4451efaa3425174a33f3afd Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Mon, 23 Jan 2023 16:34:08 +0000
Subject: [PATCH] Fix positional parameters in widget.evaluateVariable()

This should clear up the remaining anomalies in #7009, let me know how you get on @btheado
---
 core/modules/widgets/widget.js                | 21 +++++--------
 .../Parameterised-Positional-Variables.tid    | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid

diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js
index aff1b0e8b..741914fdc 100755
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -172,8 +172,8 @@ Widget.prototype.getVariable = function(name,options) {
 
 /*
 Maps actual parameters onto formal parameters, returning an array of {name:,value:} objects
-formalParams - {name:,default:} (default value is optional)
-actualParams - {name:,value:} (name is optional)
+formalParams - Array of {name:,default:} (default value is optional)
+actualParams - Array of string values or {name:,value:} (name is optional)
 */
 Widget.prototype.resolveVariableParameters = function(formalParams,actualParams) {
 	formalParams = formalParams || [];
@@ -187,7 +187,7 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
 		paramInfo = formalParams[p];
 		paramValue = undefined;
 		for(var m=0; m<actualParams.length; m++) {
-			if(actualParams[m].name === paramInfo.name) {
+			if(typeof actualParams[m] !== "string" && actualParams[m].name === paramInfo.name) {
 				paramValue = actualParams[m].value;
 			}
 		}
@@ -196,7 +196,8 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
 			nextAnonParameter++;
 		}
 		if(paramValue === undefined && nextAnonParameter < actualParams.length) {
-			paramValue = actualParams[nextAnonParameter++].value;
+			var param = actualParams[nextAnonParameter++];
+			paramValue = typeof param === "string" ? param : param.value;
 		}
 		// If we've still not got a value, use the default, if any
 		paramValue = paramValue || paramInfo["default"] || "";
@@ -317,6 +318,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
 		},
 		makeFakeWidgetWithVariables: self.makeFakeWidgetWithVariables,
 		evaluateVariable: self.evaluateVariable,
+		resolveVariableParameters: self.resolveVariableParameters,
 		wiki: self.wiki
 	};
 };
@@ -351,15 +353,8 @@ Widget.prototype.evaluateVariable = function(name,options) {
 		});
 		if($tw.utils.isArray(params)) {
 			// Parameters are an array of values or {name:, value:} pairs
-			$tw.utils.each(params,function(param,index) {
-				if(typeof param === "string") {
-					var paramInfo = variableInfo.srcVariable.params[index];
-					if(paramInfo) {
-						variables[paramInfo.name] = param;
-					}
-				} else {
-					variables[param.name] = param.value;
-				}
+			$tw.utils.each(this.resolveVariableParameters(variableInfo.srcVariable.params,params),function(param) {
+				variables[param.name] = param.value;
 			});
 		} else if(typeof params === "function") {
 			// Parameters are passed via a function
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid
new file mode 100644
index 000000000..ad2b7be52
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid
@@ -0,0 +1,30 @@
+title: Transclude/Parameterised/Positional/Variables
+description: Positional parameterised transclusion of variables
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\function myfunction(alpha:"apple",beta:"banana",gamma:"grenadine") [<alpha>]
+\define mymacro(alpha:"apple",beta:"banana",gamma:"grenadine") $beta$
+\function f(a) [<a>]
+
+(Functions:
+<$text text={{{ [<myfunction gamma:"unused" f1>] }}}/>
+,
+<$text text=<<myfunction gamma:"unused" f1>>/>
+,
+<<myfunction gamma:"unused" f1>>
+)(Macros:
+<$text text={{{ [<mymacro gamma:"unused" f1>] }}}/>
+,
+<$text text=<<mymacro gamma:"unused" f1>>/>
+,
+<<mymacro gamma:"unused" f1>>
+)
+
++
+title: ExpectedResult
+
+<p>(Functions:f1,f1,f1)(Macros:banana,banana,banana)</p>
\ No newline at end of file