Skip to content

Commit 0998a4e

Browse files
kai-melchiorkai-melchior
committed
Angular
 - write model command added - write service command added AspDotNet - read controller command added - examples for attributes added Core - run multiple commands in same scope Reflection - read command added
1 parent 9edaa09 commit 0998a4e

File tree

75 files changed

+971
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+971
-97
lines changed

‎Angular/AngularModule.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public override void Initialize()
1818
{
1919
this.DependencyResolver.Bind<IGeneratorCommand>().To<GenerateAngularConfig>();
2020
this.DependencyResolver.Get<ConfigurationMapping>().Map<AngularWriteConfiguration, AngularWriter>("angular");
21+
this.DependencyResolver.Bind<IGeneratorCommand>().To<AngularServiceCommand>();
22+
this.DependencyResolver.Bind<IGeneratorCommand>().To<AngularModelCommand>();
2123
}
2224
}
2325
}

‎Angular/Commands/AngularModelCommand.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System.Collections.Generic;
2+
using KY.Core.Dependency;
3+
using KY.Generator.Angular.Configurations;
4+
using KY.Generator.Angular.Writers;
5+
using KY.Generator.Command;
6+
using KY.Generator.Models;
7+
using KY.Generator.Output;
8+
using KY.Generator.Templates;
9+
10+
namespace KY.Generator.Angular.Commands
11+
{
12+
internal class AngularModelCommand : IGeneratorCommand, IUseGeneratorCommandEnvironment
13+
{
14+
private readonly IDependencyResolver resolver;
15+
public string[] Names { get; } = { "angular-model" };
16+
public GeneratorEnvironment Environment { get; set; }
17+
18+
public AngularModelCommand(IDependencyResolver resolver)
19+
{
20+
this.resolver = resolver;
21+
}
22+
23+
public bool Generate(CommandConfiguration configuration, ref IOutput output)
24+
{
25+
AngularWriteConfiguration writeConfiguration = new AngularWriteConfiguration(configuration);
26+
writeConfiguration.FormatNames = configuration.Parameters.GetBool(nameof(AngularWriteConfiguration.FormatNames), true);
27+
writeConfiguration.Model = new AngularWriteModelConfiguration();
28+
writeConfiguration.Model.Namespace = configuration.Parameters.GetString(nameof(AngularWriteModelConfiguration.Namespace));
29+
writeConfiguration.Model.RelativePath = configuration.Parameters.GetString(nameof(AngularWriteModelConfiguration.RelativePath));
30+
writeConfiguration.Model.SkipNamespace = configuration.Parameters.GetBool(nameof(AngularWriteModelConfiguration.SkipNamespace), true);
31+
writeConfiguration.Model.PropertiesToFields = configuration.Parameters.GetBool(nameof(AngularWriteModelConfiguration.PropertiesToFields), true);
32+
writeConfiguration.Model.FieldsToProperties = configuration.Parameters.GetBool(nameof(AngularWriteModelConfiguration.FieldsToProperties));
33+
writeConfiguration.Model.FormatNames = configuration.Parameters.GetBool(nameof(AngularWriteModelConfiguration.FormatNames), true);
34+
35+
List<FileTemplate> files = new List<FileTemplate>();
36+
this.resolver.Create<AngularModelWriter>().Write(writeConfiguration, this.Environment.TransferObjects, files);
37+
IOutput localOutput = output;
38+
files.ForEach(file => writeConfiguration.Language.Write(file, localOutput));
39+
40+
return true;
41+
}
42+
}
43+
}

