Skip to content

Commit 16b3f39

Browse files
MahdiBMMahdiBM
authored
Merge branch 'main' into mmbm-fix-imports
2 parents 473f4e2 + e30691e commit 16b3f39

File tree

22 files changed

+65
-83
lines changed

22 files changed

+65
-83
lines changed

‎Examples/GreetingService/Package.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ let package = Package(
1818
name: "GreetingService",
1919
platforms: [.macOS(.v13)],
2020
dependencies: [
21-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
22-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
23-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
21+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
22+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
23+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
2424
.package(url: "https://github.com/vapor/vapor", from: "4.76.0"),
2525
],
2626
targets: [
@@ -35,7 +35,11 @@ let package = Package(
3535
),
3636
.testTarget(
3737
name: "GreetingServiceMockTests",
38-
dependencies: ["GreetingService", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime")]
38+
dependencies: [
39+
"GreetingService", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
40+
.product(name: "OpenAPIVapor", package: "swift-openapi-vapor"),
41+
.product(name: "Vapor", package: "vapor"),
42+
]
3943
),
4044
]
4145
)

‎Examples/GreetingServiceClient/Package.swift

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.9
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the SwiftOpenAPIGenerator open source project
@@ -18,9 +18,9 @@ let package = Package(
1818
name: "GreetingServiceClient",
1919
platforms: [.macOS(.v13)],
2020
dependencies: [
21-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
22-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
23-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
21+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
22+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
23+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
2424
],
2525
targets: [
2626
.executableTarget(
@@ -30,6 +30,13 @@ let package = Package(
3030
.product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
3131
],
3232
plugins: [.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator")]
33-
)
33+
),
34+
.testTarget(
35+
name: "GreetingServiceMockTests",
36+
dependencies: [
37+
"GreetingServiceClient", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
38+
.product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
39+
]
40+
),
3441
]
3542
)

‎Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/MockGreetingService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
1313
//===----------------------------------------------------------------------===//
14-
import GreetingService
14+
import GreetingServiceClient
1515

1616
// Mock operates on value types, and requires no concrete client or server transport.
1717
struct MockGreetingService: APIProtocol {

‎Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/MockGreetingServiceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414
import XCTest
15-
@testable import GreetingService
15+
@testable import GreetingServiceClient
1616

1717
final class GreetingServiceMockTests: XCTestCase {
1818
func testWithMock() async throws {

‎IntegrationTest/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ let package = Package(
2424
)
2525
],
2626
dependencies: [
27-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
28-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
27+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
28+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
2929
],
3030
targets: [
3131
.target(

‎IntegrationTest/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Simple Integration Test
1+
# Integration Test
22

33
A Swift package used as an integration test in the Swift OpenAPI Generator ecosystem.
44

@@ -11,7 +11,7 @@ For example, from the pull request pipeline for that project, you can do the fol
1111
```sh
1212
# Clone the generator repo and go into the integration test directory
1313
git clone https://github.com/apple/swift-openapi-generator
14-
cd swift-openapi-generator/IntegrationTests/Simple
14+
cd swift-openapi-generator/IntegrationTests
1515

1616
# Use Swift PM to override the dependency for the package you want to test
1717
swift package edit swift-openapi-runtime path/to/checkout/of/swift-openapi-runtime

‎Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let package = Package(
3737
// The platforms below are not currently supported for running
3838
// the generator itself. We include them here to allow the generator
3939
// to emit a more descriptive compiler error.
40-
.iOS(.v13), .tvOS(.v13), .watchOS(.v6),
40+
.iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1),
4141
],
4242
products: [
4343
.executable(name: "swift-openapi-generator", targets: ["swift-openapi-generator"]),
@@ -60,7 +60,7 @@ let package = Package(
6060
// Tests-only: Runtime library linked by generated code, and also
6161
// helps keep the runtime library new enough to work with the generated
6262
// code.
63-
.package(url: "https://github.com/apple/swift-openapi-runtime", branch: "main"),
63+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
6464

6565
// Build and preview docs
6666
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ The generator is used during development and is supported on macOS and Linux.
4545

4646
The generated code, runtime library, and transports are supported on more platforms, listed below.
4747

48-
| Component | macOS | Linux | iOS | tvOS | watchOS |
49-
| -: | :-: | :-: | :-: | :-: | :-: |
50-
| Generator plugin and CLI | ✅ 10.15+ | ✅ | ❌ | ❌ | ❌ |
51-
| Generated code, runtime, transports | ✅ 10.15+ | ✅ | ✅ 13+ | ✅ 13+ | ✅ 6+ |
48+
| Component | macOS | Linux | iOS | tvOS | watchOS | visionOS |
49+
| -: | :-: | :-: | :-: | :-: | :-: | :-: |
50+
| Generator plugin and CLI | ✅ 10.15+ | ✅ | ❌ | ❌ | ❌ | ❌ |
51+
| Generated code, runtime, transports | ✅ 10.15+ | ✅ | ✅ 13+ | ✅ 13+ | ✅ 6+ | ✅ 1+ |
5252

5353
## Documentation
5454

‎Sources/_OpenAPIGeneratorCore/FeatureFlags.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
public enum FeatureFlag: String, Hashable, Codable, CaseIterable, Sendable {
2929
// needs to be here for the enum to compile
3030
case empty
31-
32-
/// Base64 encoding and decoding.
33-
///
34-
/// Enable interpretation of `type: string, format: byte` as base64-encoded data.
35-
case base64DataEncodingDecoding
3631
}
3732

3833
/// A set of enabled feature flags.

‎Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ struct TypeAssigner {
4545
/// safe to be used as a Swift identifier.
4646
var asSwiftSafeName: (String) -> String
4747

48-
///Enable decoding and encoding of as base64-encoded data strings.
49-
var enableBase64EncodingDecoding: Bool
50-
5148
/// Returns a type name for an OpenAPI-named component type.
5249
///
5350
/// A component type is any type in `#/components` in the OpenAPI document.
@@ -331,10 +328,7 @@ struct TypeAssigner {
331328
inParent parent: TypeName,
332329
subtype: SubtypeNamingMethod
333330
) throws -> TypeUsage {
334-
let typeMatcher = TypeMatcher(
335-
asSwiftSafeName: asSwiftSafeName,
336-
enableBase64EncodingDecoding: enableBase64EncodingDecoding
337-
)
331+
let typeMatcher = TypeMatcher(asSwiftSafeName: asSwiftSafeName)
338332
// Check if this type can be simply referenced without
339333
// creating a new inline type.
340334
if let referenceableType = try typeMatcher.tryMatchReferenceableType(for: schema, components: components) {
@@ -551,20 +545,10 @@ struct TypeAssigner {
551545
extension FileTranslator {
552546
553547
/// A configured type assigner.
554-
var typeAssigner: TypeAssigner {
555-
TypeAssigner(
556-
asSwiftSafeName: swiftSafeName,
557-
enableBase64EncodingDecoding: config.featureFlags.contains(.base64DataEncodingDecoding)
558-
)
559-
}
548+
var typeAssigner: TypeAssigner { TypeAssigner(asSwiftSafeName: swiftSafeName) }
560549
561550
/// A configured type matcher.
562-
var typeMatcher: TypeMatcher {
563-
TypeMatcher(
564-
asSwiftSafeName: swiftSafeName,
565-
enableBase64EncodingDecoding: config.featureFlags.contains(.base64DataEncodingDecoding)
566-
)
567-
}
551+
var typeMatcher: TypeMatcher { TypeMatcher(asSwiftSafeName: swiftSafeName) }
568552
}
569553
570554
/// An error used during the parsing of JSON references specified in an

‎Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeMatcher.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ struct TypeMatcher {
2020
/// safe to be used as a Swift identifier.
2121
var asSwiftSafeName: (String) -> String
2222

23-
///Enable decoding and encoding of as base64-encoded data strings.
24-
var enableBase64EncodingDecoding: Bool
25-
2623
/// Returns the type name of a built-in type that matches the specified
2724
/// schema.
2825
///
@@ -72,11 +69,7 @@ struct TypeMatcher {
7269
test: { (schema) -> TypeUsage? in
7370
if let builtinType = Self._tryMatchBuiltinNonRecursive(for: schema) { return builtinType }
7471
guard case let .reference(ref, _) = schema else { return nil }
75-
return try TypeAssigner(
76-
asSwiftSafeName: asSwiftSafeName,
77-
enableBase64EncodingDecoding: enableBase64EncodingDecoding
78-
)
79-
.typeName(for: ref).asUsage
72+
return try TypeAssigner(asSwiftSafeName: asSwiftSafeName).typeName(for: ref).asUsage
8073
},
8174
matchedArrayHandler: { elementType in elementType.asArray },
8275
genericArrayHandler: { TypeName.arrayContainer.asUsage }

‎Sources/swift-openapi-generator/Documentation.docc/Swift-OpenAPI-Generator.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ The generator is used during development and is supported on macOS and Linux.
5555

5656
The generated code, runtime library, and transports are supported on more platforms, listed below.
5757

58-
| Component | macOS | Linux | iOS | tvOS | watchOS |
59-
| -: | :-: | :-: | :-: | :-: | :-: |
60-
| Generator plugin and CLI | ✅ 10.15+ | ✅ | ❌ | ❌ | ❌ |
61-
| Generated code, runtime, transports | ✅ 10.15+ | ✅ | ✅ 13+ | ✅ 13+ | ✅ 6+ |
58+
| Component | macOS | Linux | iOS | tvOS | watchOS | visionOS |
59+
| -: | :-: | :-: | :-: | :-: | :-: | :-: |
60+
| Generator plugin and CLI | ✅ 10.15+ | ✅ | ❌ | ❌ | ❌ | ❌ |
61+
| Generated code, runtime, transports | ✅ 10.15+ | ✅ | ✅ 13+ | ✅ 13+ | ✅ 6+ | ✅ 1+ |
6262

6363
## Topics
6464

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.2.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.3.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.4.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.5.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/server.Package.2.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ let package = Package(
77
.macOS(.v10_15)
88
],
99
dependencies: [
10-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
11-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
12-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
10+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
11+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
12+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
1313
.package(url: "https://github.com/vapor/vapor", from: "4.84.0"),
1414
],
1515
targets: [

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/server.Package.3.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ let package = Package(
77
.macOS(.v10_15)
88
],
99
dependencies: [
10-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
11-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
12-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
10+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
11+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
12+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
1313
.package(url: "https://github.com/vapor/vapor", from: "4.84.0"),
1414
],
1515
targets: [

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/server.Package.4.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ let package = Package(
77
.macOS(.v10_15)
88
],
99
dependencies: [
10-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
11-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
12-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
10+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
11+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
12+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
1313
.package(url: "https://github.com/vapor/vapor", from: "4.84.0"),
1414
],
1515
targets: [

‎Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/server.Package.5.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ let package = Package(
77
.macOS(.v10_15)
88
],
99
dependencies: [
10-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
11-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
12-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
10+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
11+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
12+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
1313
.package(url: "https://github.com/vapor/vapor", from: "4.84.0"),
1414
],
1515
targets: [

‎Tests/OpenAPIGeneratorReferenceTests/CompatabilityTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ fileprivate extension CompatibilityTest {
267267
let package = Package(
268268
name: "\(packageName)",
269269
platforms: [.macOS(.v13)],
270-
dependencies: [.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0"))],
270+
dependencies: [.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1")],
271271
targets: [.target(name: "Harness", dependencies: [.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime")])]
272272
)
273273
"""

‎Tests/OpenAPIGeneratorReferenceTests/SnippetBasedReferenceTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4671,7 +4671,6 @@ final class SnippetBasedReferenceTests: XCTestCase {
46714671

46724672
func testResponseWithExampleWithOnlyValueByte() throws {
46734673
try self.assertResponsesTranslation(
4674-
featureFlags: [.base64DataEncodingDecoding],
46754674
"""
46764675
responses:
46774676
MyResponse:

0 commit comments

Comments
 (0)