SimonG
/
LightweightIocContainer
mirror of https://github.com/SimonG96/LightweightIocContainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: SimonG:e4fed15a2af6d35e887f64126c6f58f43020f241
Branches Tags
SimonG:ImplementExpressionTrees
SimonG:master
..
compare: SimonG:f3d17117fc372a61fc8e16295d2dc911f6ca8b79
Branches Tags
SimonG:ImplementExpressionTrees
SimonG:master

No commits in common. 'e4fed15a2af6d35e887f64126c6f58f43020f241' and 'f3d17117fc372a61fc8e16295d2dc911f6ca8b79' have entirely different histories.
e4fed15a2a ... f3d17117fc

8 changed files with 23 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 1
      Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs
  2. 13
      Debug.LightweightIocContainer.FactoryGenerator/Samples/Factories/IGenericSampleFactory.cs
  3. 7
      Debug.LightweightIocContainer.FactoryGenerator/Samples/Interfaces/IOtherSample.cs
  4. 9
      Debug.LightweightIocContainer.FactoryGenerator/Samples/OtherSample.cs
  5. 56
      LightweightIocContainer.FactoryGenerator/FactoryGenerator.cs
  6. 2
      LightweightIocContainer.FactoryGenerator/LightweightIocContainer.FactoryGenerator.csproj
  7. 2
      LightweightIocContainer.Validation/LightweightIocContainer.Validation.csproj
  8. 2
      LightweightIocContainer/LightweightIocContainer.csproj

1
Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs
Unescape View File

@ -16,6 +16,5 @@ public class SampleInstaller : IIocInstaller
public void Install(IRegistrationCollector registration)
{
registration.Add<ISampleClass, SampleClass>().WithGeneratedFactory<ISampleClassFactory>();
registration.Add<IOtherSample, OtherSample>().WithGeneratedFactory<IGenericSampleFactory<IOtherSample>>();
}
}

13
Debug.LightweightIocContainer.FactoryGenerator/Samples/Factories/IGenericSampleFactory.cs
Unescape View File

@ -1,13 +0,0 @@
// Author: Simon.Gockner
// Created: 2025-12-05
// Copyright(c) 2025 SimonG. All Rights Reserved.
using Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
namespace Debug.LightweightIocContainer.FactoryGenerator.Samples.Factories;
public interface IGenericSampleFactory<T> where T : IOtherSample
{
T Create();
IOtherSample Create<U>(T parameter, U parameter2) where U : T;
}

7
Debug.LightweightIocContainer.FactoryGenerator/Samples/Interfaces/IOtherSample.cs
Unescape View File

@ -1,7 +0,0 @@
// Author: Simon.Gockner
// Created: 2025-12-05
// Copyright(c) 2025 SimonG. All Rights Reserved.
namespace Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
public interface IOtherSample;

9
Debug.LightweightIocContainer.FactoryGenerator/Samples/OtherSample.cs
Unescape View File

@ -1,9 +0,0 @@
// Author: Simon.Gockner
// Created: 2025-12-05
// Copyright(c) 2025 SimonG. All Rights Reserved.
using Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
namespace Debug.LightweightIocContainer.FactoryGenerator.Samples;
public class OtherSample : IOtherSample;

56
LightweightIocContainer.FactoryGenerator/FactoryGenerator.cs
Unescape View File