‎Angular/Commands/AngularServiceCommand.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using System.Collections.Generic;
2+
using KY.Core.Dependency;
3+
using KY.Generator.Angular.Configurations;
4+
using KY.Generator.Angular.Writers;
5+
using KY.Generator.Command;
6+
using KY.Generator.Models;
7+
using KY.Generator.Output;
8+
using KY.Generator.Templates;
9+
10+
namespace KY.Generator.Angular.Commands
11+
{
12+
internal class AngularServiceCommand : IGeneratorCommand, IUseGeneratorCommandEnvironment
13+
{
14+
private readonly IDependencyResolver resolver;
15+
public string[] Names { get; } = { "angular-service" };
16+
public GeneratorEnvironment Environment { get; set; }
17+
18+
public AngularServiceCommand(IDependencyResolver resolver)
19+
{
20+
this.resolver = resolver;
21+
}
22+
23+
public bool Generate(CommandConfiguration configuration, ref IOutput output)
24+
{
25+
AngularWriteConfiguration writeConfiguration = new AngularWriteConfiguration(configuration);
26+
writeConfiguration.FormatNames = configuration.Parameters.GetBool(nameof(AngularWriteConfiguration.FormatNames), true);
27+
writeConfiguration.Service = new AngularWriteServiceConfiguration();
28+
writeConfiguration.Service.Name = configuration.Parameters.GetString(nameof(AngularWriteServiceConfiguration.Name));
29+
writeConfiguration.Service.RelativePath = configuration.Parameters.GetString(nameof(AngularWriteServiceConfiguration.RelativePath));
30+
writeConfiguration.Model.RelativePath = configuration.Parameters.GetString("RelativeModelPath");
31+
32+
List<FileTemplate> files = new List<FileTemplate>();
33+
this.resolver.Create<AngularServiceWriter>().Write(writeConfiguration, this.Environment.TransferObjects, files);
34+
IOutput localOutput = output;
35+
files.ForEach(file => writeConfiguration.Language.Write(file, localOutput));
36+
37+
return true;
38+
}
39+
}
40+
}

‎Angular/Configurations/AngularWriteConfiguration.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ public class AngularWriteConfiguration : ConfigurationBase, IFormattableConfigur
1010
public bool FormatNames { get; set; }
1111
public bool WriteModels { get; set; }
1212

13-
public AngularWriteConfiguration()
13+
public AngularWriteConfiguration(ConfigurationBase copyFrom = null)
1414
{
15+
if (copyFrom != null)
16+
{
17+
this.CopyBaseFrom(copyFrom);
18+
}
1519
this.Language = new AngularTypeScriptLanguage();
1620
this.FormatNames = true;
1721
this.WriteModels = true;

‎Angular/KY.Generator.Angular.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>KY-Programming</Authors>
66
<Company>KY-Programming</Company>
77
<Product>KY.Generator</Product>
8-
<Version>4.0.0-rc.2</Version>
8+
<Version>4.0.0-rc.3</Version>
99
<Copyright>2020 - KY-Programming</Copyright>
1010
<Description>Angular Module for KY-Generator
1111
Download KY.Generator.CLI to use this module</Description>

‎AspDotNet/AspDotNetModule.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using KY.Core.Dependency;
22
using KY.Core.Module;
3+
using KY.Generator.AspDotNet.Commands;
34
using KY.Generator.AspDotNet.Configurations;
45
using KY.Generator.AspDotNet.Readers;
56
using KY.Generator.AspDotNet.Writers;
7+
using KY.Generator.Command;
68
using KY.Generator.Configuration;
79

810
namespace KY.Generator.AspDotNet
@@ -19,6 +21,7 @@ public override void Initialize()
1921
.Map<AspDotNetReadConfiguration, AspDotNetReader>("asp")
2022
.Map<AspDotNetWriteConfiguration, AspDotNetWriter>("asp")
2123
.Map<AspDotNetCoreWriteConfiguration, AspDotNetWriter>("asp-core");
24+
this.DependencyResolver.Bind<IGeneratorCommand>().To<AspDotNetReadControllerCommand>();
2225
}
2326
}
2427
}

