Skip to content

Commit c7d7d8d

Browse files
raveclassicraveclassic
committed
style: update prettier and eslint
1 parent 698b87f commit c7d7d8d

30 files changed

+111
-301
lines changed

‎src/language/typescript/2.0/serializers/items-object.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ import { Either, right } from 'fp-ts/lib/Either';
1515
export const serializeItemsObject = (from: Ref, itemsObject: ItemsObject): Either<Error, SerializedType> => {
1616
switch (itemsObject.type) {
1717
case 'array': {
18-
return pipe(
19-
serializeItemsObject(from, itemsObject.items),
20-
either.map(getSerializedArrayType()),
21-
);
18+
return pipe(serializeItemsObject(from, itemsObject.items), either.map(getSerializedArrayType()));
2219
}
2320
case 'string': {
2421
return right(getSerializedStringType(itemsObject.format));

‎src/language/typescript/2.0/serializers/operation-object.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,22 @@ export const serializeOperationObject = combineReader(
272272
option.getOrElse(() => ''),
273273
);
274274

275-
const argsType = concatIf(hasParameters, parameters.serializedPathParameters.map(p => p.type), [
276-
`parameters: { ${queryType}${bodyType} }`,
277-
]).join(',');
275+
const argsType = concatIf(
276+
hasParameters,
277+
parameters.serializedPathParameters.map(p => p.type),
278+
[`parameters: { ${queryType}${bodyType} }`],
279+
).join(',');
278280

279281
const type = `
280282
${getJSDoc(array.compact([deprecated, operation.summary]))}
281283
readonly ${operationName}: (${argsType}) => ${getKindValue(kind, serializedResponses.type)};
282284
`;
283285

284-
const argsIO = concatIf(hasParameters, parameters.pathParameters.map(p => p.name), ['parameters']).join(
285-
',',
286-
);
286+
const argsIO = concatIf(
287+
hasParameters,
288+
parameters.pathParameters.map(p => p.name),
289+
['parameters'],
290+
).join(',');
287291

288292
const io = `
289293
${operationName}: (${argsIO}) => {
@@ -418,19 +422,15 @@ export const serializeQueryParameterObject = (
418422
case 'pipes': {
419423
const s = getCollectionSeparator(collectionFormat);
420424
const f = serializedFragment(
421-
`value => encodeURIComponent('${
422-
parameter.name
423-
}') + '=' + encodeURIComponent(value.join('${s}'))`,
425+
`value => encodeURIComponent('${parameter.name}') + '=' + encodeURIComponent(value.join('${s}'))`,
424426
[],
425427
[],
426428
);
427429
return right(getSerializedOptionCallFragment(!required, f, encoded));
428430
}
429431
case 'multi': {
430432
const f = serializedFragment(
431-
`value => value.map(item => encodeURIComponent('${
432-
parameter.name
433-
}') + '=' + encodeURIComponent(item)).join('&')`,
433+
`value => value.map(item => encodeURIComponent('${parameter.name}') + '=' + encodeURIComponent(item)).join('&')`,
434434
[],
435435
[],
436436
);

‎src/language/typescript/2.0/serializers/parameter-object.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,12 @@ export const serializeParameterObject = (
5151
}
5252
}
5353
case 'body': {
54-
return pipe(
55-
serializeSchemaObject(from, parameterObject.schema),
56-
either.map(toSerializedParameter),
57-
);
54+
return pipe(serializeSchemaObject(from, parameterObject.schema), either.map(toSerializedParameter));
5855
}
5956
}
6057
};
6158

6259
export const isRequired = (parameterObject: ParameterObject): boolean =>
6360
parameterObject.in === 'path'
6461
? parameterObject.required
65-
: pipe(
66-
parameterObject.required,
67-
option.getOrElse(constFalse),
68-
);
62+
: pipe(parameterObject.required, option.getOrElse(constFalse));

‎src/language/typescript/2.0/serializers/path-item-object.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,7 @@ const serializePath = combineReader(
6161
map(operation => serializeOperationObject(from, url, 'PATCH', kind, operation, item)),
6262
);
6363
const operations = [get, put, post, remove, options, head, patch];
64-
return pipe(
65-
operations,
66-
array.compact,
67-
sequenceEither,
68-
either.map(foldSerializedTypes),
69-
);
64+
return pipe(operations, array.compact, sequenceEither, either.map(foldSerializedTypes));
7065
}
7166
};
7267
return run;

