Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- `apollo-codegen-scala`
- <First `apollo-codegen-scala` related entry goes here>
- `apollo-codegen-swift`
- <First `apollo-codegen-scala` related entry goes here>
- Fix issue where a query referencing many fragments caused type checking for `queryDocument` to time out [#2198](https://github.com/apollographql/apollo-tooling/pull/2198)
- `apollo-codegen-typescript`
- <First `apollo-codegen-typescript` related entry goes here>
- `apollo-codegen-core`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,11 @@ exports[`Swift code generation #classDeclarationForOperation() should generate a

public let operationName: String = \\"Hero\\"

public var queryDocument: String { return operationDefinition.appending(\\"\\\\n\\" + HeroDetails.fragmentDefinition) }
public var queryDocument: String {
var document: String = operationDefinition
document.append(\\"\\\\n\\" + HeroDetails.fragmentDefinition)
return document
}

public init() {
}
Expand Down Expand Up @@ -460,7 +464,11 @@ exports[`Swift code generation #classDeclarationForOperation() should generate a

public let operationName: String = \\"Hero\\"

public var queryDocument: String { return operationDefinition.appending(\\"\\\\n\\" + DroidDetails.fragmentDefinition) }
public var queryDocument: String {
var document: String = operationDefinition
document.append(\\"\\\\n\\" + DroidDetails.fragmentDefinition)
return document
}

public init() {
}
Expand Down Expand Up @@ -633,7 +641,11 @@ exports[`Swift code generation #classDeclarationForOperation() should generate a

public let operationName: String = \\"Hero\\"

public var queryDocument: String { return operationDefinition.appending(\\"\\\\n\\" + HeroDetails.fragmentDefinition) }
public var queryDocument: String {
var document: String = operationDefinition
document.append(\\"\\\\n\\" + HeroDetails.fragmentDefinition)
return document
}

public init() {
}
Expand Down Expand Up @@ -834,7 +846,11 @@ exports[`Swift code generation #classDeclarationForOperation() should generate a

public let operationIdentifier: String? = \\"90d0d674eb6a7b33776f63200d6cec3d09f881247c360a2ac9a29037a02210c4\\"

public var queryDocument: String { return operationDefinition.appending(\\"\\\\n\\" + HeroDetails.fragmentDefinition) }
public var queryDocument: String {
var document: String = operationDefinition
document.append(\\"\\\\n\\" + HeroDetails.fragmentDefinition)
return document
}

public init() {
}
Expand Down
21 changes: 12 additions & 9 deletions packages/apollo-codegen-swift/src/codeGeneration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,17 +262,20 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {

if (fragmentsReferenced.size > 0) {
this.printNewlineIfNeeded();
this.printOnNewline(
swift`public var queryDocument: String { return operationDefinition`
);
fragmentsReferenced.forEach(fragmentName => {
this.print(
swift`.appending("\\n" + ${this.helpers.structNameForFragmentName(
fragmentName
)}.fragmentDefinition)`
this.printOnNewline(swift`public var queryDocument: String`);
this.withinBlock(() => {
this.printOnNewline(
swift`var document: String = operationDefinition`
);
fragmentsReferenced.forEach(fragmentName => {
this.printOnNewline(
swift`document.append("\\n" + ${this.helpers.structNameForFragmentName(
fragmentName
)}.fragmentDefinition)`
);
});
this.printOnNewline(swift`return document`);
});
this.print(swift` }`);
}

this.printNewlineIfNeeded();
Expand Down