@ -73,7 +73,7 @@ public class FactoryGenerator : IIncrementalGenerator
if (!genericNameSyntax.ToString().StartsWith("WithGeneratedFactory"))
return false;
if (genericNameSyntax.TypeArgumentList.Arguments[0] is not (IdentifierNameSyntax or GenericNameSyntax))
if (genericNameSyntax.TypeArgumentList.Arguments[0] is not IdentifierNameSyntax)
return false;
return true;
@ -84,10 +84,10 @@ public class FactoryGenerator : IIncrementalGenerator
if (syntaxContext.Node is not GenericNameSyntax genericNameSyntax)
return null;
if (genericNameSyntax.TypeArgumentList.Arguments[0] is not SimpleNameSyntax nameSyntax)
if (genericNameSyntax.TypeArgumentList.Arguments[0] is not IdentifierNameSyntax identifierNameSyntax)
return null;
if (syntaxContext.SemanticModel.GetSymbolInfo(nameSyntax).Symbol is not ITypeSymbol typeSymbol)
if (syntaxContext.SemanticModel.GetSymbolInfo(identifierNameSyntax).Symbol is not ITypeSymbol typeSymbol)
return null;
return typeSymbol;
@ -140,9 +140,9 @@ public class FactoryGenerator : IIncrementalGenerator
if (symbol is not ITypeSymbol type)
continue;
stringBuilder.AppendLine($"{INDENT}{INDENT}if (typeof(TFactory) == typeof({GetTypeText(type, false)}))");
stringBuilder.AppendLine($"{INDENT}{INDENT}if (typeof(TFactory) == typeof({type.Name}))");
stringBuilder.AppendLine($"{INDENT}{INDENT}{{");
stringBuilder.AppendLine($"{INDENT}{INDENT}{INDENT}return (TFactory) (object) new Generated{GetTypeText(type, false)}(container);");
stringBuilder.AppendLine($"{INDENT}{INDENT}{INDENT}return (TFactory) (object) new Generated{type.Name}(container);");
stringBuilder.AppendLine($"{INDENT}{INDENT}}}");
stringBuilder.AppendLine();
}
@ -157,6 +157,7 @@ public class FactoryGenerator : IIncrementalGenerator
private string GenerateFactorySourceCode(ITypeSymbol typeSymbol)
{
string typeName = typeSymbol.Name;
string? typeNamespace = typeSymbol.ContainingNamespace.IsGlobalNamespace ? null : typeSymbol.ContainingNamespace.ToString();
StringBuilder stringBuilder = new();
@ -194,12 +195,7 @@ public class FactoryGenerator : IIncrementalGenerator
stringBuilder.AppendLine();
}
stringBuilder.Append($"public class Generated{GetGenericTypeText(typeSymbol)}(IocContainer container) : {GetGenericTypeText(typeSymbol)}");
if (typeSymbol is INamedTypeSymbol { IsGenericType: true } genericTypeSymbol)
stringBuilder.Append(GetParameterConstraintsText(genericTypeSymbol));
stringBuilder.AppendLine();
stringBuilder.AppendLine($"public class Generated{typeName}(IocContainer container) : {typeName}");
stringBuilder.AppendLine("{");
foreach (ISymbol? member in members)
@ -209,20 +205,20 @@ public class FactoryGenerator : IIncrementalGenerator
if (!method.ReturnsVoid) //create method
{
stringBuilder.Append($"{INDENT}public {GetTypeText(method.OriginalDefinition.ReturnType)} {method.Name}");
stringBuilder.Append($"{INDENT}public {GetTypeText(method.ReturnType)} {method.Name}");
if (method.IsGenericMethod)
stringBuilder.Append(GetGenericParameters(method.OriginalDefinition));
stringBuilder.Append(GetGenericParameters(method));
stringBuilder.Append($"({string.Join(", ", method.OriginalDefinition.Parameters.Select(GetParameterText))})");
stringBuilder.Append($"({string.Join(", ", method.Parameters.Select(GetParameterText))})");
if (method.IsGenericMethod)
stringBuilder.Append(GetParameterConstraintsText(method.OriginalDefinition));
stringBuilder.Append(GetParameterConstraintsText(method));
stringBuilder.AppendLine();
stringBuilder.AppendLine($"{INDENT}{{");
foreach (IParameterSymbol parameter in method.OriginalDefinition.Parameters)
foreach (IParameterSymbol parameter in method.Parameters)
{
stringBuilder.AppendLine($"{INDENT}{INDENT}object? {parameter.Name}Value = {parameter.Name};");
stringBuilder.AppendLine($"{INDENT}{INDENT}if ({parameter.Name}Value is null)");
@ -231,17 +227,17 @@ public class FactoryGenerator : IIncrementalGenerator
}
//don't use getTypeText here, because we need the raw type name for Task<>
if (method.OriginalDefinition.ReturnType is INamedTypeSymbol { IsGenericType: true } namedTypeSymbol)
if (method.ReturnType is INamedTypeSymbol { IsGenericType: true } namedTypeSymbol)
{
if (method.OriginalDefinition.ReturnType.Name == "Task")
if (method.ReturnType.Name == "Task")
stringBuilder.Append($"{INDENT}{INDENT}return container.FactoryResolveAsync{GetGenericArguments(namedTypeSymbol)}(");
else
stringBuilder.Append($"{INDENT}{INDENT}return container.FactoryResolve<{method.OriginalDefinition.ReturnType.Name}{GetGenericArguments(namedTypeSymbol)}>(");
stringBuilder.Append($"{INDENT}{INDENT}return container.FactoryResolve<{method.ReturnType.Name}{GetGenericArguments(namedTypeSymbol)}>(");
}
else
stringBuilder.Append($"{INDENT}{INDENT}return container.FactoryResolve<{method.OriginalDefinition.ReturnType.Name}>(");
stringBuilder.Append($"{INDENT}{INDENT}return container.FactoryResolve<{method.ReturnType.Name}>(");
stringBuilder.Append(string.Join(", ", method.OriginalDefinition.Parameters.Select(p => $"{p.Name}Value")));
stringBuilder.Append(string.Join(", ", method.Parameters.Select(p => $"{p.Name}Value")));
stringBuilder.AppendLine(");");
stringBuilder.AppendLine($"{INDENT}}}");
@ -301,33 +297,19 @@ public class FactoryGenerator : IIncrementalGenerator
return stringBuilder.ToString();
}
private string GetGenericTypeText(ITypeSymbol typeSymbol)
{
StringBuilder stringBuilder = new();
stringBuilder.Append(typeSymbol.Name);
if (typeSymbol is INamedTypeSymbol { IsGenericType: true } namedTypeSymbol)
stringBuilder.Append(GetGenericParameters(namedTypeSymbol));
return stringBuilder.ToString();
}
private string GetParameterText(IParameterSymbol parameter) => $"{GetTypeText(parameter.Type)} {parameter.Name}";
private string GetGenericArguments(INamedTypeSymbol namedTypeSymbol) => GetGenericArguments(namedTypeSymbol.TypeArguments);
private string GetGenericArguments(IMethodSymbol methodSymbol) => GetGenericArguments(methodSymbol.TypeArguments);
private string GetGenericArguments(ImmutableArray<ITypeSymbol> typeArguments) => $"<{string.Join(", ", typeArguments.Select(GetTypeText))}>";
private string GetGenericParameters(INamedTypeSymbol namedTypeSymbol) => GetGenericParameters(namedTypeSymbol.TypeParameters);
private string GetGenericParameters(IMethodSymbol methodSymbol) => GetGenericParameters(methodSymbol.TypeParameters);
private string GetGenericParameters(ImmutableArray<ITypeParameterSymbol> typeParameters) => $"<{string.Join(", ", typeParameters.Select(GetTypeText))}>";
private string GetParameterConstraintsText(INamedTypeSymbol namedTypeSymbol) => GetParameterConstraintsText(namedTypeSymbol.TypeParameters);
private string GetParameterConstraintsText(IMethodSymbol method) => GetParameterConstraintsText(method.TypeParameters);
private string GetParameterConstraintsText(ImmutableArray<ITypeParameterSymbol> typeParameters)
private string GetParameterConstraintsText(IMethodSymbol method)
{
StringBuilder stringBuilder = new();
foreach (ITypeParameterSymbol typeParameter in typeParameters)
foreach (ITypeParameterSymbol typeParameter in method.TypeParameters)
{
List<string> parameterConstraints = GetParameterConstraints(typeParameter);
if (parameterConstraints.Count == 0)

2
LightweightIocContainer.FactoryGenerator/LightweightIocContainer.FactoryGenerator.csproj
Unescape View File

@ -12,7 +12,7 @@
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<IsRoslynComponent>true</IsRoslynComponent>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta3</VersionSuffix>
<VersionSuffix>beta2</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

2
LightweightIocContainer.Validation/LightweightIocContainer.Validation.csproj
Unescape View File

@ -11,7 +11,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<DocumentationFile>LightweightIocContainer.Validation.xml</DocumentationFile>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta3</VersionSuffix>
<VersionSuffix>beta2</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

2
LightweightIocContainer/LightweightIocContainer.csproj
Unescape View File

@ -11,7 +11,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<DocumentationFile>LightweightIocContainer.xml</DocumentationFile>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta3</VersionSuffix>
<VersionSuffix>beta2</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

Write Preview
Loading…
Cancel
Save