Adding support for optional parameters when resolving dynamic schemas.

Author: riosn-n

src/libraries/Microsoft.PowerFx.Connectors/ConnectorFunction.cs

@@ -1449,23 +1449,25 @@ private FormulaValue[] GetArguments(ConnectorDynamicApi dynamicApi, NamedValue[]
 
             ConnectorFunction functionToBeCalled = EnsureConnectorFunction(dynamicApi, GlobalContext.FunctionList).ConnectorFunction;
 
-            foreach (ConnectorParameter connectorParameter in functionToBeCalled.RequiredParameters)
+            var parameters = functionToBeCalled.RequiredParameters.Union(functionToBeCalled.OptionalParameters);
+
+            foreach (ConnectorParameter connectorParameter in parameters)
             {
-                string requiredParameterName = connectorParameter.Name;
+                string parameterName = connectorParameter.Name;
 
-                // TODO: properly implement the ability to reference child properties instead of simplistic check "GetLastPart(kvp.Key) == requiredParameterName"
+                // TODO: properly implement the ability to reference child properties instead of simplistic check "GetLastPart(kvp.Key) == parameterName"
                 // doc: https://learn.microsoft.com/en-us/connectors/custom-connectors/openapi-extensions
                 // e.g. make this example working:
                 // "destinationInputParam1/property1": {
                 //    "parameterReference": "sourceInputParam1/property1"
                 // }
-                if (dynamicApi.ParameterMap.FirstOrDefault(kvp => kvp.Value is StaticConnectorExtensionValue && GetLastPart(kvp.Key) == requiredParameterName).Value is StaticConnectorExtensionValue sValue)
+                if (dynamicApi.ParameterMap.FirstOrDefault(kvp => kvp.Value is StaticConnectorExtensionValue && GetLastPart(kvp.Key) == parameterName).Value is StaticConnectorExtensionValue sValue)
                 {
                     arguments.Add(sValue.Value);
                     continue;
                 }
 
-                KeyValuePair<string, IConnectorExtensionValue> dValue = dynamicApi.ParameterMap.FirstOrDefault(kvp => kvp.Value is DynamicConnectorExtensionValue dv && GetLastPart(kvp.Key) == requiredParameterName);
+                KeyValuePair<string, IConnectorExtensionValue> dValue = dynamicApi.ParameterMap.FirstOrDefault(kvp => kvp.Value is DynamicConnectorExtensionValue dv && GetLastPart(kvp.Key) == parameterName);
                 string[] referenceList = ((DynamicConnectorExtensionValue)dValue.Value).Reference.Split('/');
 
                 var parameterToUse = knownParameters.FirstOrDefault(nv => nv.Name == referenceList.First())?.Value;

src/libraries/Microsoft.PowerFx.Connectors/Execution/HttpFunctionInvoker.cs

@@ -209,7 +209,6 @@ public async Task<HttpRequestMessage> BuildRequest(IReadOnlyList<FormulaValue> a
         public Dictionary<string, FormulaValue> ConvertToNamedParameters(IReadOnlyList<FormulaValue> args)
         {
             // First N are required params.
-            // Last param is a record with each field being an optional.
             // Parameter names are case sensitive.
 
             Dictionary<string, FormulaValue> map = new ();
@@ -225,11 +224,12 @@ public Dictionary<string, FormulaValue> ConvertToNamedParameters(IReadOnlyList<F
             {
                 map[param.Name] = param.DefaultValue;
             }
+
+            var parameters = _function.RequiredParameters.Union(_function.OptionalParameters).ToArray();
 
-            // Required parameters are always first
-            for (int i = 0; i < _function.RequiredParameters.Length; i++)
+            for (var i = 0; i < args.Count; i++)
             {
-                string parameterName = _function.RequiredParameters[i].Name;
+                string parameterName = parameters[i].Name;
                 FormulaValue paramValue = args[i];
 
                 // Objects are always flattenned
@@ -254,34 +254,6 @@ public Dictionary<string, FormulaValue> ConvertToNamedParameters(IReadOnlyList<F
                 }
             }
 
-            // Optional parameters are next and stored in a Record
-            if (_function.OptionalParameters.Length > 0 && args.Count > _function.RequiredParameters.Length)
-            {
-                FormulaValue optionalArg = args[args.Count - 1];
-
-                // Objects are always flattenned
-                if (optionalArg is RecordValue record)
-                {
-                    foreach (NamedValue field in record.Fields)
-                    {
-                        if (map.ContainsKey(field.Name))
-                        {
-                            // if optional parameters are defined and a default value is already present
-                            map[field.Name] = field.Value;
-                        }
-                        else
-                        {
-                            map.Add(field.Name, field.Value);
-                        }
-                    }
-                }
-                else
-                {
-                    // Type check should have caught this.
-                    throw new PowerFxConnectorException($"Optional arguments must be the last argument and a record");
-                }
-            }
-
             return map;
         }