#8 Fixed duplicate import directive (#9)

* #8 Fixed duplicate import directive * Add FileModel
RicoSuter · Mar 6, 2019 · 9a49402 · 9a49402
1 parent 9f1a586
commit 9a49402
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /src/**/obj
 /src/**/bin
 /src/New folder
+*.csproj.user
diff --git a/src/SigSpec.CodeGeneration.TypeScript/Models/FileModel.cs b/src/SigSpec.CodeGeneration.TypeScript/Models/FileModel.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace SigSpec.CodeGeneration.TypeScript.Models
+{
+    public class FileModel
+    {
+        public FileModel(IEnumerable<string> hubs)
+        {
+            Hubs = hubs;
+        }
+
+        public IEnumerable<string> Hubs { get; }
+    }
+}
diff --git a/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj b/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj
@@ -5,16 +5,18 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Templates\File.liquid" />
     <None Remove="Templates\Hub.liquid" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Templates\File.liquid" />
     <EmbeddedResource Include="Templates\Hub.liquid" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="9.12.1" />
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="9.12.1" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="9.13.22" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="9.13.22" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SigSpec.CodeGeneration.TypeScript/SigSpecToTypeScriptGenerator.cs b/src/SigSpec.CodeGeneration.TypeScript/SigSpecToTypeScriptGenerator.cs
@@ -1,6 +1,7 @@
 using NJsonSchema.CodeGeneration;
 using NJsonSchema.CodeGeneration.TypeScript;
 using SigSpec.CodeGeneration.Models;
+using SigSpec.CodeGeneration.TypeScript.Models;
 using SigSpec.Core;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,7 +47,11 @@ public CodeArtifactCollection GenerateArtifacts(SigSpecDocument document)
         public string GenerateFile(SigSpecDocument document)
         {
             var artifacts = GenerateArtifacts(document);
-            return artifacts.Concatenate();
+
+            var fileModel = new FileModel(artifacts.Artifacts.Select(a => a.Code));
+            var fileTemplate = _settings.TypeScriptGeneratorSettings.TemplateFactory.CreateTemplate("TypeScript", "File", fileModel);
+
+            return fileTemplate.Render();
         }
     }
 }
diff --git a/src/SigSpec.CodeGeneration.TypeScript/Templates/File.liquid b/src/SigSpec.CodeGeneration.TypeScript/Templates/File.liquid
@@ -0,0 +1,5 @@
+import { HubConnection, IStreamResult } from "@aspnet/signalr"
+{% for hub in Hubs -%}
+
+{{ hub }}
+{% endfor -%}
diff --git a/src/SigSpec.CodeGeneration.TypeScript/Templates/Hub.liquid b/src/SigSpec.CodeGeneration.TypeScript/Templates/Hub.liquid
@@ -1,6 +1,4 @@
-import { HubConnection, IStreamResult } from "@aspnet/signalr"
-
-export class {{ Name }}Hub {
+export class {{ Name }}Hub {
     constructor(private connection: HubConnection) {
     }
 {% for operation in Operations -%}

diff --git a/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj b/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="9.10.72" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="9.13.22" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SigSpec.Core/SigSpec.Core.csproj b/src/SigSpec.Core/SigSpec.Core.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NJsonSchema" Version="9.10.72" />
+    <PackageReference Include="NJsonSchema" Version="9.13.22" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.3" />
   </ItemGroup>