Fixes #114 - Add scoped imports (#184)

### Motivation

Fixes #114
### Modifications

Add scoped imports
### Result

Specific imports
### Test Plan

Run CI and Tests

Author: PARAIPAN9

Sources/_OpenAPIGeneratorCore/Layers/StructuredSwiftRepresentation.swift

@@ -22,6 +22,11 @@ struct ImportDescription: Equatable, Codable {
     /// For example, the `Foo` in `import Foo`.
     var moduleName: String
 
+    /// An array of module types imported from the module, if applicable.
+    ///
+    /// For example, if there are type imports like `import Foo.Bar`, they would be listed here.
+    var moduleTypes: [String]?
+
     /// The name of the private interface for an `@_spi` import.
     ///
     /// For example, if `spi` was "Secret" and the module name was "Foo" then the import

Sources/_OpenAPIGeneratorCore/Renderer/TextBasedRenderer.swift

@@ -73,9 +73,16 @@ struct TextBasedRenderer: RendererProtocol {
 
     /// Renders a single import statement.
     func renderImport(_ description: ImportDescription) -> String {
-        func render(moduleName: String, spi: String?, preconcurrency: Bool) -> String {
+        func render(moduleName: String, moduleTypes: [String]? = nil, spi: String?, preconcurrency: Bool) -> String {
             let spiPrefix = spi.map { "@_spi(\($0)) " } ?? ""
             let preconcurrencyPrefix = preconcurrency ? "@preconcurrency " : ""
+            var types = [String]()
+            if let moduleTypes, preconcurrency {
+                types = moduleTypes.map {
+                    "\(preconcurrencyPrefix)\(spiPrefix)import \($0)"
+                }
+                return types.joinedLines()
+            }
             return "\(preconcurrencyPrefix)\(spiPrefix)import \(moduleName)"
         }
 
@@ -87,7 +94,14 @@ struct TextBasedRenderer: RendererProtocol {
         case .onOS(let operatingSystems):
             var lines = [String]()
             lines.append("#if \(operatingSystems.map { "os(\($0))" }.joined(separator: " || "))")
-            lines.append(render(moduleName: description.moduleName, spi: description.spi, preconcurrency: true))
+            lines.append(
+                render(
+                    moduleName: description.moduleName,
+                    moduleTypes: description.moduleTypes,
+                    spi: description.spi,
+                    preconcurrency: true
+                )
+            )
             lines.append("#else")
             lines.append(render(moduleName: description.moduleName, spi: description.spi, preconcurrency: false))
             lines.append("#endif")

Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/ClientTranslator.swift

@@ -38,6 +38,7 @@ struct ClientFileTranslator: FileTranslator {
 
         let imports =
             Constants.File.imports
+            + Constants.Client.scopedImports
             + config.additionalImports
             .map { ImportDescription(moduleName: $0) }
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/Constants.swift

@@ -25,8 +25,7 @@ enum Constants {
 
         /// The descriptions of modules imported by every generated file.
         static let imports: [ImportDescription] = [
-            ImportDescription(moduleName: "OpenAPIRuntime", spi: "Generated"),
-            ImportDescription(moduleName: "Foundation", preconcurrency: .onOS(["Linux"])),
+            ImportDescription(moduleName: "OpenAPIRuntime", spi: "Generated")
         ]
     }
 
@@ -62,6 +61,15 @@ enum Constants {
     /// Constants related to the generated client type.
     enum Client {
 
+        /// An array of scoped imports specific to the `Client` namespace.
+        static let scopedImports: [ImportDescription] = [
+            ImportDescription(
+                moduleName: "Foundation",
+                moduleTypes: ["struct Foundation.URL", "struct Foundation.Data"],
+                preconcurrency: .onOS(["Linux"])
+            )
+        ]
+
         /// The name of the client type.
         static let typeName: String = "Client"
 
@@ -91,9 +99,30 @@ enum Constants {
         }
     }
 
+    enum Types {
+
+        /// An array of scoped imports specific to the `Types` namespace.
+        static let scopedImports: [ImportDescription] = [
+            ImportDescription(
+                moduleName: "Foundation",
+                moduleTypes: ["struct Foundation.URL", "struct Foundation.Data", "struct Foundation.Date"],
+                preconcurrency: .onOS(["Linux"])
+            )
+        ]
+    }
+
     /// Constants related to the generated server types.
     enum Server {
 
+        /// An array of scoped imports specific to the `Server` namespace.
+        static let scopedImports: [ImportDescription] = [
+            ImportDescription(
+                moduleName: "Foundation",
+                moduleTypes: ["struct Foundation.URL", "struct Foundation.Data"],
+                preconcurrency: .onOS(["Linux"])
+            )
+        ]
+
         /// Constants related to the universal server.
         enum Universal {
 

Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/ServerTranslator.swift

@@ -36,6 +36,7 @@ struct ServerFileTranslator: FileTranslator {
 
         let imports =
             Constants.File.imports
+            + Constants.Server.scopedImports
             + config.additionalImports
             .map { ImportDescription(moduleName: $0) }
 

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/TypesFileTranslator.swift

@@ -38,6 +38,7 @@ struct TypesFileTranslator: FileTranslator {
 
         let imports =
             Constants.File.imports
+            + Constants.Types.scopedImports
             + config.additionalImports
             .map { ImportDescription(moduleName: $0) }
 

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Client.swift

@@ -1,7 +1,8 @@
 // Generated by swift-openapi-generator, do not modify.
 @_spi(Generated) import OpenAPIRuntime
 #if os(Linux)
-@preconcurrency import Foundation
+@preconcurrency import struct Foundation.URL
+@preconcurrency import struct Foundation.Data
 #else
 import Foundation
 #endif

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Server.swift

@@ -1,7 +1,8 @@
 // Generated by swift-openapi-generator, do not modify.
 @_spi(Generated) import OpenAPIRuntime
 #if os(Linux)
-@preconcurrency import Foundation
+@preconcurrency import struct Foundation.URL
+@preconcurrency import struct Foundation.Data
 #else
 import Foundation
 #endif

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Types.swift

@@ -1,7 +1,9 @@
 // Generated by swift-openapi-generator, do not modify.
 @_spi(Generated) import OpenAPIRuntime
 #if os(Linux)
-@preconcurrency import Foundation
+@preconcurrency import struct Foundation.URL
+@preconcurrency import struct Foundation.Data
+@preconcurrency import struct Foundation.Date
 #else
 import Foundation
 #endif