Skip to content

Commit 70e2aa8

Browse files
ky-oneky-one
committed
Angular
 - url date parameters fixed
1 parent be054b9 commit 70e2aa8

33 files changed

+113
-60
lines changed

‎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>3.3.0-rc.1</Version>
8+
<Version>3.3.0-rc.2</Version>
99
<Copyright>2019 - KY-Programming</Copyright>
1010
<Description>Angular Module for KY-Generator
1111
Download KY.Generator.CLI to use this module</Description>

‎Angular/Writers/AngularServiceWriter.cs

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using KY.Core;
55
using KY.Core.DataAccess;
66
using KY.Generator.Angular.Configurations;
7+
using KY.Generator.Extensions;
78
using KY.Generator.Languages;
89
using KY.Generator.Mappings;
910
using KY.Generator.Templates;
@@ -52,6 +53,8 @@ public virtual void Write(AngularWriteConfiguration configuration, List<ITransfe
5253
classTemplate.AddConstructor().WithParameter(Code.Type(httpClient), "http")
5354
.WithCode(Code.This().Field(httpField).Assign(Code.Local("http")).Close());
5455
string relativeModelPath = FileSystem.RelativeTo(configuration.Model?.RelativePath ?? ".", configuration.Service.RelativePath);
56+
bool appendConvertAnyMethod = false;
57+
bool appendConvertDateMethod = false;
5558
foreach (HttpServiceActionTransferObject action in controller.Actions)
5659
{
5760
ICodeFragment errorCode = Code.Lambda("error", Code.Local("subject").Method("error", Code.Local("error")));
@@ -147,7 +150,16 @@ public virtual void Write(AngularWriteConfiguration configuration, List<ITransfe
147150
parameterUrl = parameterUrl.Append(Code.String($"&{parameter.Name}="));
148151
}
149152
isFirst = false;
150-
parameterUrl = parameterUrl.Append(Code.TypeScript($"({name} === undefined ? \"\" : {name})"));
153+
if (parameter.Type.IgnoreNullable().Name == "Date")
154+
{
155+
appendConvertDateMethod = true;
156+
parameterUrl = parameterUrl.Append(Code.This().Method("convertDate", Code.Local(name)));
157+
}
158+
else
159+
{
160+
appendConvertAnyMethod = true;
161+
parameterUrl = parameterUrl.Append(Code.This().Method("convertAny", Code.Local(name)));
162+
}
151163
}
152164

153165
methodTemplate.WithCode(
@@ -163,6 +175,30 @@ public virtual void Write(AngularWriteConfiguration configuration, List<ITransfe
163175
);
164176
methodTemplate.WithCode(Code.Return(Code.Local("subject")));
165177
}
178+
179+
if (appendConvertAnyMethod)
180+
{
181+
classTemplate.AddMethod("convertAny", Code.Type("string"))
182+
.WithParameter(Code.Type("any"), "value")
183+
.WithCode(Code.Return(Code.InlineIf(Code.Local("value").Equals().ForceNull().Or().Local("value").Equals().Undefined(),
184+
Code.Undefined(),
185+
Code.Local("value").Method("toString")
186+
)
187+
));
188+
}
189+
if (appendConvertDateMethod)
190+
{
191+
classTemplate.AddMethod("convertDate", Code.Type("string"))
192+
.WithParameter(Code.Type("Date"), "date")
193+
.WithCode(Code.Return(Code.InlineIf(Code.Local("date").Equals().ForceNull().Or().Local("date").Equals().Undefined(),
194+
Code.Undefined(),
195+
Code.InlineIf(Code.TypeScript($"typeof(date) === \"string\""),
196+
Code.Local("date"),
197+
Code.Local("date").Method("toISOString")
198+
)
199+
)
200+
));
201+
}
166202
}
167203
}
168204

