Skip to content

fix(api): handle enum casting in GraphQLSelectionSet snapshot #4164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Take111 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(api): handle enum casting in GraphQLSelectionSet snapshot #4164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,45 @@ public extension GraphQLSelectionSet {
let jsonData = try encoder.encode(jsonObject)
let decodedDictionary = try JSONSerialization.jsonObject(with: jsonData, options: []) as! [String: Any]
let optionalDictionary = decodedDictionary.mapValues { $0 as Any? }
self.init(snapshot: optionalDictionary)
let convertedDictionary = Self.convertFieldValues(
in: optionalDictionary, using: Self.selections
)
self.init(snapshot: convertedDictionary)
} else {
self.init(snapshot: [:])
}
}

private static func convertFieldValues(
in snapshot: Snapshot, using selections: [GraphQLSelection]
) -> Snapshot {
var result = snapshot
for selection in selections {
guard let field = selection as? GraphQLField else { continue }
let key = field.responseKey
guard let value = result[key], let unwrapped = value else { continue }
result[key] = convertValue(unwrapped, for: field.type)
}
return result
}

private static func convertValue(_ value: Any, for outputType: GraphQLOutputType) -> Any? {
switch outputType {
case .scalar(let decodableType):
if type(of: value) == decodableType {
return value
}
return (try? decodableType.init(jsonValue: value)) ?? value
case .nonNull(let innerType):
return convertValue(value, for: innerType)
case .list(let innerType):
guard let array = value as? [Any] else { return value }
return array.map { convertValue($0, for: innerType) ?? $0 }
case .object(let selections):
guard let dict = value as? [String: Any] else { return value }
return convertFieldValues(in: dict.mapValues { $0 as Any? }, using: selections)
}
}
}
enum APISwiftJSONValue: Codable {
case array([APISwiftJSONValue])
Expand Down
36 changes: 35 additions & 1 deletion AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLIAMTests/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,45 @@ public extension GraphQLSelectionSet {
let jsonData = try encoder.encode(jsonObject)
let decodedDictionary = try JSONSerialization.jsonObject(with: jsonData, options: []) as! [String: Any]
let optionalDictionary = decodedDictionary.mapValues { $0 as Any? }
self.init(snapshot: optionalDictionary)
let convertedDictionary = Self.convertFieldValues(
in: optionalDictionary, using: Self.selections
)
self.init(snapshot: convertedDictionary)
} else {
self.init(snapshot: [:])
}
}

private static func convertFieldValues(
in snapshot: Snapshot, using selections: [GraphQLSelection]
) -> Snapshot {
var result = snapshot
for selection in selections {
guard let field = selection as? GraphQLField else { continue }
let key = field.responseKey
guard let value = result[key], let unwrapped = value else { continue }
result[key] = convertValue(unwrapped, for: field.type)
}
return result
}

private static func convertValue(_ value: Any, for outputType: GraphQLOutputType) -> Any? {
switch outputType {
case .scalar(let decodableType):
if type(of: value) == decodableType {
return value
}
return (try? decodableType.init(jsonValue: value)) ?? value
case .nonNull(let innerType):
return convertValue(value, for: innerType)
case .list(let innerType):
guard let array = value as? [Any] else { return value }
return array.map { convertValue($0, for: innerType) ?? $0 }
case .object(let selections):
guard let dict = value as? [String: Any] else { return value }
return convertFieldValues(in: dict.mapValues { $0 as Any? }, using: selections)
}
}
}
enum APISwiftJSONValue: Codable {
case array([APISwiftJSONValue])
Expand Down
36 changes: 35 additions & 1 deletion AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLUserPoolTests/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,45 @@ public extension GraphQLSelectionSet {
let jsonData = try encoder.encode(jsonObject)
let decodedDictionary = try JSONSerialization.jsonObject(with: jsonData, options: []) as! [String: Any]
let optionalDictionary = decodedDictionary.mapValues { $0 as Any? }
self.init(snapshot: optionalDictionary)
let convertedDictionary = Self.convertFieldValues(
in: optionalDictionary, using: Self.selections
)
self.init(snapshot: convertedDictionary)
} else {
self.init(snapshot: [:])
}
}

private static func convertFieldValues(
in snapshot: Snapshot, using selections: [GraphQLSelection]
) -> Snapshot {
var result = snapshot
for selection in selections {
guard let field = selection as? GraphQLField else { continue }
let key = field.responseKey
guard let value = result[key], let unwrapped = value else { continue }
result[key] = convertValue(unwrapped, for: field.type)
}
return result
}

private static func convertValue(_ value: Any, for outputType: GraphQLOutputType) -> Any? {
switch outputType {
case .scalar(let decodableType):
if type(of: value) == decodableType {
return value
}
return (try? decodableType.init(jsonValue: value)) ?? value
case .nonNull(let innerType):
return convertValue(value, for: innerType)
case .list(let innerType):
guard let array = value as? [Any] else { return value }
return array.map { convertValue($0, for: innerType) ?? $0 }
case .object(let selections):
guard let dict = value as? [String: Any] else { return value }
return convertFieldValues(in: dict.mapValues { $0 as Any? }, using: selections)
}
}
}
enum APISwiftJSONValue: Codable {
case array([APISwiftJSONValue])
Expand Down
Loading
Loading