Skip to content

Commit 2811861

Browse files
authored
Merge pull request #6 from Codelisk/feature/versioning
versioning update
2 parents a604e9d + 73dc086 commit 2811861

6 files changed

Lines changed: 21 additions & 33 deletions

File tree

src/GeneratorHelper/Generators.Base/Extensions/ConstructorBuilderExtensions.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CodeGenHelpers;
1+
using System.Reflection.Metadata;
2+
using CodeGenHelpers;
23
using CodeGenHelpers.Internals;
34
using Microsoft.CodeAnalysis;
45
using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -69,14 +70,16 @@ public static ConstructorBuilder BaseConstructorParameterBaseCall(
6970

7071
public static ConstructorBuilder AddParameterWithBaseCall(
7172
this ConstructorBuilder c,
72-
string type,
73-
string parameter
73+
params (string type, string parameter)[] typesAndParameters
7474
)
7575
{
76-
c.AddParameter(type, parameter);
77-
7876
Dictionary<string, string> typeParameters = new Dictionary<string, string>();
79-
typeParameters.Add(type, parameter);
77+
foreach (var item in typesAndParameters)
78+
{
79+
c.AddParameter(item.type, item.parameter);
80+
81+
typeParameters.Add(item.type, item.parameter);
82+
}
8083
// Call the base constructor with the collected type parameters
8184
c.WithBaseCall(typeParameters);
8285

@@ -86,7 +89,7 @@ string parameter
8689
public static ConstructorBuilder BaseConstructorParameterBaseCall(
8790
this ConstructorBuilder c,
8891
ClassDeclarationSyntax baseClass,
89-
(string, string)? replaceTypeName = null
92+
params (string, string)[]? replaceTypeName
9093
)
9194
{
9295
// Get the first constructor from the base class
@@ -111,12 +114,12 @@ public static ConstructorBuilder BaseConstructorParameterBaseCall(
111114
var typeName = typeSyntax.ToString();
112115

113116
// Handle replacements if needed
114-
if (replaceTypeName.HasValue)
117+
if (replaceTypeName is not null && replaceTypeName.Any())
115118
{
116-
typeName = typeName.Replace(
117-
replaceTypeName.Value.Item1,
118-
replaceTypeName.Value.Item2
119-
);
119+
foreach (var item in replaceTypeName)
120+
{
121+
typeName = typeName.Replace(item.Item1, item.Item2);
122+
}
120123
}
121124

122125
// Add the type and parameter to the dictionary

src/Generators/Web/Codelisk.Controller.Generator/Generators/ControllerGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ ClassDeclarationSyntax baseController
9393
.AddAttribute(Constants.ControllerAttribute)
9494
.AddConstructor()
9595
.AddParameterWithBaseCall(
96-
"I" + dto.ManagerNameFromDto(),
97-
dto.ManagerNameFromDto().GetParameterName()
96+
("I" + dto.ManagerNameFromDto(), dto.ManagerNameFromDto().GetParameterName())
9897
)
9998
.Class;
10099

src/Generators/Web/WebManager.Generator/Generators/ManagerGenerator.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ RecordDeclarationSyntax foreignKeyDto
136136

137137
var result = constructor
138138
.AddParameterWithBaseCall(
139-
"I" + dto.RepositoryNameFromDto(),
140-
dto.RepositoryNameFromDto().GetParameterName()
139+
(
140+
"I" + dto.RepositoryNameFromDto(),
141+
dto.RepositoryNameFromDto().GetParameterName()
142+
),
143+
("DefaultManagerProvider", "defaultManagerProvider")
141144
)
142145
.Class;
143146

src/Generators/Web/WebRepositories.Generator/CodeBuilders/RepositoryInitializerCodeBuilder.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Generators/Web/WebRepositories.Generator/Generators/RepositoryGenerator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.CodeAnalysis;
1616
using Microsoft.CodeAnalysis.CSharp.Syntax;
1717
using WebGenerator.Base;
18-
using WebRepositories.Generator.CodeBuilders;
1918

2019
namespace WebRepositories.Generator.Generators
2120
{

src/Generators/Web/WebRepositories.Generator/Generators/RepositoryModuleInitializerGenerator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.CodeAnalysis;
1616
using Microsoft.CodeAnalysis.CSharp.Syntax;
1717
using WebGenerator.Base;
18-
using WebRepositories.Generator.CodeBuilders;
1918

2019
namespace WebRepositories.Generator.Generators
2120
{

0 commit comments

Comments
 (0)