Skip to content

Commit 082ce93

Browse files
committed
run yarn format
1 parent 891be8c commit 082ce93

File tree

2 files changed

+60
-24
lines changed

2 files changed

+60
-24
lines changed

src/generateSpec.ts

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ export function getOperation(route: IRoute): oa.OperationObject {
3232
const operation: oa.OperationObject = {
3333
operationId: getOperationId(route),
3434
parameters: [
35-
... getHeaderParams(route),
36-
... getPathParams(route),
37-
... getQueryParams(route)
35+
...getHeaderParams(route),
36+
...getPathParams(route),
37+
...getQueryParams(route)
3838
],
3939
requestBody: getRequestBody(route) || undefined,
4040
responses: getResponses(route),
@@ -64,7 +64,7 @@ export function getPaths(routes: IRoute[]): oa.PathObject {
6464
}))
6565

6666
// @ts-ignore: array spread
67-
return _.merge(... routePaths)
67+
return _.merge(...routePaths)
6868
}
6969

7070
/**
@@ -127,7 +127,7 @@ export function getPathParams(route: IRoute): oa.ParameterObject[] {
127127
if (meta) {
128128
const metaSchema = getParamSchema(meta)
129129
param.schema =
130-
'type' in metaSchema ? { ... param.schema, ... metaSchema }: metaSchema
130+
'type' in metaSchema ? { ...param.schema, ...metaSchema } : metaSchema
131131
}
132132

133133
return param
@@ -173,26 +173,26 @@ export function getRequestBody(route: IRoute): oa.RequestBodyObject | void {
173173
const bodyParamsSchema: oa.SchemaObject | null =
174174
bodyParamMetas.length > 0
175175
? bodyParamMetas.reduce(
176-
(acc: oa.SchemaObject, d) => ({
177-
... acc,
178-
properties: {
179-
... acc.properties,
180-
[d.name!]: getParamSchema(d)
181-
},
182-
required: isRequired(d, route)
183-
? [... (acc.required || []), d.name!]
184-
: acc.required
185-
}),
186-
{ properties: {}, required: [], type: 'object' }
187-
)
176+
(acc: oa.SchemaObject, d) => ({
177+
...acc,
178+
properties: {
179+
...acc.properties,
180+
[d.name!]: getParamSchema(d)
181+
},
182+
required: isRequired(d, route)
183+
? [...(acc.required || []), d.name!]
184+
: acc.required
185+
}),
186+
{ properties: {}, required: [], type: 'object' }
187+
)
188188
: null
189189

190190
const bodyMeta = route.params.find(d => d.type === 'body')
191191

192192
if (bodyMeta) {
193193
const bodySchema = getParamSchema(bodyMeta)
194194
const { $ref } =
195-
'items' in bodySchema && bodySchema.items ? bodySchema.items: bodySchema
195+
'items' in bodySchema && bodySchema.items ? bodySchema.items : bodySchema
196196

197197
return {
198198
content: {
@@ -221,15 +221,15 @@ export function getContentType(route: IRoute): string {
221221
? 'application/json'
222222
: 'text/html; charset=utf-8'
223223
const contentMeta = _.find(route.responseHandlers, { type: 'content-type' })
224-
return contentMeta ? contentMeta.value: defaultContentType
224+
return contentMeta ? contentMeta.value : defaultContentType
225225
}
226226

227227
/**
228228
* Return the status code of given route.
229229
*/
230230
export function getStatusCode(route: IRoute): string {
231231
const successMeta = _.find(route.responseHandlers, { type: 'success-code' })
232-
return successMeta ? successMeta.value + '': '200'
232+
return successMeta ? successMeta.value + '' : '200'
233233
}
234234