‎src/language/typescript/2.0/serializers/responses-object.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ export const serializeOperationResponses = (from: Ref, responses: ResponsesObjec
2323
responses,
2424
record.collect((code, response) => {
2525
if (ReferenceObjectCodec.is(response)) {
26-
return pipe(
27-
fromString(response.$ref),
28-
either.map(getSerializedRefType(from)),
29-
some,
30-
);
26+
return pipe(fromString(response.$ref), either.map(getSerializedRefType(from)), some);
3127
} else {
3228
return serializeResponseObject(from, response);
3329
}

‎src/language/typescript/2.0/serializers/schema-object.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ const serializeSchemaObjectWithRecursion = (
4444
): Either<Error, SerializedType> => {
4545
// check non-typed schemas first
4646
if (ReferenceObjectCodec.is(schema)) {
47-
return pipe(
48-
fromString(schema.$ref),
49-
either.map(getSerializedRefType(from)),
50-
);
47+
return pipe(fromString(schema.$ref), either.map(getSerializedRefType(from)));
5148
}
5249

5350
if (EnumSchemaObjectCodec.is(schema)) {

‎src/language/typescript/2.0/serializers/swagger-object.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ export const serializeSwaggerObject = combineReader(
4747
),
4848
),
4949
);
50-
const additional = pipe(
51-
[definitions, parameters, responses],
52-
array.compact,
53-
sequenceEither,
54-
);
50+
const additional = pipe([definitions, parameters, responses], array.compact, sequenceEither);
5551
const paths = pipe(
5652
pathsRef,
5753
either.chain(from => serializePaths(from, swaggerObject.paths)),

‎src/language/typescript/3.0/serializers/__tests__/schema-object.spec.ts‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ describe('SchemaObject', () => {
3737
serializeSchemaObject(from, name),
3838
either.map(getSerializedArrayType(name)),
3939
);
40-
const serialized = pipe(
41-
schema,
42-
serializeSchemaObject(from, name),
43-
);
40+
const serialized = pipe(schema, serializeSchemaObject(from, name));
4441
expect(serialized).toEqual(expected);
4542
}),
4643
);
@@ -54,18 +51,10 @@ describe('SchemaObject', () => {
5451
$ref: $refArbitrary.$ref,
5552
},
5653
});
57-
const expected = pipe(
58-
$refArbitrary,
59-
getSerializedRefType(from),
60-
getSerializedArrayType(name),
54+
const expected = pipe($refArbitrary, getSerializedRefType(from), getSerializedArrayType(name));
55+
expect(pipe(schema, reportIfFailed, either.chain(serializeSchemaObject(from, name)))).toEqual(
56+
right(expected),
6157
);
62-
expect(
63-
pipe(
64-
schema,
65-
reportIfFailed,
66-
either.chain(serializeSchemaObject(from, name)),
67-
),
68-
).toEqual(right(expected));
6958
}),
7059
);
7160
});
@@ -94,11 +83,7 @@ describe('SchemaObject', () => {
9483
getSerializedObjectType(undefined),
9584
getSerializedRecursiveType(ref, true),
9685
);
97-
const serialized = pipe(
98-
schema,
99-
reportIfFailed,
100-
either.chain(serializeSchemaObject(ref)),
101-
);
86+
const serialized = pipe(schema, reportIfFailed, either.chain(serializeSchemaObject(ref)));
10287

10388
expect(serialized).toEqual(right(expected));
10489
}),
@@ -122,11 +107,7 @@ describe('SchemaObject', () => {
122107
},
123108
},
124109
});
125-
const serialized = pipe(
126-
schema,
127-
reportIfFailed,
128-
either.chain(serializeSchemaObject(ref)),
129-
);
110+
const serialized = pipe(schema, reportIfFailed, either.chain(serializeSchemaObject(ref)));
130111
const expected = pipe(
131112
ref,
132113
getSerializedRefType(ref),
@@ -149,11 +130,7 @@ describe('SchemaObject', () => {
149130
$ref: ref.$ref, // references self
150131
},
151132
});
152-
const serialized = pipe(
153-
schema,
154-
reportIfFailed,
155-
either.chain(serializeSchemaObject(ref)),
156-
);
133+
const serialized = pipe(schema, reportIfFailed, either.chain(serializeSchemaObject(ref)));
157134

