Skip to content

Commit f275f6c

Browse files
committed
Update nuspec 1.7.5
1 parent 0017251 commit f275f6c

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

Watts.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package >
33
<metadata>
44
<id>WebApiToTypeScript</id>
5-
<version>1.7.4</version>
5+
<version>1.7.5</version>
66
<authors>Balakrishnan (Balki) Ranganathan</authors>
77
<owners>Balakrishnan (Balki) Ranganathan</owners>
88
<licenseUrl>https://raw.githubusercontent.com/greymind/WebApiToTypeScript/master/LICENSE</licenseUrl>
99
<projectUrl>https://github.com/greymind/WebApiToTypeScript</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>A tool for code generating TypeScript endpoints, interfaces, enums, resources and view paths for your ASP.NET Web API controllers/web apps</description>
1212
<summary>A tool for code generating TypeScript endpoints, interfaces, enums, resources and view paths for your ASP.NET Web API controllers/web apps</summary>
13-
<releaseNotes>Change array encoding in query string</releaseNotes>
13+
<releaseNotes>Support for shadowing in typescript via union types</releaseNotes>
1414
<copyright>Copyright (c) 2016 Balakrishnan (Balki) Ranganathan</copyright>
1515
<tags>WebAPI TypeScript Endpoint Enum Interface Code Generation Angular Service Balki Greymind Watts</tags>
1616
</metadata>

src/WebApiToTypeScript/Interfaces/InterfaceService.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System.Collections.Generic;
1+
using Mono.Cecil;
2+
using System.Collections.Generic;
23
using System.Diagnostics;
34
using System.Linq;
45
using System.Text.RegularExpressions;
5-
using Mono.Cecil;
66
using WebApiToTypeScript.Block;
77
using WebApiToTypeScript.Types;
88

@@ -235,9 +235,11 @@ private void WriteInterfaceNode(TypeScriptBlock interfacesBlock, InterfaceNode i
235235
foreach (var thing in things)
236236
{
237237
var thingType = thing.CSharpType.TypeDefinition;
238+
238239
var union = SameNamedDerivedMembers(thing, interfaceNode)
239240
.Select(e => e.CSharpType.TypeDefinition)
240241
.ToList();
242+
241243
union.Add(thingType);
242244

243245
string interfaceName;
@@ -254,6 +256,7 @@ private void WriteInterfaceNode(TypeScriptBlock interfacesBlock, InterfaceNode i
254256
if (union.Count == 1)
255257
{
256258
var typeScriptType = TypeService.GetTypeScriptType(union[0], thing.Name);
259+
257260
interfaceName = typeScriptType.InterfaceName;
258261
typeName = typeScriptType.TypeName;
259262
}
@@ -266,6 +269,7 @@ private void WriteInterfaceNode(TypeScriptBlock interfacesBlock, InterfaceNode i
266269
return type.TypeName;
267270
})
268271
.Distinct());
272+
269273
interfaceName = string.Join(" | ", union
270274
.Select(t =>
271275
{

src/WebApiToTypeScript/WebApiToTypeScript.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using System;
1+
using Microsoft.Build.Framework;
2+
using Microsoft.Build.Utilities;
3+
using Newtonsoft.Json;
4+
using System;
25
using System.Collections.Generic;
36
using System.Diagnostics;
47
using System.IO;
58
using System.Linq;
6-
using Microsoft.Build.Framework;
7-
using Microsoft.Build.Utilities;
8-
using Newtonsoft.Json;
99
using WebApiToTypeScript.Block;
1010
using WebApiToTypeScript.Endpoints;
1111
using WebApiToTypeScript.Enums;
@@ -165,6 +165,7 @@ private Config.Config GetConfig(string configFilePath)
165165
var config = JsonConvert.DeserializeObject<Config.Config>(configFileContent);
166166

167167
var baseDir = Path.GetFullPath(Path.GetDirectoryName(configFilePath) ?? "");
168+
168169
config.WebApiModuleFileName = ToAbsolutePath(baseDir, config.WebApiModuleFileName);
169170
config.EndpointsOutputDirectory = ToAbsolutePath(baseDir, config.EndpointsOutputDirectory);
170171
config.ServiceOutputDirectory = ToAbsolutePath(baseDir, config.ServiceOutputDirectory);
@@ -173,11 +174,11 @@ private Config.Config GetConfig(string configFilePath)
173174
config.ViewsOutputDirectory = ToAbsolutePath(baseDir, config.ViewsOutputDirectory);
174175
config.ResourcesOutputDirectory = ToAbsolutePath(baseDir, config.ResourcesOutputDirectory);
175176

176-
foreach (var c in config.ViewConfigs)
177-
c.SourceDirectory = ToAbsolutePath(baseDir, c.SourceDirectory);
177+
foreach (var viewConfig in config.ViewConfigs)
178+
viewConfig.SourceDirectory = ToAbsolutePath(baseDir, viewConfig.SourceDirectory);
178179

179-
foreach (var c in config.ResourceConfigs)
180-
c.SourcePath = ToAbsolutePath(baseDir, c.SourcePath);
180+
foreach (var resourceConfig in config.ResourceConfigs)
181+
resourceConfig.SourcePath = ToAbsolutePath(baseDir, resourceConfig.SourcePath);
181182

182183
return config;
183184
}

0 commit comments

Comments
 (0)