Skip to content

Commit 916ce59

Browse files
michaelnisitrevor-scheer
authored andcommitted
Append terminating newline to output (#1226)
1 parent 0da746e commit 916ce59

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- `apollo-codegen-scala`
1414
- <First `apollo-codegen-scala` related entry goes here>
1515
- `apollo-codegen-swift`
16-
- <First `apollo-codegen-swift` related entry goes here>
16+
- Append terminating newline character to generated files [#531](https://github.com/apollographql/apollo-ios/issues/531)
1717
- `apollo-codegen-typescript`
1818
- <First `apollo-codegen-typescript` related entry goes here>
1919
- `apollo-env`

packages/apollo/src/commands/client/__tests__/__snapshots__/generate.test.ts.snap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ public final class SimpleQueryQuery: GraphQLQuery {
208208
}
209209
}
210210
}
211-
}"
211+
}
212+
"
212213
`;
213214

214215
exports[`client:codegen writes swift types from local schema in a graphql file 1`] = `
@@ -249,7 +250,8 @@ public final class SimpleQueryQuery: GraphQLQuery {
249250
}
250251
}
251252
}
252-
}"
253+
}
254+
"
253255
`;
254256

255257
exports[`client:codegen writes types for query with only client-side data 1`] = `

packages/apollo/src/generate.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ export default function generate(
7373
const generator = generateSwiftSource(context, outputIndividualFiles, only);
7474

7575
if (outputIndividualFiles) {
76-
writeGeneratedFiles(generator.generatedFiles, outputPath);
76+
writeGeneratedFiles(generator.generatedFiles, outputPath, "\n");
7777
writtenFiles += Object.keys(generator.generatedFiles).length;
7878
} else {
79-
fs.writeFileSync(outputPath, generator.output);
79+
fs.writeFileSync(outputPath, generator.output.concat("\n"));
8080
writtenFiles += 1;
8181
}
8282

@@ -215,12 +215,13 @@ export default function generate(
215215

216216
function writeGeneratedFiles(
217217
generatedFiles: { [fileName: string]: BasicGeneratedFile },
218-
outputDirectory: string
218+
outputDirectory: string,
219+
terminator: string = ""
219220
) {
220221
for (const [fileName, generatedFile] of Object.entries(generatedFiles)) {
221222
fs.writeFileSync(
222223
path.join(outputDirectory, fileName),
223-
generatedFile.output
224+
generatedFile.output.concat(terminator)
224225
);
225226
}
226227
}

0 commit comments

Comments
 (0)