Merge branch 'main' into paraipan/66-Support-default-values-for-schem…

…a-properties

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/release.yml

@@ -2,14 +2,13 @@ changelog:
   categories:
     - title: SemVer Major
       labels:
-        - semver/major
+        - ⚠️ semver/major
     - title: SemVer Minor
       labels:
-        - semver/minor
+        - 🆕 semver/minor
     - title: SemVer Patch
       labels:
-        - semver/patch
+        - 🔨 semver/patch
     - title: Other Changes
       labels:
         - semver/none
-        - "*"

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: Main
+
+on:
+  push:
+    branches: [main]
+  schedule:
+    - cron: "0 8,20 * * *"
+
+jobs:
+  unit-tests:
+    name: Unit tests
+    uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
+    with:
+      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+      linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
+
+  integration-test:
+    name: Integration test
+    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    with:
+      name: "Integration test"
+      matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && SWIFT_OPENAPI_GENERATOR_REPO_URL=file://${GITHUB_WORKSPACE} ./scripts/run-integration-test.sh"
+
+  example-packages:
+    name: Example packages
+    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    with:
+      name: "Example packages"
+      matrix_linux_command: "./scripts/test-examples.sh"

.github/workflows/pull_request.yml

@@ -19,7 +19,7 @@ jobs:
         with:
             linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
             linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
-            linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
+            linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
             linux_nightly_main_enabled: false
 
@@ -57,8 +57,3 @@ jobs:
             name: "Example packages"
             matrix_linux_command: "./scripts/test-examples.sh"
             matrix_linux_nightly_main_enabled: false
-
-    swift-6-language-mode:
-        name: Swift 6 Language Mode
-        uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main
-        if: false  # Disabled for now.

.github/workflows/pull_request_label.yml

@@ -0,0 +1,18 @@
+name: PR label
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, reopened, synchronize]
+
+jobs:
+  semver-label-check:
+    name: Semantic version label check
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Check for Semantic Version label
+        uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main

.licenseignore

@@ -38,4 +38,5 @@ Examples/HelloWorldiOSClientAppExample/HelloWorldiOSClientApp/Assets.xcassets/*
 Examples/HelloWorldiOSClientAppExample/HelloWorldiOSClientApp/Preview*
 Examples/**/Generated*
 **/Makefile
-**/*.html
+**/*.html
+.editorconfig

.swiftformatignore