235235
/**
@@ -279,7 +279,7 @@ export function getTags(route: IRoute): string[] {
279279
export function expressToOpenAPIPath(expressPath: string) {
280280
const tokens = pathToRegexp.parse(expressPath)
281281
return tokens
282-
.map(d => (_.isString(d) ? d: `${d.prefix}{${d.name}}`))
282+
.map(d => (_.isString(d) ? d : `${d.prefix}{${d.name}}`))
283283
.join('')
284284
}
285285

@@ -289,7 +289,7 @@ export function expressToOpenAPIPath(expressPath: string) {
289289
*/
290290
function isRequired(meta: { required?: boolean }, route: IRoute) {
291291
const globalRequired = _.get(route.options, 'defaults.paramOptions.required')
292-
return globalRequired ? meta.required !== false: !!meta.required
292+
return globalRequired ? meta.required !== false : !!meta.required
293293
}
294294

295295
/**
@@ -300,8 +300,12 @@ function getParamSchema(
300300
param: ParamMetadataArgs
301301
): oa.SchemaObject | oa.ReferenceObject {
302302
const { explicitType, index, object, method } = param
303-
const reflectedTypes = Reflect.getMetadata('design:paramtypes', object, method);
304-
if (reflectedTypes.length <= index) return {};
303+
const reflectedTypes = Reflect.getMetadata(
304+
'design:paramtypes',
305+
object,
306+
method
307+
)
308+
if (reflectedTypes.length <= index) return {}
305309
const type = reflectedTypes[index]
306310
if (_.isFunction(type) && type.name === 'Array') {
307311
const items = explicitType

yarn.lock

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,11 @@ convert-source-map@^1.4.0:
840840
version "1.5.0"
841841
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
842842

843+
cookie@^0.4.0:
844+
version "0.4.1"
845+
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
846+
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
847+
843848
copy-descriptor@^0.1.0:
844849
version "0.1.1"
845850
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -1275,6 +1280,18 @@ glob@^7.1.3:
12751280
once "^1.3.0"
12761281
path-is-absolute "^1.0.0"
12771282

1283+
glob@^7.1.4:
1284+
version "7.1.6"
1285+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
1286+
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
1287+
dependencies:
1288+
fs.realpath "^1.0.0"
1289+
inflight "^1.0.4"
1290+
inherits "2"
1291+
minimatch "^3.0.4"
1292+
once "^1.3.0"
1293+
path-is-absolute "^1.0.0"
1294+
12781295
globals@^11.1.0:
12791296
version "11.12.0"
12801297
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -2845,6 +2862,16 @@ rimraf@^3.0.0:
28452862
dependencies:
28462863
glob "^7.1.3"
28472864

2865+
routing-controllers@^0.8.0:
2866+
version "0.8.1"
2867+
resolved "https://registry.yarnpkg.com/routing-controllers/-/routing-controllers-0.8.1.tgz#d53c35e05d0f0863ee25bd77c3fe41fc09fa39f5"
2868+
integrity sha512-dOgt0kiriKMH1swenPX73tU3Mxvlb+1N/sFLSgEpwbK314POrQF+dJGOZVoKv2ya5do1k4aUzSV5xi0K3ykdyw==
2869+
dependencies:
2870+
cookie "^0.4.0"
2871+
glob "^7.1.4"
2872+
reflect-metadata "^0.1.13"
2873+
template-url "^1.0.0"
2874+
28482875
rsvp@^4.8.4:
28492876
version "4.8.5"
28502877
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -3181,6 +3208,11 @@ teeny-request@6.0.1:
31813208
stream-events "^1.0.5"
31823209
uuid "^3.3.2"
31833210

3211+
template-url@^1.0.0:
3212+
version "1.0.0"
3213+
resolved "https://registry.yarnpkg.com/template-url/-/template-url-1.0.0.tgz#d9456bee70cac6617b462a7b08db29fb813a0b09"
3214+
integrity sha1-2UVr7nDKxmF7Rip7CNsp+4E6Cwk=
3215+
31843216
test-exclude@^5.2.3:
31853217
version "5.2.3"
31863218
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"

0 commit comments

Comments
 (0)