Skip to content

[Source Gen] Parse named args by type correctly #1877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
satvu merged 5 commits into from
Aug 31, 2023
Merged

[Source Gen] Parse named args by type correctly #1877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f07100f
initial wip, parse named args by type
satvu Aug 30, 2023
7e6205b
resolve comments
satvu Aug 31, 2023
ce27a4c
add release notes
satvu Aug 31, 2023
22041d5
fix release notes link
satvu Aug 31, 2023
5d4b0e1
Update sdk/release_notes.md
satvu Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 46 additions & 29 deletions ....Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,14 @@ private bool TryGetAttributeProperties(AttributeData attributeData, Location? at
}
else
{
attrProperties[namedArgument.Key] = namedArgument.Value.Value;
if (TryParseValueByType(namedArgument.Value, out object? argValue))
{
attrProperties[namedArgument.Key] = argValue;
}
else
{
// throw diagnostic error
}
}
}
}
Expand Down Expand Up @@ -657,7 +664,7 @@ private bool TryGetAttributeProperties(AttributeData attributeData, Location? at
return true;
}

private bool TryLoadConstructorArguments(AttributeData attributeData, IDictionary<string, object?> dict, Location? attribLocation)
private bool TryLoadConstructorArguments(AttributeData attributeData, IDictionary<string, object?> argsDict, Location? attribLocation)
Comment thread
satvu marked this conversation as resolved.
Outdated
{
IMethodSymbol? attribMethodSymbol = attributeData.AttributeConstructor;

Expand All @@ -677,41 +684,51 @@ private bool TryLoadConstructorArguments(AttributeData attributeData, IDictionar

var arg = attributeData.ConstructorArguments[i];

switch (arg.Kind)
if (TryParseValueByType(arg, out object? argValue))
{
case TypedConstantKind.Error:
break;
argsDict[argumentName] = argValue;
}
else
{
// throw diagnostic error
}
}

case TypedConstantKind.Primitive:
dict[argumentName] = arg.Value;
break;
return true;
}

case TypedConstantKind.Enum:
var enumValue = arg.Type!.GetMembers()
.FirstOrDefault(m => m is IFieldSymbol field
&& field.ConstantValue is object value
&& value.Equals(arg.Value));
private bool TryParseValueByType(TypedConstant attributeArg, out object? argValue)
{
argValue = null;

if (enumValue is null)
{
return false;
}
switch (attributeArg.Kind)
{
case TypedConstantKind.Primitive:
argValue = attributeArg.Value;
break;

// we want just the enumValue symbol's name (Admin, Anonymous, Function)
dict[argumentName] = enumValue.Name;
break;
case TypedConstantKind.Enum:
var enumValue = attributeArg.Type!.GetMembers()
.FirstOrDefault(m => m is IFieldSymbol field
&& field.ConstantValue is object value
&& value.Equals(attributeArg.Value));

case TypedConstantKind.Type:
break;
if (enumValue is null)
{
return false;
}

case TypedConstantKind.Array:
var arrayValues = arg.Values.Select(a => a.Value?.ToString()).ToArray();
dict[argumentName] = arrayValues;
break;
// we want just the enumValue symbol's name (ex: Admin, Anonymous, Function)
argValue = enumValue.Name;
break;

default:
break;
}
case TypedConstantKind.Array:
var arrayValues = attributeArg.Values.Select(a => a.Value?.ToString()).ToArray();
argValue = arrayValues;
break;

default:
Comment thread
satvu marked this conversation as resolved.
Outdated
break;
}

return true;
Comment thread
satvu marked this conversation as resolved.
Outdated
Expand Down
4 changes: 2 additions & 2 deletions test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/StorageBindingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public string QueueToBlob(
[Function("BlobToQueueFunction")]
[QueueOutput("queue2")]
public object BlobToQueue(
[BlobTrigger("container2/%file%")] string blob)
[BlobTrigger("container2/%file%", Source = BlobTriggerSource.EventGrid)] string blob)
{
throw new NotImplementedException();
}
Expand Down Expand Up @@ -206,7 +206,7 @@ public Task<ImmutableArray<IFunctionMetadata>> GetFunctionMetadataAsync(string d
metadataList.Add(Function0);
var Function1RawBindings = new List<string>();
Function1RawBindings.Add(@"{""name"":""$return"",""type"":""Queue"",""direction"":""Out"",""queueName"":""queue2""}");
Function1RawBindings.Add(@"{""name"":""blob"",""type"":""BlobTrigger"",""direction"":""In"",""properties"":{""supportsDeferredBinding"":""True""},""path"":""container2/%file%"",""dataType"":""String""}");
Function1RawBindings.Add(@"{""name"":""blob"",""type"":""BlobTrigger"",""direction"":""In"",""properties"":{""supportsDeferredBinding"":""True""},""path"":""container2/%file%"",""source"":""EventGrid"",""dataType"":""String""}");

var Function1 = new DefaultFunctionMetadata
{
Expand Down