Fixed unquoted numeric enum identifiers

dotansimha · Oct 18, 2020 · ff3e7f4 · ff3e7f4
1 parent 92a6dc6
commit ff3e7f4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/.changeset/little-pillows-hunt.md b/.changeset/little-pillows-hunt.md
@@ -0,0 +1,6 @@
+---
+'@graphql-codegen/visitor-plugin-common': patch
+'@graphql-codegen/typescript': patch
+---
+
+Fixed unquoted numeric enum identifiers
diff --git a/packages/plugins/other/visitor-plugin-common/src/base-types-visitor.ts b/packages/plugins/other/visitor-plugin-common/src/base-types-visitor.ts
@@ -476,14 +476,23 @@ export class BaseTypesVisitor<
     return node.value;
   }
 
+  protected makeValidEnumIdentifier(identifier: string): string {
+    if (/^[0-9]/.exec(identifier)) {
+      return wrapWithSingleQuotes(identifier, true);
+    }
+    return identifier;
+  }
+
   protected buildEnumValuesBlock(typeName: string, values: ReadonlyArray<EnumValueDefinitionNode>): string {
     const schemaEnumType: GraphQLEnumType | undefined = this._schema
       ? (this._schema.getType(typeName) as GraphQLEnumType)
       : undefined;
 
     return values
       .map(enumOption => {
-        const optionName = this.convertName(enumOption, { useTypesPrefix: false, transformUnderscore: true });
+        const optionName = this.makeValidEnumIdentifier(
+          this.convertName(enumOption, { useTypesPrefix: false, transformUnderscore: true })
+        );
         const comment = transformComment((enumOption.description as any) as string, 1);
         const schemaEnumValue = schemaEnumType ? schemaEnumType.getValue(enumOption.name as any).value : undefined;
         let enumValue: string | number =

diff --git a/packages/plugins/typescript/typescript/tests/typescript.spec.ts b/packages/plugins/typescript/typescript/tests/typescript.spec.ts
@@ -491,6 +491,24 @@ describe('TypeScript', () => {
       expect(result.prepend[0]).toBe(`import MyEnum from './files';`);
     });
 
+    it('#4834 - enum members should be quoted if numeric', async () => {
+      const testSchema = buildSchema(/* GraphQL */ `
+        enum MediaItemSizeEnum {
+          AXB
+          _1X2
+          _3X4
+        }
+      `);
+
+      const result = (await plugin(testSchema, [], {})) as Types.ComplexPluginOutput;
+
+      expect(result.content).toBeSimilarStringTo(`export enum MediaItemSizeEnum {
+        Axb = 'AXB',
+        '1X2' = '_1X2',
+        '3X4' = '_3X4'
+      }`);
+    });
+
     it('#2976 - Issues with mapped enumValues and type prefix in args', async () => {
       const testSchema = buildSchema(/* GraphQL */ `
         enum MyEnum {