Escape Swift identifiers in cases of enum declarations

Fixes apollographql/apollo-ios#53.
apollographql · Feb 7, 2017 · cb28707 · cb28707
1 parent a32ed2e
commit cb28707
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/swift/codeGeneration.js b/src/swift/codeGeneration.js
@@ -430,7 +430,7 @@ function enumerationDeclaration(generator, type) {
   generator.printOnNewline(`public enum ${name}: String`);
   generator.withinBlock(() => {
     values.forEach(value =>
-      generator.printOnNewline(`case ${camelCase(value.name)} = "${value.value}"${wrap(' /// ', value.description)}`)
+      generator.printOnNewline(`case ${escapeIdentifierIfNeeded(camelCase(value.name))} = "${value.value}"${wrap(' /// ', value.description)}`)
     );
   });
   generator.printNewline();

diff --git a/test/swift/codeGeneration.js b/test/swift/codeGeneration.js
@@ -10,7 +10,8 @@ import {
   GraphQLInt,
   GraphQLList,
   GraphQLNonNull,
-  GraphQLInputObjectType
+  GraphQLInputObjectType,
+  GraphQLEnumType
 } from 'graphql';
 
 import {
@@ -841,6 +842,26 @@ describe('Swift code generation', function() {
       `);
     });
 
+    it('should escape identifiers in cases of enum declaration for a GraphQLEnumType', function() {
+      const generator = new CodeGenerator();
+
+      const albumPrivaciesEnum = new GraphQLEnumType({
+        name: 'AlbumPrivacies',
+        values: { PUBLIC: { value: "PUBLIC" }, PRIVATE: { value: "PRIVATE" } }
+      });
+
+      typeDeclarationForGraphQLType(generator, albumPrivaciesEnum);
+
+      expect(generator.output).to.equal(stripIndent`
+        public enum AlbumPrivacies: String {
+          case \`public\` = "PUBLIC"
+          case \`private\` = "PRIVATE"
+        }
+
+        extension AlbumPrivacies: JSONDecodable, JSONEncodable {}
+      `);
+    });
+
     it('should generate a struct declaration for a GraphQLInputObjectType', function() {
       const generator = new CodeGenerator();