Prepare 0.2.0 release (API breaking changes)

IntegrationTest/Package.swift

@@ -32,8 +32,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.1.0")),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.1.0")),
+        .package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.2.0")),
     ],
     targets: [
         .target(

Package.swift

@@ -80,7 +80,7 @@ let package = Package(
         // Tests-only: Runtime library linked by generated code, and also
         // helps keep the runtime library new enough to work with the generated
         // code.
-        .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.1.11")),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.2.0")),
 
         // Build and preview docs
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
@@ -147,18 +147,6 @@ let package = Package(
             swiftSettings: swiftSettings
         ),
 
-        // PetstoreConsumerTestsFFMultipleContentTypes
-        // Builds and tests the reference code from GeneratorReferenceTests
-        // to ensure it actually works correctly at runtime.
-        // Enabled feature flag: multipleContentTypes
-        .testTarget(
-            name: "PetstoreConsumerTestsFFMultipleContentTypes",
-            dependencies: [
-                "PetstoreConsumerTestCore"
-            ],
-            swiftSettings: swiftSettings
-        ),
-
         // Generator CLI
         .executableTarget(
             name: "swift-openapi-generator",

Sources/_OpenAPIGeneratorCore/FeatureFlags.swift

@@ -27,29 +27,9 @@
 /// 1.0 is released.)
 public enum FeatureFlag: String, Hashable, Codable, CaseIterable {
 
-    /// Multiple request and response body content types.
-    ///
-    /// Tracking issues:
-    /// - https://github.com/apple/swift-openapi-generator/issues/6
-    /// - https://github.com/apple/swift-openapi-generator/issues/7
-    case multipleContentTypes
-
-    /// SOAR-0001 Improved OpenAPI -> Swift name mapping
-    ///
-    /// Tracking issues:
-    /// - https://github.com/apple/swift-openapi-generator/pull/95
-    case proposal0001
-
-    /// Stricted input OpenAPI document validation.
-    ///
-    /// Check for structural issues and detect cycles proactively.
-    case strictOpenAPIValidation
-
-    /// Removed the generation of an undocumented case in enums/oneOfs.
-    ///
-    /// Tracking issue:
-    /// - https://github.com/apple/swift-openapi-generator/issues/204
-    case closedEnumsAndOneOfs
+    /// Has to be here until we add more feature flags, otherwise the enum
+    /// doesn't compile.
+    case empty
 }
 
 /// A set of enabled feature flags.

Sources/_OpenAPIGeneratorCore/Parser/validateDoc.swift

@@ -18,9 +18,6 @@
 ///   - config: The generator config.
 /// - Throws: An error if a fatal issue is found.
 func validateDoc(_ doc: ParsedOpenAPIRepresentation, config: Config) throws -> [Diagnostic] {
-    guard config.featureFlags.contains(.strictOpenAPIValidation) else {
-        return []
-    }
     // Run OpenAPIKit's built-in validation.
     // Pass `false` to `strict`, however, because we don't
     // want to turn schema loading warnings into errors.

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/SwiftSafeNames.swift

@@ -19,57 +19,12 @@ extension FileTranslator {
     ///
     /// - Parameter string: The string to convert to be safe for Swift.
     func swiftSafeName(for string: String) -> String {
-        guard config.featureFlags.contains(.proposal0001) else {
-            return string.safeForSwiftCode
-        }
-        return string.proposedSafeForSwiftCode
+        string.safeForSwiftCode
     }
 }
 
 fileprivate extension String {
 
-    /// Returns a string sanitized to be usable as a Swift identifier.
-    ///
-    /// For example, the string `$nake` would be returned as `_nake`, because
-    /// the dollar sign is not a valid character in a Swift identifier.
-    ///
-    /// In addition to replacing illegal characters with an underscores, also
-    /// ensures that the identifier starts with a letter and not a number.
-    var safeForSwiftCode: String {
-        guard !isEmpty else {
-            return "_empty"
-        }
-
-        // Only allow [a-zA-Z][a-zA-Z0-9_]*
-        // This is bad, is there something like percent encoding functionality but for general "allowed chars only"?
-
-        let firstCharSet: CharacterSet = .letters
-        let numbers: CharacterSet = .decimalDigits
-        let otherCharSet: CharacterSet = .alphanumerics.union(.init(charactersIn: "_"))
-
-        var sanitizedScalars: [Unicode.Scalar] = []
-        for (index, scalar) in unicodeScalars.enumerated() {
-            let allowedSet = index == 0 ? firstCharSet : otherCharSet
-            let outScalar: Unicode.Scalar
-            if allowedSet.contains(scalar) {
-                outScalar = scalar
-            } else if index == 0 && numbers.contains(scalar) {
-                sanitizedScalars.append("_")
-                outScalar = scalar
-            } else {
-                outScalar = "_"
-            }
-            sanitizedScalars.append(outScalar)
-        }
-
-        let validString = String(UnicodeScalarView(sanitizedScalars))
-
-        guard Self.keywords.contains(validString) else {
-            return validString
-        }
-        return "_\(validString)"
-    }
-
     /// Returns a string sanitized to be usable as a Swift identifier.
     ///
     /// See the proposal SOAR-0001 for details.
@@ -81,7 +36,7 @@ fileprivate extension String {
     ///
     /// In addition to replacing illegal characters, it also
     /// ensures that the identifier starts with a letter and not a number.
-    var proposedSafeForSwiftCode: String {
+    var safeForSwiftCode: String {
         guard !isEmpty else {
             return "_empty"
         }

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateAllAnyOneOf.swift

@@ -207,11 +207,9 @@ extension FileTranslator {
 
         let caseNames = cases.map(\.0)
 
-        let undocumentedType: TypeName
         let codingKeysDecls: [Declaration]
         let decoder: Declaration
         if let discriminator {
-            undocumentedType = .objectContainer
             let originalName = discriminator.propertyName
             let swiftName = swiftSafeName(for: originalName)
             codingKeysDecls = [
@@ -232,33 +230,12 @@ extension FileTranslator {
                 cases: cases.map { ($0.0, $0.1!) }
             )
         } else {
-            undocumentedType = .valueContainer
             codingKeysDecls = []
             decoder = translateOneOfWithoutDiscriminatorDecoder(
                 caseNames: caseNames
             )
         }
 
-        let generateUndocumentedCase = shouldGenerateUndocumentedCaseForEnumsAndOneOfs
-
-        let otherCases: [Declaration]
-        if generateUndocumentedCase {
-            let undocumentedCase: Declaration = .commentable(
-                .doc("Parsed a case that was not defined in the OpenAPI document."),
-                .enumCase(
-                    name: Constants.OneOf.undocumentedCaseName,
-                    kind: .nameWithAssociatedValues([
-                        .init(type: undocumentedType.fullyQualifiedSwiftName)
-                    ])
-                )
-            )
-            otherCases = [
-                undocumentedCase
-            ]
-        } else {
-            otherCases = []
-        }
-
         let encoder = translateOneOfEncoder(caseNames: caseNames)
 
         let comment: Comment? =
@@ -269,7 +246,7 @@ extension FileTranslator {
             accessModifier: config.access,
             name: typeName.shortSwiftName,
             conformances: Constants.ObjectStruct.conformances,
-            members: caseDecls + otherCases + codingKeysDecls + [
+            members: caseDecls + codingKeysDecls + [
                 decoder,
                 encoder,
             ]

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateCodable.swift

@@ -339,61 +339,11 @@ extension FileTranslator {
             )
         }
 
-        let generateUndocumentedCase = shouldGenerateUndocumentedCaseForEnumsAndOneOfs
-        let otherExprs: [CodeBlock]
-        if generateUndocumentedCase {
-            otherExprs = [
-                .declaration(
-                    .variable(
-                        kind: .let,
-                        left: "container",
-                        right: .try(
-                            .identifier("decoder")
-                                .dot("singleValueContainer")
-                                .call([])
-                        )
-                    )
-                ),
-                .declaration(
-                    .variable(
-                        kind: .let,
-                        left: "value",
-                        right: .try(
-                            .identifier("container")
-                                .dot("decode")
-                                .call([
-                                    .init(
-                                        label: nil,
-                                        expression:
-                                            .identifier(
-                                                TypeName
-                                                    .valueContainer
-                                                    .fullyQualifiedSwiftName
-                                            )
-                                            .dot("self")
-                                    )
-                                ])
-                        )
-                    )
-                ),
-                .expression(
-                    .assignment(
-                        left: .identifier("self"),
-                        right: .dot(Constants.OneOf.undocumentedCaseName)
-                            .call([
-                                .init(label: nil, expression: .identifier("value"))
-                            ])
-                    )
-                ),
-            ]
-        } else {
-            otherExprs = [
-                .expression(
-                    translateOneOfDecoderThrowOnUnknownExpr()
-                )
-            ]
-        }
-
+        let otherExprs: [CodeBlock] = [
+            .expression(
+                translateOneOfDecoderThrowOnUnknownExpr()
+            )
+        ]
         return decoderInitializer(
             body: (assignExprs).map { .expression($0) } + otherExprs
         )
@@ -447,60 +397,11 @@ extension FileTranslator {
                     ]
                 )
             }
-        let generateUndocumentedCase = shouldGenerateUndocumentedCaseForEnumsAndOneOfs
-        let otherExprs: [CodeBlock]
-        if generateUndocumentedCase {
-            otherExprs = [
-                .declaration(
-                    .variable(
-                        kind: .let,
-                        left: "container",
-                        right: .try(
-                            .identifier("decoder")
-                                .dot("singleValueContainer")
-                                .call([])
-                        )
-                    )
-                ),
-                .declaration(
-                    .variable(
-                        kind: .let,
-                        left: "value",
-                        right: .try(
-                            .identifier("container")
-                                .dot("decode")
-                                .call([
-                                    .init(
-                                        label: nil,
-                                        expression:
-                                            .identifier(
-                                                TypeName
-                                                    .objectContainer
-                                                    .fullyQualifiedSwiftName
-                                            )
-                                            .dot("self")
-                                    )
-                                ])
-                        )
-                    )
-                ),
-                .expression(
-                    .assignment(
-                        left: .identifier("self"),
-                        right: .dot(Constants.OneOf.undocumentedCaseName)
-                            .call([
-                                .init(label: nil, expression: .identifier("value"))
-                            ])
-                    )
-                ),
-            ]
-        } else {
-            otherExprs = [
-                .expression(
-                    translateOneOfDecoderThrowOnUnknownExpr()
-                )
-            ]
-        }
+        let otherExprs: [CodeBlock] = [
+            .expression(
+                translateOneOfDecoderThrowOnUnknownExpr()
+            )
+        ]
         let body: [CodeBlock] = [
             .declaration(.decoderContainerOfKeysVar()),
             .declaration(
@@ -546,27 +447,19 @@ extension FileTranslator {
     func translateOneOfEncoder(
         caseNames: [String]
     ) -> Declaration {
-        let generateUndocumentedCase = shouldGenerateUndocumentedCaseForEnumsAndOneOfs
-        let otherCaseNames: [String]
-        if generateUndocumentedCase {
-            otherCaseNames = [Constants.OneOf.undocumentedCaseName]
-        } else {
-            otherCaseNames = []
-        }
         let switchExpr: Expression = .switch(
             switchedExpression: .identifier("self"),
-            cases: (caseNames + otherCaseNames)
-                .map { caseName in
-                    .init(
-                        kind: .case(.dot(caseName), ["value"]),
-                        body: [
-                            .expression(
-                                .identifier("value")
-                                    .encodeExpr()
-                            )
-                        ]
-                    )
-                }
+            cases: caseNames.map { caseName in
+                .init(
+                    kind: .case(.dot(caseName), ["value"]),
+                    body: [
+                        .expression(
+                            .identifier("value")
+                                .encodeExpr()
+                        )
+                    ]
+                )
+            }
         )
         return encoderFunction(body: [.expression(switchExpr)])
     }