‎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>3.3.0-rc.1</Version>
7+
<Version>3.3.0-rc.2</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>3.3.0-rc.1</Version>
6+
<Version>3.3.0-rc.2</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - 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>3.3.0-rc.1</version>
6+
<version>3.3.0-rc.2</version>
77
<title>KY.Generator.CLI.Core.Full</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>
@@ -17,17 +17,17 @@ Generate classes from oData, .NET assembly, JSON or TSQL to C# or TypeScript. Su
1717
<copyright>Copyright 2019</copyright>
1818
<tags>KY-Generator KY Generator .netCore CLI</tags>
1919
<dependencies>
20-
<dependency id="KY.Generator.Angular" version="3.3.0-rc.1" />
21-
<dependency id="KY.Generator.AspDotNet" version="3.3.0-rc.1" />
22-
<dependency id="KY.Generator.Core" version="3.3.0-rc.1" />
23-
<dependency id="KY.Generator.Csharp" version="3.3.0-rc.1" />
24-
<dependency id="KY.Generator.EntityFramework" version="3.3.0-rc.1" />
25-
<dependency id="KY.Generator.Json" version="3.3.0-rc.1" />
26-
<dependency id="KY.Generator.OData" version="3.3.0-rc.1" />
27-
<dependency id="KY.Generator.OpenApi" version="3.3.0-rc.1" />
28-
<dependency id="KY.Generator.Reflection" version="3.3.0-rc.1" />
29-
<dependency id="KY.Generator.Tsql" version="3.3.0-rc.1" />
30-
<dependency id="KY.Generator.TypeScript" version="3.3.0-rc.1" />
20+
<dependency id="KY.Generator.Angular" version="3.3.0-rc.2" />
21+
<dependency id="KY.Generator.AspDotNet" version="3.3.0-rc.2" />
22+
<dependency id="KY.Generator.Core" version="3.3.0-rc.2" />
23+
<dependency id="KY.Generator.Csharp" version="3.3.0-rc.2" />
24+
<dependency id="KY.Generator.EntityFramework" version="3.3.0-rc.2" />
25+
<dependency id="KY.Generator.Json" version="3.3.0-rc.2" />
26+
<dependency id="KY.Generator.OData" version="3.3.0-rc.2" />
27+
<dependency id="KY.Generator.OpenApi" version="3.3.0-rc.2" />
28+
<dependency id="KY.Generator.Reflection" version="3.3.0-rc.2" />
29+
<dependency id="KY.Generator.Tsql" version="3.3.0-rc.2" />
30+
<dependency id="KY.Generator.TypeScript" version="3.3.0-rc.2" />
3131
</dependencies>
3232
</metadata>
3333
<files>

‎CLI.Core.Full/nuget.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLICoreFullBeforeTarget" BeforeTargets="BeforeBuild">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.3.0-rc.1\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.3.0-rc.2\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"></Exec>
77
</Target>
88
<Target Name="KYGeneratorCLICoreFullTarget" AfterTargets="AfterBuild">
9-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.3.0-rc.1\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
9+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.3.0-rc.2\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
1010
CustomErrorRegularExpression="^Error:"
1111
CustomWarningRegularExpression="^Warning:"></Exec>
1212
</Target>

‎CLI.Core.Minimal/KY.Generator.CLI.Core.Minimal.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>3.3.0-rc.1</Version>
6+
<Version>3.3.0-rc.2</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

‎CLI.Core.Minimal/nuget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Core.Minimal</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.3.0-rc.1</version>
6+
<version>3.3.0-rc.2</version>
77
<title>KY.Generator.CLI.Core.Minimal</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI.Core.Minimal/nuget.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLICoreMinimalBeforeTarget" BeforeTargets="BeforeBuild">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.3.0-rc.1\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.3.0-rc.2\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"></Exec>
77
</Target>
88
<Target Name="KYGeneratorCLICoreMinimalAfterTarget" AfterTargets="AfterBuild">
9-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.3.0-rc.1\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
9+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.3.0-rc.2\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
1010
CustomErrorRegularExpression="^Error:"
1111
CustomWarningRegularExpression="^Warning:"></Exec>
1212
</Target>

‎CLI.Core.Standalone/KY.Generator.CLI.Core.Standalone.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>3.3.0-rc.1</Version>
6+
<Version>3.3.0-rc.2</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

0 commit comments

Comments
 (0)