158135
const expected = pipe(
159136
ref,

‎src/language/typescript/3.0/serializers/components-object.ts‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ import { serializeRequestBodyObject } from './request-body-object';
2222
const serializeSchema = (from: Ref, schema: SchemaObject): Either<Error, File> => {
2323
const typeName = getTypeName(from.name);
2424
const ioName = getIOName(from.name);
25-
const serialized = pipe(
26-
schema,
27-
serializeSchemaObject(from, typeName),
28-
);
25+
const serialized = pipe(schema, serializeSchemaObject(from, typeName));
2926
const dependencies = pipe(
3027
serialized,
3128
either.map(serialized => serializeDependencies(serialized.dependencies)),
@@ -52,10 +49,7 @@ const serializeSchemas = combineReader(
5249
const resolved = ReferenceObjectCodec.is(schema)
5350
? e.resolveRef(schema.$ref, SchemaObjectCodec)
5451
: right(schema);
55-
const ref = pipe(
56-
from,
57-
addPathParts('schemas', name),
58-
);
52+
const ref = pipe(from, addPathParts('schemas', name));
5953
return pipe(
6054
sequenceTEither(resolved, ref),
6155
either.chain(([resolved, ref]) => serializeSchema(ref, resolved)),
@@ -93,10 +87,7 @@ const serializeParameters = combineReader(
9387
const resolved = ReferenceObjectCodec.is(parameter)
9488
? e.resolveRef(parameter.$ref, ParameterObjectCodec)
9589
: right(parameter);
96-
const ref = pipe(
97-
from,
98-
addPathParts('parameters', name),
99-
);
90+
const ref = pipe(from, addPathParts('parameters', name));
10091
return pipe(
10192
sequenceTEither(resolved, ref),
10293
either.chain(([parameter, from]) => serializeParameter(from, parameter)),
@@ -135,10 +126,7 @@ const serializeResponses = combineReader(
135126
const resolved = ReferenceObjectCodec.is(response)
136127
? e.resolveRef(response.$ref, ResponseObjectCodec)
137128
: right(response);
138-
const ref = pipe(
139-
from,
140-
addPathParts('responses', name),
141-
);
129+
const ref = pipe(from, addPathParts('responses', name));
142130
return pipe(
143131
sequenceTEither(resolved, ref),
144132
either.chain(([resolved, ref]) => serializeResponse(ref, resolved)),
@@ -174,10 +162,7 @@ const serializeRequestBodies = combineReader(
174162
const resolved = ReferenceObjectCodec.is(requestBody)
175163
? e.resolveRef(requestBody.$ref, RequestBodyObjectCodec)
176164
: right(requestBody);
177-
const ref = pipe(
178-
from,
179-
addPathParts('requestBodies', name),
180-
);
165+
const ref = pipe(from, addPathParts('requestBodies', name));
181166
return pipe(
182167
sequenceTEither(resolved, ref),
183168
either.chain(([resolved, ref]) => serializeRequestBody(ref, resolved)),

‎src/language/typescript/3.0/serializers/document.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,16 @@ export const serializeDocument = combineReader(
2222
): Either<Error, Directory> => {
2323
const componentsRef = fromString('#/components');
2424

25-
const paths = pipe(
26-
pathsRef,
27-
either.map(serializePathsObject),
28-
either.chain(applyTo(document.paths)),
29-
);
25+
const paths = pipe(pathsRef, either.map(serializePathsObject), either.chain(applyTo(document.paths)));
3026

3127
const components = pipe(
3228
document.components,
3329
option.map(components =>
34-
pipe(
35-
componentsRef,
36-
either.map(serializeComponentsObject),
37-
either.chain(applyTo(components)),
38-
),
30+
pipe(componentsRef, either.map(serializeComponentsObject), either.chain(applyTo(components))),
3931
),
4032
);
4133

42-
const additional = pipe(
43-
array.compact([components]),
44-
sequenceEither,
45-
);
34+
const additional = pipe(array.compact([components]), sequenceEither);
4635
return combineEither(
4736
paths,
4837
additional,

0 commit comments

Comments
 (0)