Skip to content

Commit f8c2598

Browse files
committed
dont pascal case enums for mis
1 parent f1c23f4 commit f8c2598

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed

packages/appsync-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-model-introspection-visitor.test.ts.snap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2971,6 +2971,13 @@ exports[`Model Introspection Visitor Metadata snapshot should generate correct m
29712971
\\"enumVal1\\",
29722972
\\"enumVal2\\"
29732973
]
2974+
},
2975+
\\"camel\\": {
2976+
\\"name\\": \\"camel\\",
2977+
\\"values\\": [
2978+
\\"bactrian\\",
2979+
\\"dromedary\\"
2980+
]
29742981
}
29752982
},
29762983
\\"nonModels\\": {

packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-model-introspection-visitor.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ describe('Model Introspection Visitor', () => {
115115
interface SimpleInterface {
116116
firstName: String!
117117
}
118+
enum camel {
119+
bactrian
120+
dromedary
121+
}
118122
union SimpleUnion = SimpleModel | SimpleEnum | SimpleNonModelType | SimpleInput | SimpleInterface
119123
`;
120124
const visitor: AppSyncModelIntrospectionVisitor = getVisitor(schema);
@@ -143,6 +147,10 @@ describe('Model Introspection Visitor', () => {
143147
expect((visitor as any).getType('SimpleInterface')).toEqual({ interface: 'SimpleInterface' });
144148
});
145149

150+
it('should not pascal case enum', () => {
151+
expect((visitor as any).getType('camel')).toEqual({ enum: 'camel' })
152+
})
153+
146154
it('should throw error for unknown type', () => {
147155
expect(() => (visitor as any).getType('unknown')).toThrowError('Unknown type');
148156
});

packages/appsync-modelgen-plugin/src/visitors/appsync-dart-visitor.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
import { generateLicense } from '../utils/generateLicense';
2727
import { GraphQLSchema } from 'graphql';
2828
import { DART_SCALAR_MAP } from '../scalars';
29+
import { pascalCase } from 'change-case';
2930

3031
export interface RawAppSyncModelDartConfig extends RawAppSyncModelConfig {}
3132

@@ -166,7 +167,7 @@ export class AppSyncModelDartVisitor<
166167
//Enum
167168
Object.entries(this.getSelectedEnums()).forEach(([name, enumVal]) => {
168169
const body = Object.values(enumVal.values).join(',\n');
169-
result.push([`enum ${name} {`, indentMultiline(body), '}'].join('\n'));
170+
result.push([`enum ${pascalCase(name)} {`, indentMultiline(body), '}'].join('\n'));
170171
});
171172
return result.join('\n\n');
172173
}

packages/appsync-modelgen-plugin/src/visitors/appsync-java-visitor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class AppSyncModelJavaVisitor<
158158
const enumDeclaration = new JavaDeclarationBlock()
159159
.asKind('enum')
160160
.access('public')
161-
.withName(this.getEnumName(enumValue))
161+
.withName(pascalCase(this.getEnumName(enumValue)))
162162
.annotate(['SuppressWarnings("all")'])
163163
.withComment('Auto generated enum from GraphQL schema.');
164164
const body = Object.values(enumValue.values);

packages/appsync-modelgen-plugin/src/visitors/appsync-swift-visitor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { indent, indentMultiline, NormalizedScalarsMap } from '@graphql-codegen/visitor-plugin-common';
2-
import { camelCase } from 'change-case';
2+
import { camelCase, pascalCase } from 'change-case';
33
import { GraphQLSchema } from 'graphql';
44
import { lowerCaseFirst } from 'lower-case-first';
55
import { plurality } from 'graphql-transformer-common';
@@ -305,7 +305,7 @@ export class AppSyncSwiftVisitor<
305305
.asKind('enum')
306306
.access('public')
307307
.withProtocols(['String', 'EnumPersistable'])
308-
.withName(this.getEnumName(enumValue));
308+
.withName(pascalCase(this.getEnumName(enumValue)));
309309

310310
Object.entries(enumValue.values).forEach(([name, value]) => {
311311
enumDeclaration.addEnumValue(name, value);

packages/appsync-modelgen-plugin/src/visitors/appsync-typescript-visitor.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
ParsedAppSyncModelConfig,
1010
RawAppSyncModelConfig,
1111
} from './appsync-visitor';
12+
import { pascalCase } from 'change-case';
1213

1314
export interface RawAppSyncModelTypeScriptConfig extends RawAppSyncModelConfig {}
1415
export interface ParsedAppSyncModelTypeScriptConfig extends ParsedAppSyncModelConfig {
@@ -77,7 +78,7 @@ export class AppSyncModelTypeScriptVisitor<
7778
protected generateEnumDeclarations(enumObj: CodeGenEnum, exportEnum: boolean = false): string {
7879
const enumDeclarations = new TypeScriptDeclarationBlock()
7980
.asKind('enum')
80-
.withName(this.getEnumName(enumObj))
81+
.withName(pascalCase(this.getEnumName(enumObj)))
8182
.withEnumValues(enumObj.values)
8283
.export(exportEnum);
8384

packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
ParsedConfig,
77
RawConfig,
88
} from '@graphql-codegen/visitor-plugin-common';
9-
import { camelCase, constantCase, pascalCase } from 'change-case';
9+
import { camelCase, constantCase } from 'change-case';
1010
import { plural } from 'pluralize';
1111
import crypto from 'crypto';
1212
import {
@@ -608,9 +608,9 @@ export class AppSyncModelVisitor<
608608

609609
protected getEnumName(enumField: CodeGenEnum | string): string {
610610
if (typeof enumField === 'string') {
611-
return pascalCase(enumField);
611+
return enumField;
612612
}
613-
return pascalCase(enumField.name);
613+
return enumField.name;
614614
}
615615

616616
protected getModelName(model: CodeGenModel) {

0 commit comments

Comments
 (0)