Skip to content

Commit 15ec74d

Browse files
committed
Run prettier
1 parent 3908186 commit 15ec74d

File tree

2 files changed

+50
-45
lines changed

2 files changed

+50
-45
lines changed

packages/cli/src/codegen/schema.test.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@ import * as graphql from 'graphql/language';
22
import prettier from 'prettier';
33
import Schema from '../schema';
44
import SchemaCodeGenerator from './schema';
5-
import {
6-
Class,
7-
Method,
8-
NamedType,
9-
NullableType,
10-
Param,
11-
StaticMethod,
12-
} from './typescript';
5+
import { Class, Method, NamedType, NullableType, Param, StaticMethod } from './typescript';
136

147
const formatTS = (code: string) => prettier.format(code, { parser: 'typescript', semi: false });
158

@@ -28,7 +21,6 @@ const testEntity = (generatedTypes: any[], expectedEntity: any) => {
2821
expect(members).toStrictEqual(expectedEntity.members);
2922

3023
for (const expectedMethod of expectedEntity.methods) {
31-
3224
const method = methods.find((method: any) => method.name === expectedMethod.name);
3325

3426
// eslint-disable-next-line @typescript-eslint/no-unused-expressions

packages/cli/src/codegen/schema.ts

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ export default class SchemaCodeGenerator {
106106

107107
generateDerivedLoaders() {
108108
const fields = this.schema.ast.definitions
109-
.filter((def) => this._isEntityTypeDefinition(def))
109+
.filter(def => this._isEntityTypeDefinition(def))
110110
.flatMap((def: any) => def.fields)
111111
.filter((def: any) => this._isDerivedField(def))
112112
.map((def: FieldDefinitionNode) => this._getTypeNameForField(def.type));
113113

114114
return [...new Set(fields)].map((typeName: any) => {
115-
return this._generateDerivedLoader(typeName)});
115+
return this._generateDerivedLoader(typeName);
116+
});
116117
}
117118

118119
_isEntityTypeDefinition(def: DefinitionNode): def is ObjectTypeDefinitionNode {
@@ -122,11 +123,11 @@ export default class SchemaCodeGenerator {
122123
);
123124
}
124125

125-
126126
_isDerivedField(field: any): boolean {
127-
return field.directives?.find(
128-
(directive: any) => directive.name.value === 'derivedFrom'
129-
) !== undefined
127+
return (
128+
field.directives?.find((directive: any) => directive.name.value === 'derivedFrom') !==
129+
undefined
130+
);
130131
}
131132
_isInterfaceDefinition(def: DefinitionNode): def is InterfaceTypeDefinitionNode {
132133
return def.kind === 'InterfaceTypeDefinition';
@@ -155,43 +156,61 @@ export default class SchemaCodeGenerator {
155156
return klass;
156157
}
157158

158-
159159
_generateDerivedLoader(typeName: string): any {
160160
// <field>Loader
161161
const klass = tsCodegen.klass(`${typeName}Loader`, { export: true, extends: 'Entity' });
162162

163-
klass.addMember(tsCodegen.klassMember("_entity", "string"))
164-
klass.addMember(tsCodegen.klassMember("_field", "string"))
165-
klass.addMember(tsCodegen.klassMember("_id", "string"))
163+
klass.addMember(tsCodegen.klassMember('_entity', 'string'));
164+
klass.addMember(tsCodegen.klassMember('_field', 'string'));
165+
klass.addMember(tsCodegen.klassMember('_id', 'string'));
166166
// Generate and add a constructor
167-
klass.addMethod(tsCodegen.method('constructor', [tsCodegen.param('entity', 'string'), tsCodegen.param('id', 'string'), tsCodegen.param('field', 'string')], undefined, `
167+
klass.addMethod(
168+
tsCodegen.method(
169+
'constructor',
170+
[
171+
tsCodegen.param('entity', 'string'),
172+
tsCodegen.param('id', 'string'),
173+
tsCodegen.param('field', 'string'),
174+
],
175+
undefined,
176+
`
168177
super();
169178
this._entity = entity;
170179
this._id = id;
171180
this._field = field;
172-
`));
181+
`,
182+
),
183+
);
173184

174185
// Generate load() method for the Loader
175-
klass.addMethod(tsCodegen.method('load', [], `${typeName}[]`, `
186+
klass.addMethod(
187+
tsCodegen.method(
188+
'load',
189+
[],
190+
`${typeName}[]`,
191+
`
176192
let value = store.loadRelated(this._entity, this._id, this._field);
177193
return changetype<${typeName}[]>(value);
178-
`))
194+
`,
195+
),
196+
);
179197

180198
return klass;
181199
}
182-
183-
_getTypeNameForField(gqlType: TypeNode): string {
184200

185-
if (gqlType.kind === 'NonNullType') {
186-
return this._getTypeNameForField(gqlType.type);
187-
} if (gqlType.kind === 'ListType') {
188-
return this._getTypeNameForField(gqlType.type);
189-
} if (gqlType.kind === 'NamedType') {
190-
return (gqlType as NamedTypeNode).name.value;
191-
}
201+
_getTypeNameForField(gqlType: TypeNode): string {
202+
if (gqlType.kind === 'NonNullType') {
203+
return this._getTypeNameForField(gqlType.type);
204+
}
205+
if (gqlType.kind === 'ListType') {
206+
return this._getTypeNameForField(gqlType.type);
207+
}
208+
if (gqlType.kind === 'NamedType') {
209+
return (gqlType as NamedTypeNode).name.value;
210+
}
192211

193-
throw new Error(`Unknown type kind: ${gqlType}`);
194-
}
212+
throw new Error(`Unknown type kind: ${gqlType}`);
213+
}
195214
_generateConstructor(_entityName: string, fields: readonly FieldDefinitionNode[] | undefined) {
196215
const idField = IdField.fromFields(fields);
197216
return tsCodegen.method(
@@ -260,7 +279,6 @@ _getTypeNameForField(gqlType: TypeNode): string {
260279
);
261280
}
262281

263-
264282
_generateEntityFieldGetter(_entityDef: ObjectTypeDefinitionNode, fieldDef: FieldDefinitionNode) {
265283
const name = fieldDef.name.value;
266284
const gqlType = fieldDef.type;
@@ -299,28 +317,24 @@ _getTypeNameForField(gqlType: TypeNode): string {
299317
let entityName = entityDef.name.value;
300318
let name = fieldDef.name.value;
301319
let gqlType = fieldDef.type;
302-
let returnType = this._returnTypeForDervied(gqlType)
320+
let returnType = this._returnTypeForDervied(gqlType);
303321
return tsCodegen.method(
304322
`get ${name}`,
305323
[],
306324
returnType,
307325
`
308326
return new ${returnType}('${entityName}', this.get('id')!.toString(), '${name}')
309327
`,
310-
)
328+
);
311329
}
312330

313-
314331
_returnTypeForDervied(gqlType: any): any {
315332
if (gqlType.kind === 'NonNullType') {
316-
return this._returnTypeForDervied(gqlType.type)
333+
return this._returnTypeForDervied(gqlType.type);
317334
} else if (gqlType.kind === 'ListType') {
318-
return this._returnTypeForDervied(gqlType.type)
335+
return this._returnTypeForDervied(gqlType.type);
319336
} else {
320-
321-
const type = tsCodegen.namedType(
322-
gqlType.name.value + 'Loader'
323-
);
337+
const type = tsCodegen.namedType(gqlType.name.value + 'Loader');
324338
return type;
325339
}
326340
}
@@ -457,4 +471,3 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
457471
return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type;
458472
}
459473
}
460-

0 commit comments

Comments
 (0)