Merge branch 'epic/sbs' into jbe/swift_codegen_schema

Author: jbelkins

Package.version

@@ -1 +1 @@
-0.175.0
+0.176.0

Package.version.next

@@ -1 +1 @@
-0.176.0
+0.177.0

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/DependencyJSONGenerator.kt

@@ -92,27 +92,18 @@ class DirectedSwiftCodegen(
             LOGGER.info("[${service.id}] Generating service client for protocol ${this.protocol}")
             generateProtocolClient(ctx)
 
-            integrations.forEach { it.writeAdditionalFiles(context, ctx, writers) }
-
             LOGGER.info("[${service.id}] Generating smoke tests for service")
             generateSmokeTests(ctx)
 
-            if (settings.generatePackageManifest) {
-                LOGGER.info("Generating package manifest file")
-                PackageManifestGenerator(ctx).writePackageManifest(writers.dependencies)
-            }
-
-            if (settings.generateDependencyJSON) {
-                LOGGER.info("Generating dependency JSON file")
-                DependencyJSONGenerator(ctx).writePackageJSON(writers.dependencies)
-            }
+            LOGGER.info("[${service.id}] Generating additional files")
+            integrations.forEach { it.writeAdditionalFiles(context, ctx, writers) }
+        }
 
-            LOGGER.info("Generating Smithy model file info")
-            SmithyModelFileInfoGenerator(ctx).writeSmithyModelFileInfo()
+        LOGGER.info("[${service.id}] Generating package manifest file")
+        PackageManifestGenerator(context).writePackageManifest(writers.dependencies)
 