@@ -1,4 +1,5 @@
 Tests/OpenAPIGeneratorReferenceTests/Resources
 Sources/swift-openapi-generator/Documentation.docc
 Examples/**/Generated/*
-Examples/**/GeneratedSources/*
+Examples/**/GeneratedSources/*
+**Package.swift

Examples/HelloWorldiOSClientAppExample/HelloWorldiOSClientApp.xcodeproj/project.pbxproj

@@ -609,15 +609,15 @@
 			repositoryURL = "https://github.com/apple/swift-openapi-generator.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				minimumVersion = 1.6.0;
 			};
 		};
 		3A133D0E2B1F2A600008DD5E /* XCRemoteSwiftPackageReference "swift-openapi-runtime" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apple/swift-openapi-runtime.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				minimumVersion = 1.7.0;
 			};
 		};
 		3A133D112B1F2A730008DD5E /* XCRemoteSwiftPackageReference "swift-openapi-urlsession" */ = {

Examples/HelloWorldiOSClientAppExample/HelloWorldiOSClientApp/ContentView.swift

@@ -60,7 +60,7 @@ struct ContentView: View {
 
 // A mock client used in previews and tests to avoid making live network calls.
 struct MockClient: APIProtocol {
-    func getGreeting(_ input: Operations.getGreeting.Input) async throws -> Operations.getGreeting.Output {
+    func getGreeting(_ input: Operations.GetGreeting.Input) async throws -> Operations.GetGreeting.Output {
         let name = input.query.name ?? "Stranger"
         return .ok(.init(body: .json(.init(message: "(Mock) Hello, \(name)!"))))
     }

Examples/HelloWorldiOSClientAppExample/HelloWorldiOSClientApp/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - client
 accessModifier: internal
+namingStrategy: idiomatic

Examples/auth-client-middleware-example/Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     name: "auth-client-middleware-example",
     platforms: [.macOS(.v11), .iOS(.v14), .tvOS(.v14), .watchOS(.v7), .visionOS(.v1)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-http-types", from: "1.0.2"),
     ],

Examples/auth-client-middleware-example/Sources/HelloWorldURLSessionClient/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - client
 accessModifier: internal
+namingStrategy: idiomatic

Examples/auth-server-middleware-example/Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     name: "auth-server-middleware-example",
     platforms: [.macOS(.v10_15)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/swift-server/swift-openapi-vapor", from: "1.0.0"),
         .package(url: "https://github.com/vapor/vapor", from: "4.89.0"),
     ],

Examples/auth-server-middleware-example/Sources/HelloWorldVaporServer/HelloWorldVaporServer.swift

@@ -17,7 +17,7 @@ import Vapor
 import AuthenticationServerMiddleware
 
 struct Handler: APIProtocol {
-    func getGreeting(_ input: Operations.getGreeting.Input) async throws -> Operations.getGreeting.Output {
+    func getGreeting(_ input: Operations.GetGreeting.Input) async throws -> Operations.GetGreeting.Output {
         // Extract the authenticated user, if present.
         // If unauthenticated, return the 401 HTTP status code.
         // Note that the 401 is defined in the OpenAPI document, allowing the client
@@ -32,7 +32,7 @@ struct Handler: APIProtocol {
 
 @main struct HelloWorldVaporServer {
     static func main() async throws {
-        let app = Vapor.Application()
+        let app = try await Vapor.Application.make()
         let transport = VaporTransport(routesBuilder: app)
         let handler = Handler()
         try handler.registerHandlers(

Examples/auth-server-middleware-example/Sources/HelloWorldVaporServer/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - server
 accessModifier: internal
+namingStrategy: idiomatic

Examples/bidirectional-event-streams-client-example/Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     name: "bidirectional-event-streams-client-example",
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.2.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
     ],
     targets: [

Examples/bidirectional-event-streams-client-example/Sources/BidirectionalEventStreamsClient/BidirectionalEventStreamsClient.swift

@@ -27,11 +27,11 @@ import Foundation
             let (stream, continuation) = AsyncStream<Components.Schemas.Greeting>.makeStream()
             /// To keep it simple, using JSON Lines, as it most straightforward and easy way to have streams.
             /// For SSE and JSON Sequences cases please check `event-streams-client-example`.
-            let requestBody: Operations.getGreetingsStream.Input.Body = .application_jsonl(
+            let requestBody: Operations.GetGreetingsStream.Input.Body = .applicationJsonl(
                 .init(stream.asEncodedJSONLines(), length: .unknown, iterationBehavior: .single)
             )
             let response = try await client.getGreetingsStream(query: .init(name: "Example"), body: requestBody)
-            let greetingStream = try response.ok.body.application_jsonl.asDecodedJSONLines(
+            let greetingStream = try response.ok.body.applicationJsonl.asDecodedJSONLines(
                 of: Components.Schemas.Greeting.self
             )
             try await withThrowingTaskGroup(of: Void.self) { group in

Examples/bidirectional-event-streams-client-example/Sources/BidirectionalEventStreamsClient/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - client
 accessModifier: internal
+namingStrategy: idiomatic

Examples/bidirectional-event-streams-server-example/Package.swift

@@ -16,12 +16,12 @@ import PackageDescription
 
 let package = Package(
     name: "bidirectional-event-streams-server-example",
-    platforms: [.macOS(.v10_15)],
+    platforms: [.macOS(.v14)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.2.0"),
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-rc.1"),
-        .package(url: "https://github.com/swift-server/swift-openapi-hummingbird.git", from: "2.0.0-beta.4"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.5.0"),
+        .package(url: "https://github.com/swift-server/swift-openapi-hummingbird.git", from: "2.0.1"),
     ],
     targets: [
         .executableTarget(

Examples/bidirectional-event-streams-server-example/Sources/BidirectionalEventStreamsServer/BidirectionalEventStreamsServer.swift

@@ -18,13 +18,13 @@ import Foundation
 
 struct Handler: APIProtocol {
     private let storage: StreamStorage = .init()
-    func getGreetingsStream(_ input: Operations.getGreetingsStream.Input) async throws
-        -> Operations.getGreetingsStream.Output
+    func getGreetingsStream(_ input: Operations.GetGreetingsStream.Input) async throws
+        -> Operations.GetGreetingsStream.Output
     {
         let eventStream = await self.storage.makeStream(input: input)
         /// To keep it simple, using JSON Lines, as it most straightforward and easy way to have streams.
         /// For SSE and JSON Sequences cases please check `event-streams-server-example`.
-        let responseBody = Operations.getGreetingsStream.Output.Ok.Body.application_jsonl(
+        let responseBody = Operations.GetGreetingsStream.Output.Ok.Body.applicationJsonl(
             .init(eventStream.asEncodedJSONLines(), length: .unknown, iterationBehavior: .single)
         )
         return .ok(.init(body: responseBody))

Examples/bidirectional-event-streams-server-example/Sources/BidirectionalEventStreamsServer/GreetingStream.swift

@@ -28,7 +28,7 @@ actor StreamStorage: Sendable {
         task.cancel()
         print("Canceled stream \(id)")
     }
-    func makeStream(input: Operations.getGreetingsStream.Input) -> AsyncStream<Components.Schemas.Greeting> {
+    func makeStream(input: Operations.GetGreetingsStream.Input) -> AsyncStream<Components.Schemas.Greeting> {
         let name = input.query.name ?? "Stranger"
         let id = UUID().uuidString
         print("Creating stream \(id) for name: \(name)")
@@ -44,7 +44,7 @@ actor StreamStorage: Sendable {
         }
         let inputStream =
             switch input.body {
-            case .application_jsonl(let body): body.asDecodedJSONLines(of: Components.Schemas.Greeting.self)
+            case .applicationJsonl(let body): body.asDecodedJSONLines(of: Components.Schemas.Greeting.self)
             }
         let task = Task<Void, any Error> {
             for try await message in inputStream {

Examples/bidirectional-event-streams-server-example/Sources/BidirectionalEventStreamsServer/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - server
 accessModifier: internal
+namingStrategy: idiomatic

Examples/command-line-client-example/Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     name: "command-line-client-example",
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
     ],

Examples/command-line-client-example/Sources/CommandLineClient/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - client
 accessModifier: internal
+namingStrategy: idiomatic

Examples/curated-client-library-example/Package.swift

@@ -19,8 +19,8 @@ let package = Package(
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)],
     products: [.library(name: "CuratedLibraryClient", targets: ["CuratedLibraryClient"])],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
     ],
     targets: [

Examples/curated-client-library-example/Sources/CuratedLibraryClient/openapi-generator-config.yaml

@@ -2,3 +2,4 @@ generate:
   - types
   - client
 accessModifier: internal
+namingStrategy: idiomatic

Examples/curated-client-library-example/Tests/CuratedLibraryClientTests/CuratedLibraryClientTests.swift

@@ -49,7 +49,7 @@ struct TestClient: APIProtocol {
         var name: String?
     }
 
-    func getGreeting(_ input: Operations.getGreeting.Input) async throws -> Operations.getGreeting.Output {
+    func getGreeting(_ input: Operations.GetGreeting.Input) async throws -> Operations.GetGreeting.Output {
         guard !shouldFail else { throw TestError(name: input.query.name) }
         let name = input.query.name ?? "Stranger"
         return .ok(.init(body: .json(.init(message: "(Test) Hello, \(name)!"))))

Examples/event-streams-client-example/Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     name: "event-streams-client-example",
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.2.0"),
+        .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.7.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
     ],
     targets: [