Skip to content

Commit

Permalink
Merge pull request #6 from amzn/shape_conversion_fail_check-map
Browse files Browse the repository at this point in the history 
Add map case for willShapeConversionFail
  • Loading branch information
@jaechoi2
jaechoi2 authored Sep 27, 2019
2 parents f5c2f6a + 73493fb commit b4ddc57
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
24 changes: 12 additions & 12 deletions Sources/ServiceModelGenerate/ServiceModelCodeGenerator+generateConversionFunctions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ extension ServiceModelCodeGenerator {
let willConversionFail = willShapeConversionFail(fieldName: innerType, alreadySeenShapes: [])

let tryPrefix: String
let failPostix: String
let failPostfix: String
if willConversionFail {
tryPrefix = "try "
failPostix = " throws"
failPostfix = " throws"
} else {
tryPrefix = ""
failPostix = ""
failPostfix = ""
}

let category = getShapeCategory(fieldName: innerType,
Expand All @@ -48,7 +48,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Array where Element: \(type) {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.map { \(tryPrefix)$0.as\(baseName)Model\(innerTypeName)() }
}
}
Expand All @@ -57,7 +57,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Array where \(whereClause) {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.map { \(tryPrefix)$0.as\(baseName)Model\(innerTypeName)() }
}
}
Expand All @@ -66,7 +66,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Array where Element: CustomStringConvertible {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.map { \(tryPrefix)$0.as\(baseName)Model\(innerTypeName)() }
}
}
Expand All @@ -82,13 +82,13 @@ extension ServiceModelCodeGenerator {
let willConversionFail = willShapeConversionFail(fieldName: valueType, alreadySeenShapes: [])

let tryPrefix: String
let failPostix: String
let failPostfix: String
if willConversionFail {
tryPrefix = "try "
failPostix = " throws"
failPostfix = " throws"
} else {
tryPrefix = ""
failPostix = ""
failPostfix = ""
}

let category = getShapeCategory(fieldName: valueType,
Expand All @@ -101,7 +101,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Dictionary where Key == String, Value: \(type) {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.mapValues { \(tryPrefix)$0.as\(baseName)Model\(valueType)() }
}
}
Expand All @@ -110,7 +110,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Dictionary where Key == String, \(whereClause) {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.mapValues { \(tryPrefix)$0.as\(baseName)Model\(valueType)() }
}
}
Expand All @@ -119,7 +119,7 @@ extension ServiceModelCodeGenerator {
fileBuilder.appendLine("""
public extension Dictionary where Value: CustomStringConvertible {
func as\(baseName)Model\(typeName)()\(failPostix) -> \(baseName)Model.\(typeName) {
func as\(baseName)Model\(typeName)()\(failPostfix) -> \(baseName)Model.\(typeName) {
return \(tryPrefix)self.mapValues { \(tryPrefix)$0.as\(baseName)Model\(valueType)() }
}
}
Expand Down
14 changes: 8 additions & 6 deletions Sources/ServiceModelGenerate/ServiceModelCodeGenerator+shapeConversion.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ internal extension ServiceModelCodeGenerator {
private func getListShapeToInstanceConversion(fieldName: String, type: String,
variableName: String, isRequired: Bool) -> (setup: String?, fieldShape: String) {
let willConversionFail = willShapeConversionFail(fieldName: type, alreadySeenShapes: [])
let failPostix = willConversionFail ? "try " : ""
let failPostfix = willConversionFail ? "try " : ""
let optionalInfix = isRequired ? "" : "?"

let typeName = type.getNormalizedTypeName(forModel: model)
Expand All @@ -126,7 +126,7 @@ internal extension ServiceModelCodeGenerator {
setupBuilder = "let converted\(capitalizedVariableName) = \(variableName)"
} else {
let fieldType = "[\(baseName)Model.\(typeName)]\(optionalInfix)"
setupBuilder = "let converted\(capitalizedVariableName): \(fieldType) = \(failPostix)\(variableName)\(optionalInfix).map { entry in\n"
setupBuilder = "let converted\(capitalizedVariableName): \(fieldType) = \(failPostfix)\(variableName)\(optionalInfix).map { entry in\n"

if let setup = conversionDetails.setup {
setup.split(separator: "\n").forEach { line in setupBuilder += " \(line)\n" }
Expand All @@ -144,7 +144,7 @@ internal extension ServiceModelCodeGenerator {
valueType: String, variableName: String,
isRequired: Bool) -> (setup: String?, fieldShape: String) {
let willConversionFail = willShapeConversionFail(fieldName: valueType, alreadySeenShapes: [])
let failPostix = willConversionFail ? "try " : ""
let failPostfix = willConversionFail ? "try " : ""
let optionalInfix = isRequired ? "" : "?"

let keyTypeName = keyType.getNormalizedTypeName(forModel: model)
Expand All @@ -163,7 +163,7 @@ internal extension ServiceModelCodeGenerator {

// if there is actually conversion on each element
if conversionDetails.conversion != "entry" {
var setupBuilder = "let converted\(capitalizedVariableName): \(fieldType) = \(failPostix)\(variableName)\(optionalInfix).mapValues { entry in\n"
var setupBuilder = "let converted\(capitalizedVariableName): \(fieldType) = \(failPostfix)\(variableName)\(optionalInfix).mapValues { entry in\n"

if let setup = conversionDetails.setup {
setup.split(separator: "\n").forEach { line in setupBuilder += " \(line)\n" }
Expand Down Expand Up @@ -205,9 +205,9 @@ internal extension ServiceModelCodeGenerator {
let optionalInfix = isRequired ? "" : "?"

let willConversionFail = willShapeConversionFail(fieldName: fieldName, alreadySeenShapes: [])
let failPostix = willConversionFail ? "try " : ""
let failPostfix = willConversionFail ? "try " : ""

fieldShape = "\(failPostix)\(variableName)\(optionalInfix).as\(baseName)Model\(fieldName)()"
fieldShape = "\(failPostfix)\(variableName)\(optionalInfix).as\(baseName)Model\(fieldName)()"
}

return (fieldShape, setup)
Expand All @@ -230,6 +230,8 @@ internal extension ServiceModelCodeGenerator {
}
case .list(type: let type, lengthConstraint: _):
return willShapeConversionFail(fieldName: type, alreadySeenShapes: newAlreadySeenShapes)
case .map( keyType: _, let valueType, lengthConstraint: _ ):
return willShapeConversionFail( fieldName: valueType, alreadySeenShapes: newAlreadySeenShapes )
default:
break
}
Expand Down

0 comments on commit b4ddc57

Please sign in to comment.