-            LOGGER.info("Flushing swift writers")
-            writers.flushWriters()
-        }
+        LOGGER.info("[${service.id}] Flushing swift writers")
+        writers.flushWriters()
     }
 
     override fun generateStructure(directive: GenerateStructureDirective<GenerationContext, SwiftSettings>) {

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/DirectedSwiftCodegen.kt

@@ -5,13 +5,13 @@
 package software.amazon.smithy.swift.codegen
 
 import software.amazon.smithy.codegen.core.SymbolDependency
-import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
+import software.amazon.smithy.swift.codegen.core.GenerationContext
 
 class PackageManifestGenerator(
-    val ctx: ProtocolGenerator.GenerationContext,
+    val ctx: GenerationContext,
 ) {
     fun writePackageManifest(dependencies: List<SymbolDependency>) {
-        ctx.delegator.useFileWriter("Package.swift") { writer ->
+        ctx.writerDelegator().useFileWriter("Package.swift") { writer ->
             writer.write("// swift-tools-version: \$L", ctx.settings.swiftVersion)
             writer.write("")
             writer.write("import PackageDescription")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PackageManifestGenerator.kt

@@ -38,8 +38,6 @@ private const val MERGE_MODELS = "mergeModels"
 private const val COPYRIGHT_NOTICE = "copyrightNotice"
 private const val VISIBILITY = "visibility"
 private const val INTERNAL_CLIENT = "internalClient"
-private const val GENERATE_PACKAGE_MANIFEST = "generatePackageManifest"
-private const val GENERATE_DEPENDENCY_JSON = "generateDependencyJSON"
 
 // Prioritized list of protocols supported for code generation
 private val DEFAULT_PROTOCOL_RESOLUTION_PRIORITY =
@@ -67,8 +65,6 @@ class SwiftSettings(
     val copyrightNotice: String,
     val visibility: String,
     val internalClient: Boolean,
-    val generatePackageManifest: Boolean,
-    val generateDependencyJSON: Boolean,
 ) {
     companion object {
         private val LOGGER: Logger = Logger.getLogger(SwiftSettings::class.java.name)
@@ -100,8 +96,6 @@ class SwiftSettings(
                     COPYRIGHT_NOTICE,
                     VISIBILITY,
                     INTERNAL_CLIENT,
-                    GENERATE_PACKAGE_MANIFEST,
-                    GENERATE_DEPENDENCY_JSON,
                 ),
             )
 
@@ -127,8 +121,6 @@ class SwiftSettings(
                 )
             val visibility = config.getStringMemberOrDefault(VISIBILITY, "public")
             val internalClient = config.getBooleanMemberOrDefault(INTERNAL_CLIENT, false)
-            val generatePackageManifest = config.getBooleanMemberOrDefault(GENERATE_PACKAGE_MANIFEST, true)
-            val generateDependencyJSON = config.getBooleanMemberOrDefault(GENERATE_DEPENDENCY_JSON, false)
 
             return SwiftSettings(
                 serviceId,
@@ -144,8 +136,6 @@ class SwiftSettings(
                 copyrightNotice,
                 visibility,
                 internalClient,
-                generatePackageManifest,
-                generateDependencyJSON,
             )
         }
 

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSettings.kt

@@ -23,6 +23,7 @@ import software.amazon.smithy.model.traits.DocumentationTrait
 import software.amazon.smithy.model.traits.ErrorTrait
 import software.amazon.smithy.model.traits.HttpErrorTrait
 import software.amazon.smithy.model.traits.RetryableTrait
+import software.amazon.smithy.swift.codegen.core.GenerationContext
 import software.amazon.smithy.swift.codegen.customtraits.SwiftBoxTrait
 import software.amazon.smithy.swift.codegen.integration.HTTPBindingProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
@@ -328,6 +329,7 @@ fun createStructureWithOptionalErrorMessage(): StructureShape {
 }
 
 class TestContext(
+    val context: GenerationContext,
     val generationCtx: ProtocolGenerator.GenerationContext,
     val manifest: MockManifest,
     val generator: ProtocolGenerator,
@@ -398,6 +400,17 @@ fun Model.newTestContext(
             .get()
     val delegator = SwiftDelegator(settings, this, manifest, provider)
 
+    val context =
+        GenerationContext(
+            this,
+            provider,
+            settings,
+            manifest,
+            generator,
+            emptyList(),
+            delegator,
+        )
+
     val ctx =
         ProtocolGenerator.GenerationContext(
             settings,
@@ -408,7 +421,7 @@ fun Model.newTestContext(
             generator.protocol,
             delegator,
         )
-    return TestContext(ctx, manifest, generator)
+    return TestContext(context, ctx, manifest, generator)
 }
 
 fun getSettingsNode(

smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/TestUtils.kt

@@ -194,8 +194,6 @@ class SwiftSettingsTest {
             copyrightNotice = "// Test copyright",
             visibility = "public",
             internalClient = false,
-            generatePackageManifest = false,
-            generateDependencyJSON = true,
         )
 
     private fun createServiceWithProtocols(protocols: Set<ShapeId>): ServiceShape {

smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/codegencomponents/SwiftSettingsTest.kt

@@ -98,15 +98,15 @@ class PackageManifestGeneratorTests {
         smithyFile: String,
         serviceShapeId: String,
     ): TestContext {
-        val context =
+        val testContext =
             TestContext.initContextFrom(smithyFile, serviceShapeId, MockHTTPAWSJson11ProtocolGenerator()) { model ->
                 model.defaultSettings(serviceShapeId, "MockSDK", "2019-12-16", "MockSDKID")
             }
-        context.generationCtx.delegator.useFileWriter("xyz.swift") { writer ->
+        testContext.generationCtx.delegator.useFileWriter("xyz.swift") { writer ->
             writer.addDependency(SwiftDependency.CLIENT_RUNTIME)
         }
-        PackageManifestGenerator(context.generationCtx).writePackageManifest(context.generationCtx.delegator.dependencies)
-        context.generationCtx.delegator.flushWriters()
-        return context
+        PackageManifestGenerator(testContext.context).writePackageManifest(testContext.generationCtx.delegator.dependencies)
+        testContext.generationCtx.delegator.flushWriters()
+        return testContext
     }
 }