Skip to content
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

Jump to bottom

fix: Additional reserved keyword #2772

Merged
merged 2 commits into from
Jan 11, 2023
Merged

fix: Additional reserved keyword #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bdec2f
Adds reserved words to be escaped
calvincestari Jan 11, 2023
ef9b4b4
Enum test case cleanup
calvincestari Jan 11, 2023
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
1 change: 1 addition & 0 deletions Sources/ApolloCodegenLib/Templates/RenderingHelpers/String+SwiftNameEscaping.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ enum SwiftKeywords {
"do",
"else",
"fallthrough",
"for",
"guard",
"if",
"in",
Expand Down
200 changes: 0 additions & 200 deletions Tests/ApolloCodegenTests/CodeGeneration/Templates/EnumTemplateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,57 +129,7 @@ class EnumTemplateTests: XCTestCase {

// Escaped keywords
("associatedtype", nil, nil),
("class", nil, nil),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is test cleanup - I'm not sure why we need all the escaped keywords in this test so I left two with different casing that require backticks.

("deinit", nil, nil),
("enum", nil, nil),
("extension", nil, nil),
("fileprivate", nil, nil),
("func", nil, nil),
("import", nil, nil),
("init", nil, nil),
("inout", nil, nil),
("internal", nil, nil),
("let", nil, nil),
("operator", nil, nil),
("private", nil, nil),
("precedencegroup", nil, nil),
("protocol", nil, nil),
("Protocol", nil, nil),
("public", nil, nil),
("rethrows", nil, nil),
("static", nil, nil),
("struct", nil, nil),
("subscript", nil, nil),
("typealias", nil, nil),
("var", nil, nil),
("break", nil, nil),
("case", nil, nil),
("catch", nil, nil),
("continue", nil, nil),
("default", nil, nil),
("defer", nil, nil),
("do", nil, nil),
("else", nil, nil),
("fallthrough", nil, nil),
("guard", nil, nil),
("if", nil, nil),
("in", nil, nil),
("repeat", nil, nil),
("return", nil, nil),
("throw", nil, nil),
("switch", nil, nil),
("where", nil, nil),
("while", nil, nil),
("as", nil, nil),
("false", nil, nil),
("is", nil, nil),
("nil", nil, nil),
("self", nil, nil),
("Self", nil, nil),
("super", nil, nil),
("throws", nil, nil),
("true", nil, nil),
("try", nil, nil),
],
config: .mock(
options: .init(conversionStrategies: .init(enumCases: .camelCase))
Expand All @@ -199,57 +149,7 @@ class EnumTemplateTests: XCTestCase {
case upperCamelCase = "UpperCamelCase"
case before2023 = "BEFORE2023"
case `associatedtype` = "associatedtype"
case `class` = "class"
case `deinit` = "deinit"
case `enum` = "enum"
case `extension` = "extension"
case `fileprivate` = "fileprivate"
case `func` = "func"
case `import` = "import"
case `init` = "init"
case `inout` = "inout"
case `internal` = "internal"
case `let` = "let"
case `operator` = "operator"
case `private` = "private"
case `precedencegroup` = "precedencegroup"
case `protocol` = "protocol"
case `protocol` = "Protocol"
case `public` = "public"
case `rethrows` = "rethrows"
case `static` = "static"
case `struct` = "struct"
case `subscript` = "subscript"
case `typealias` = "typealias"
case `var` = "var"
case `break` = "break"
case `case` = "case"
case `catch` = "catch"
case `continue` = "continue"
case `default` = "default"
case `defer` = "defer"
case `do` = "do"
case `else` = "else"
case `fallthrough` = "fallthrough"
case `guard` = "guard"
case `if` = "if"
case `in` = "in"
case `repeat` = "repeat"
case `return` = "return"
case `throw` = "throw"
case `switch` = "switch"
case `where` = "where"
case `while` = "while"
case `as` = "as"
case `false` = "false"
case `is` = "is"
case `nil` = "nil"
case `self` = "self"
case `self` = "Self"
case `super` = "super"
case `throws` = "throws"
case `true` = "true"
case `try` = "try"
}
"""
Expand Down Expand Up @@ -280,57 +180,7 @@ class EnumTemplateTests: XCTestCase {

// Escaped keywords
("associatedtype", nil, nil),
("class", nil, nil),
("deinit", nil, nil),
("enum", nil, nil),
("extension", nil, nil),
("fileprivate", nil, nil),
("func", nil, nil),
("import", nil, nil),
("init", nil, nil),
("inout", nil, nil),
("internal", nil, nil),
("let", nil, nil),
("operator", nil, nil),
("private", nil, nil),
("precedencegroup", nil, nil),
("protocol", nil, nil),
("Protocol", nil, nil),
("public", nil, nil),
("rethrows", nil, nil),
("static", nil, nil),
("struct", nil, nil),
("subscript", nil, nil),
("typealias", nil, nil),
("var", nil, nil),
("break", nil, nil),
("case", nil, nil),
("catch", nil, nil),
("continue", nil, nil),
("default", nil, nil),
("defer", nil, nil),
("do", nil, nil),
("else", nil, nil),
("fallthrough", nil, nil),
("guard", nil, nil),
("if", nil, nil),
("in", nil, nil),
("repeat", nil, nil),
("return", nil, nil),
("throw", nil, nil),
("switch", nil, nil),
("where", nil, nil),
("while", nil, nil),
("as", nil, nil),
("false", nil, nil),
("is", nil, nil),
("nil", nil, nil),
("self", nil, nil),
("Self", nil, nil),
("super", nil, nil),
("throws", nil, nil),
("true", nil, nil),
("try", nil, nil),
],
config: .mock(
options: .init(conversionStrategies: .init(enumCases: .none))
Expand All @@ -350,57 +200,7 @@ class EnumTemplateTests: XCTestCase {
case UpperCamelCase
case BEFORE2023
case `associatedtype`
case `class`
case `deinit`
case `enum`
case `extension`
case `fileprivate`
case `func`
case `import`
case `init`
case `inout`
case `internal`
case `let`
case `operator`
case `private`
case `precedencegroup`
case `protocol`
case `Protocol`
case `public`
case `rethrows`
case `static`
case `struct`
case `subscript`
case `typealias`
case `var`
case `break`
case `case`
case `catch`
case `continue`
case `default`
case `defer`
case `do`
case `else`
case `fallthrough`
case `guard`
case `if`
case `in`
case `repeat`
case `return`
case `throw`
case `switch`
case `where`
case `while`
case `as`
case `false`
case `is`
case `nil`
case `self`
case `Self`
case `super`
case `throws`
case `true`
case `try`
}
"""
Expand Down
12 changes: 12 additions & 0 deletions Tests/ApolloCodegenTests/CodeGeneration/Templates/InputObjectTemplateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,11 @@ class InputObjectTemplateTests: XCTestCase {
type: .nonNull(.string()),
defaultValue: nil
),
GraphQLInputField.mock(
"for",
type: .nonNull(.string()),
defaultValue: nil
),
GraphQLInputField.mock(
"guard",
type: .nonNull(.string()),
Expand Down Expand Up @@ -1533,6 +1538,7 @@ class InputObjectTemplateTests: XCTestCase {
`do`: String,
`else`: String,
`fallthrough`: String,
`for`: String,
`guard`: String,
`if`: String,
`in`: String,
Expand Down Expand Up @@ -1585,6 +1591,7 @@ class InputObjectTemplateTests: XCTestCase {
"do": `do`,
"else": `else`,
"fallthrough": `fallthrough`,
"for": `for`,
"guard": `guard`,
"if": `if`,
"in": `in`,
Expand Down Expand Up @@ -1766,6 +1773,11 @@ class InputObjectTemplateTests: XCTestCase {
set { __data["`fallthrough`"] = newValue }
}
public var `for`: String {
get { __data["`for`"] }
set { __data["`for`"] = newValue }
}
public var `guard`: String {
get { __data["`guard`"] }
set { __data["`guard`"] = newValue }
Expand Down
5 changes: 5 additions & 0 deletions Tests/ApolloCodegenTests/CodeGeneration/Templates/MockObjectTemplateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ class MockObjectTemplateTests: XCTestCase {
"do": .mock("do", type: .nonNull(.string())),
"else": .mock("else", type: .nonNull(.string())),
"fallthrough": .mock("fallthrough", type: .nonNull(.string())),
"for": .mock("for", type: .nonNull(.string())),
"guard": .mock("guard", type: .nonNull(.string())),
"if": .mock("if", type: .nonNull(.string())),
"in": .mock("in", type: .nonNull(.string())),
Expand Down Expand Up @@ -310,6 +311,7 @@ class MockObjectTemplateTests: XCTestCase {
@Field<String>("fallthrough") public var `fallthrough`
@Field<String>("false") public var `false`
@Field<String>("fileprivate") public var `fileprivate`
@Field<String>("for") public var `for`
@Field<String>("func") public var `func`
@Field<String>("guard") public var `guard`
@Field<String>("if") public var `if`
Expand Down Expand Up @@ -588,6 +590,7 @@ class MockObjectTemplateTests: XCTestCase {
"do": .mock("do", type: .nonNull(.string())),
"else": .mock("else", type: .nonNull(.string())),
"fallthrough": .mock("fallthrough", type: .nonNull(.string())),
"for": .mock("for", type: .nonNull(.string())),
"guard": .mock("guard", type: .nonNull(.string())),
"if": .mock("if", type: .nonNull(.string())),
"in": .mock("in", type: .nonNull(.string())),
Expand Down Expand Up @@ -644,6 +647,7 @@ class MockObjectTemplateTests: XCTestCase {
`fallthrough`: String? = nil,
`false`: String? = nil,
`fileprivate`: String? = nil,
`for`: String? = nil,
`func`: String? = nil,
`guard`: String? = nil,
`if`: String? = nil,
Expand Down Expand Up @@ -700,6 +704,7 @@ class MockObjectTemplateTests: XCTestCase {
self.`fallthrough` = `fallthrough`
self.`false` = `false`
self.`fileprivate` = `fileprivate`
self.`for` = `for`
self.`func` = `func`
self.`guard` = `guard`
self.`if` = `if`
Expand Down
5 changes: 5 additions & 0 deletions Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ class OperationDefinitionTemplateTests: XCTestCase {
$fallthrough: String
$false: String
$fileprivate: String
$for: String
$func: String
$guard: String
$if: String
Expand Down Expand Up @@ -529,6 +530,7 @@ class OperationDefinitionTemplateTests: XCTestCase {
public var `fallthrough`: GraphQLNullable<String>
public var `false`: GraphQLNullable<String>
public var `fileprivate`: GraphQLNullable<String>
public var `for`: GraphQLNullable<String>
public var `func`: GraphQLNullable<String>
public var `guard`: GraphQLNullable<String>
public var `if`: GraphQLNullable<String>
Expand Down Expand Up @@ -580,6 +582,7 @@ class OperationDefinitionTemplateTests: XCTestCase {
`fallthrough`: GraphQLNullable<String>,
`false`: GraphQLNullable<String>,
`fileprivate`: GraphQLNullable<String>,
`for`: GraphQLNullable<String>,
`func`: GraphQLNullable<String>,
`guard`: GraphQLNullable<String>,
`if`: GraphQLNullable<String>,
Expand Down Expand Up @@ -630,6 +633,7 @@ class OperationDefinitionTemplateTests: XCTestCase {
self.`fallthrough` = `fallthrough`
self.`false` = `false`
self.`fileprivate` = `fileprivate`
self.`for` = `for`
self.`func` = `func`
self.`guard` = `guard`
self.`if` = `if`
Expand Down Expand Up @@ -682,6 +686,7 @@ class OperationDefinitionTemplateTests: XCTestCase {
"fallthrough": `fallthrough`,
"false": `false`,
"fileprivate": `fileprivate`,
"for": `for`,
"func": `func`,
"guard": `guard`,
"if": `if`,
Expand Down
Loading