This PR contains the work done to cleans up the library after the Swift 6.2 migration: drops the legacy conditional-compilation paths, hardens the OpenAPI specification, removes boilerplate from the live client, and makes the live test suite resilient to changes in the upstream service data.
* Swift 6.2 baseline
* Adopted swift-tools-version: 6.2, which allowed removing every #if swift(>=6.0) / #if swift(>=6.2) branch and natural-language test names are now the only code paths.
* `AmiiboClient` client now refines `Sendable`, and both `AmiiboLiveClient` and `AmiiboService` conform to it, so instances can be shared across concurrency domains.
* Live client
* Extracted a generic `perform(_:)` helper that wraps every generated API call and funnels transport errors through the existing error mapper — replaces six repeated do/catch blocks and lets the private fetch* methods use typed throws end-to-end.
* Added the internal `KeyNamePayload` protocol and a generic makeModels(from:), collapsing the four near-identical mapping/sorting blocks for amiibo series, types, game characters and game series into one.
* The server URL is now resolved once into a static let constant instead of on every initialization.
* Improved error mapping: URLError.cancelled → .cancelled, .cannotParseResponse → .decoding, and .dataNotAllowed, .internationalRoamingOff, .secureConnectionFailed now map to .notAvailable.
* Simplified the Amiibo.Platform initializer ([Amiibo+Platform.swift](vscode-webview://1m6rk4uhpaukb4hrbp3j54p77iq693fq2ql7o9oup2pca1omf7f6/Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Platform.swift)) using optional chaining and ?? [] instead of nested guards and immediately-invoked closures.
* Set the en_US_POSIX locale on both fixed-format date formatters so the user's locale or 12/24-hour setting can no longer break parsing.
* OpenAPI specification
* Replaced the shared Tuple schema with explicit per-type schemas (AmiiboSeries, AmiiboType, GameCharacter, GameSeries), so the generated code exposes real properties instead of allOf wrappers with .value1 accessors.
* Extracted named list schemas (AmiiboList, AmiiboSeriesList, …) for the wrapper payloads, which turns the generated .case2 enum cases into readable .AmiiboSeriesList cases.
* Added validation patterns and length bounds to the id, head, tail and key query parameters, and collapsed the redundant pattern/minLength/maxLength triplets on head/tail into ^[0-9a-fA-F]{8}$.
* Extracted the shared InternalServerError response, replacing the five inline 500 descriptions.
* Documented the two non-standard date/time decoding behaviours (date-only strings for release dates, offset-less timestamps for lastUpdated) and why the optional amiibo wrapper property must stay optional.
* Corrected the info.version value from v1.0.0 to 1.0.0.
* ⚠️ Breaking changes
* Minimum Swift version raised from 5.10 to 6.2.
* `AmiiboServiceError.unknown` now carries a String description of the underlying error.
* `AmiiboClient` requires Sendable conformance, so existing custom mock clients must be Sendable.
Reviewed-on: #28
Co-authored-by: Javier Cicchelli <javier@rock-n-code.com>
Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
210 lines
7.0 KiB
Swift
210 lines
7.0 KiB
Swift
// ===----------------------------------------------------------------------===
|
|
//
|
|
// This source file is part of the Amiibo Service open source project
|
|
//
|
|
// Copyright (c) 2026 Röck+Cöde VoF. and the Amiibo Service project authors
|
|
// Licensed under Apache license v2.0
|
|
//
|
|
// See LICENSE for license information
|
|
// See CONTRIBUTORS for the list of Amiibo Service project authors
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
// ===----------------------------------------------------------------------===
|
|
|
|
import AmiiboService
|
|
import Foundation
|
|
|
|
/// A mock implementation of ``AmiiboClient`` that returns pre-configured data or throws pre-configured errors, for testing purposes.
|
|
struct AmiiboMockClient {
|
|
|
|
// MARK: Properties
|
|
|
|
/// The list of amiibo items to return when ``getAmiibos(by:)`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let amiibos: [Amiibo]?
|
|
|
|
/// The list of amiibo series to return when ``getAmiiboSeries(by:)`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let amiiboSeries: [AmiiboSeries]?
|
|
|
|
/// The list of amiibo types to return when ``getAmiiboTypes(by:)`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let amiiboTypes: [AmiiboType]?
|
|
|
|
/// An error to throw before returning any data. Takes precedence over stored data when set.
|
|
private let error: AmiiboServiceError?
|
|
|
|
/// The list of game characters to return when ``getGameCharacters(by:)`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let gameCharacters: [GameCharacter]?
|
|
|
|
/// The list of game series to return when ``getGameSeries(by:)`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let gameSeries: [GameSeries]?
|
|
|
|
/// The last updated date to return when ``getLastUpdated()`` is called, or `nil` to trigger a ``AmiiboServiceError/notFound`` error.
|
|
private let lastUpdated: Date?
|
|
|
|
// MARK: Initializers
|
|
|
|
/// Initializes this client.
|
|
/// - Parameters:
|
|
/// - amiibos: A list of amiibo items to return, if any.
|
|
/// - amiiboSeries: A list of amiibo series to return, if any.
|
|
/// - amiiboTypes: A list of amiibo types to return, if any.
|
|
/// - gameCharacters: A list of game characters to return, if any.
|
|
/// - gameSeries: A list of game series to return, if any.
|
|
/// - lastUpdated: A last updated date to return, if any.
|
|
/// - error: An error to throw, if any.
|
|
init(
|
|
amiibos: [Amiibo]? = nil,
|
|
amiiboSeries: [AmiiboSeries]? = nil,
|
|
amiiboTypes: [AmiiboType]? = nil,
|
|
gameCharacters: [GameCharacter]? = nil,
|
|
gameSeries: [GameSeries]? = nil,
|
|
lastUpdated: Date? = nil,
|
|
error: AmiiboServiceError? = nil
|
|
) {
|
|
self.amiibos = amiibos
|
|
self.amiiboSeries = amiiboSeries
|
|
self.amiiboTypes = amiiboTypes
|
|
self.error = error
|
|
self.gameCharacters = gameCharacters
|
|
self.gameSeries = gameSeries
|
|
self.lastUpdated = lastUpdated
|
|
}
|
|
|
|
}
|
|
|
|
// MARK: - AmiiboClient
|
|
|
|
extension AmiiboMockClient: AmiiboClient {
|
|
|
|
// MARK: Functions
|
|
|
|
func getAmiibos(
|
|
by filter: AmiiboFilter
|
|
) async throws(AmiiboServiceError) -> [Amiibo] {
|
|
try fetchAmiibosIfAny()
|
|
}
|
|
|
|
func getAmiiboSeries(
|
|
by filter: AmiiboSeriesFilter
|
|
) async throws(AmiiboServiceError) -> [AmiiboSeries] {
|
|
try fetchAmiiboSeriesIfAny()
|
|
}
|
|
|
|
func getAmiiboTypes(
|
|
by filter: AmiiboTypeFilter
|
|
) async throws(AmiiboServiceError) -> [AmiiboType] {
|
|
try fetchAmiiboTypesIfAny()
|
|
}
|
|
|
|
func getGameCharacters(
|
|
by filter: GameCharacterFilter
|
|
) async throws(AmiiboServiceError) -> [GameCharacter] {
|
|
try fetchGameCharactersIfAny()
|
|
}
|
|
|
|
func getGameSeries(
|
|
by filter: GameSeriesFilter
|
|
) async throws(AmiiboServiceError) -> [GameSeries] {
|
|
try fetchGameSeriesIfAny()
|
|
}
|
|
|
|
func getLastUpdated() async throws(AmiiboServiceError) -> Date {
|
|
try fetchLastUpdatedIfAny()
|
|
}
|
|
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
|
|
private extension AmiiboMockClient {
|
|
|
|
// MARK: Functions
|
|
|
|
/// Fetches a list of amiibo items, if any.
|
|
/// - Returns: A list of amiibo items.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchAmiibosIfAny() throws(AmiiboServiceError) -> [Amiibo] {
|
|
try throwErrorIfExists()
|
|
|
|
guard let amiibos else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return amiibos
|
|
}
|
|
|
|
/// Fetches a list of amiibo series, if any.
|
|
/// - Returns: A list of amiibo series.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchAmiiboSeriesIfAny() throws(AmiiboServiceError) -> [AmiiboSeries] {
|
|
try throwErrorIfExists()
|
|
|
|
guard let amiiboSeries else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return amiiboSeries
|
|
}
|
|
|
|
/// Fetches a list of amiibo types, if any.
|
|
/// - Returns: A list of amiibo types.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchAmiiboTypesIfAny() throws(AmiiboServiceError) -> [AmiiboType] {
|
|
try throwErrorIfExists()
|
|
|
|
guard let amiiboTypes else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return amiiboTypes
|
|
}
|
|
|
|
/// Fetches a list of game characters, if any.
|
|
/// - Returns: A list of game characters.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchGameCharactersIfAny() throws(AmiiboServiceError) -> [GameCharacter] {
|
|
try throwErrorIfExists()
|
|
|
|
guard let gameCharacters else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return gameCharacters
|
|
}
|
|
|
|
/// Fetches a list of game series, if any.
|
|
/// - Returns: A list of game series, if any.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchGameSeriesIfAny() throws(AmiiboServiceError) -> [GameSeries] {
|
|
try throwErrorIfExists()
|
|
|
|
guard let gameSeries else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return gameSeries
|
|
}
|
|
|
|
/// Fetches a last updated date, if any.
|
|
/// - Returns: A last updated date.
|
|
/// - Throws: An ``AmiiboServiceError`` error in case an error has been provided.
|
|
func fetchLastUpdatedIfAny() throws(AmiiboServiceError) -> Date {
|
|
try throwErrorIfExists()
|
|
|
|
guard let lastUpdated else {
|
|
throw AmiiboServiceError.notFound
|
|
}
|
|
|
|
return lastUpdated
|
|
}
|
|
|
|
/// Throws the configured error if one has been provided.
|
|
/// - Throws: An ``AmiiboServiceError`` error if one was configured during initialization.
|
|
func throwErrorIfExists() throws(AmiiboServiceError) {
|
|
if let error {
|
|
throw error
|
|
}
|
|
}
|
|
|
|
}
|