Merge pull request #167 from backfromexile/import-type

Use `import type` for type-only imports
nenoNaninu · Feb 1, 2024 · 07b3f92 · 07b3f92
2 parents 8a270ad + 96686fc
commit 07b3f92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/TypedSignalR.Client.TypeScript/ApiGenerator.cs b/src/TypedSignalR.Client.TypeScript/ApiGenerator.cs
@@ -41,15 +41,15 @@ public IReadOnlyList<GeneratedSourceCode> Generate(IReadOnlyList<INamedTypeSymbo
     private string GenerateHeader(IReadOnlyList<INamedTypeSymbol> hubTypes, IReadOnlyList<INamedTypeSymbol> receiverTypes)
     {
         var sb = new StringBuilder();
-        sb.AppendLine(@"import { HubConnection, IStreamResult, Subject } from '@microsoft/signalr';");
+        sb.AppendLine(@"import type { HubConnection, IStreamResult, Subject } from '@microsoft/signalr';");
 
         var interfaceLookup = hubTypes.Concat(receiverTypes)
             .Distinct<INamedTypeSymbol>(SymbolEqualityComparer.Default)
             .ToLookup<INamedTypeSymbol, INamespaceSymbol>(static x => x.ContainingNamespace, SymbolEqualityComparer.Default);
 
         foreach (var group in interfaceLookup)
         {
-            sb.AppendLine($"import {{ {string.Join(", ", group.Select(x => x.Name))} }} from './{group.Key.ToDisplayString()}';");
+            sb.AppendLine($"import type {{ {string.Join(", ", group.Select(x => x.Name))} }} from './{group.Key.ToDisplayString()}';");
         }
 
         var hubParametersAndReturnTypes = hubTypes
@@ -82,7 +82,7 @@ private string GenerateHeader(IReadOnlyList<INamedTypeSymbol> hubTypes, IReadOnl
             // TypedSignalR.Client.TypeScript creates a directory named TypedSignalR.Client in the specified directory
             // and generates TypeScript files there. (e.g. generated/TypedSignalR.Client/index.ts)
             // Therefore, in order to refer to the TypeScript file created by Tapper, we have to specify the directory one level up.
-            sb.AppendLine($"import {{ {string.Join(", ", groupingType.Select(x => x.Name))} }} from '../{groupingType.Key.ToDisplayString()}';");
+            sb.AppendLine($"import type {{ {string.Join(", ", groupingType.Select(x => x.Name))} }} from '../{groupingType.Key.ToDisplayString()}';");
         }
 
         return sb.ToString();

diff --git a/src/TypedSignalR.Client.TypeScript/InterfaceTranspiler.cs b/src/TypedSignalR.Client.TypeScript/InterfaceTranspiler.cs
@@ -56,7 +56,7 @@ private void AddHeader(IGrouping<INamespaceSymbol, INamedTypeSymbol> interfaceTy
         codeWriter.AppendLine("/* eslint-disable */");
         codeWriter.AppendLine("/* tslint:disable */");
         codeWriter.AppendLine("// @ts-nocheck");
-        codeWriter.AppendLine("import { IStreamResult, Subject } from '@microsoft/signalr';");
+        codeWriter.AppendLine("import type { IStreamResult, Subject } from '@microsoft/signalr';");
 
         var appearTypes = interfaceTypes
             .SelectMany(static x => x.GetMethods())
@@ -80,7 +80,7 @@ private void AddHeader(IGrouping<INamespaceSymbol, INamedTypeSymbol> interfaceTy
             // TypedSignalR.Client.TypeScript creates a directory named TypedSignalR.Client in the specified directory
             // and generates TypeScript files there. (e.g. generated/TypedSignalR.Client/index.ts)
             // Therefore, in order to refer to the TypeScript file created by Tapper, we have to specify the directory one level up.
-            codeWriter.AppendLine($"import {{ {string.Join(", ", groupingType.Select(x => x.Name))} }} from '../{groupingType.Key.ToDisplayString()}';");
+            codeWriter.AppendLine($"import type {{ {string.Join(", ", groupingType.Select(x => x.Name))} }} from '../{groupingType.Key.ToDisplayString()}';");
         }
 
         codeWriter.AppendLine();