‎AspDotNet/Commands/AspDotNetReadControllerCommand.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using KY.Core.Dependency;
2+
using KY.Generator.AspDotNet.Configurations;
3+
using KY.Generator.AspDotNet.Readers;
4+
using KY.Generator.Command;
5+
using KY.Generator.Models;
6+
using KY.Generator.Output;
7+
8+
namespace KY.Generator.AspDotNet.Commands
9+
{
10+
internal class AspDotNetReadControllerCommand : IGeneratorCommand, IUseGeneratorCommandEnvironment
11+
{
12+
private readonly IDependencyResolver resolver;
13+
public string[] Names { get; } = { "asp-read-controller" };
14+
public GeneratorEnvironment Environment { get; set; }
15+
16+
public AspDotNetReadControllerCommand(IDependencyResolver resolver)
17+
{
18+
this.resolver = resolver;
19+
}
20+
21+
public bool Generate(CommandConfiguration configuration, ref IOutput output)
22+
{
23+
AspDotNetReadConfiguration readConfiguration = new AspDotNetReadConfiguration();
24+
readConfiguration.Controller = new AspDotNetReadControllerConfiguration();
25+
readConfiguration.Controller.Namespace = configuration.Parameters.GetString(nameof(AspDotNetReadControllerConfiguration.Namespace));
26+
readConfiguration.Controller.Name = configuration.Parameters.GetString(nameof(AspDotNetReadControllerConfiguration.Name));
27+
28+
this.resolver.Create<AspDotNetControllerReader>().Read(readConfiguration, this.Environment.TransferObjects);
29+
30+
return true;
31+
}
32+
}
33+
}

‎AspDotNet/KY.Generator.AspDotNet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Company>KY-Programming</Company>
66
<Authors>KY-Programming</Authors>
7-
<Version>4.0.0-rc.2</Version>
7+
<Version>4.0.0-rc.3</Version>
88
<Product>KY.Generator</Product>
99
<Description>ASP.net Module for KY-Generator
1010
Download KY.Generator.CLI to use this module</Description>

‎CLI.Core.Full/KY.Generator.CLI.Core.Full.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.2</TargetFramework>
6-
<Version>4.0.0-rc.2</Version>
6+
<Version>4.0.0-rc.3</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2020 - KY-Programming</Copyright>

‎CLI.Core.Full/nuget.nuspec‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Core.Full</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>4.0.0-rc.2</version>
6+
<version>4.0.0-rc.3</version>
77
<title>KY.Generator.CLI.Core.Full</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>
@@ -18,17 +18,17 @@ Generate classes from oData, .NET assembly, JSON or TSQL to C# or TypeScript. Su
1818
<copyright>Copyright 2020</copyright>
1919
<tags>KY-Generator KY Generator .netCore CLI</tags>
2020
<dependencies>
21-
<dependency id="KY.Generator.Angular" version="4.0.0-rc.2" />
22-
<dependency id="KY.Generator.AspDotNet" version="4.0.0-rc.2" />
23-
<dependency id="KY.Generator.Core" version="4.0.0-rc.2" />
24-
<dependency id="KY.Generator.Csharp" version="4.0.0-rc.2" />
25-
<dependency id="KY.Generator.EntityFramework" version="4.0.0-rc.2" />
26-
<dependency id="KY.Generator.Json" version="4.0.0-rc.2" />
27-
<dependency id="KY.Generator.OData" version="4.0.0-rc.2" />
28-
<dependency id="KY.Generator.OpenApi" version="4.0.0-rc.2" />
29-
<dependency id="KY.Generator.Reflection" version="4.0.0-rc.2" />
30-
<dependency id="KY.Generator.Tsql" version="4.0.0-rc.2" />
31-
<dependency id="KY.Generator.TypeScript" version="4.0.0-rc.2" />
21+
<dependency id="KY.Generator.Angular" version="4.0.0-rc.3" />
22+
<dependency id="KY.Generator.AspDotNet" version="4.0.0-rc.3" />
23+
<dependency id="KY.Generator.Core" version="4.0.0-rc.3" />
24+
<dependency id="KY.Generator.Csharp" version="4.0.0-rc.3" />
25+
<dependency id="KY.Generator.EntityFramework" version="4.0.0-rc.3" />
26+
<dependency id="KY.Generator.Json" version="4.0.0-rc.3" />
27+
<dependency id="KY.Generator.OData" version="4.0.0-rc.3" />
28+
<dependency id="KY.Generator.OpenApi" version="4.0.0-rc.3" />
29+
<dependency id="KY.Generator.Reflection" version="4.0.0-rc.3" />
30+
<dependency id="KY.Generator.Tsql" version="4.0.0-rc.3" />
31+
<dependency id="KY.Generator.TypeScript" version="4.0.0-rc.3" />
3232
</dependencies>
3333
</metadata>
3434
<files>

0 commit comments

Comments
 (0)