Skip to content

Commit 2f834aa

Browse files
swallezJoshMock
andauthored
Expand snapshot repository types (#2255) (#2443)
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
1 parent ce97fb5 commit 2f834aa

File tree

5 files changed

+867
-138
lines changed

5 files changed

+867
-138
lines changed

compiler/src/model/build-model.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,14 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
267267
const queryType = type.query.find(property => property != null && property.name === part.name) as model.Property
268268
if (!deepEqual(queryType.type, part.type)) {
269269
assert(pathMember as Node, part.codegenName != null, `'${part.name}' already exist in the query_parameters with a different type, you should define an @codegen_name.`)
270-
assert(pathMember as Node, !type.query.map(p => p.name).includes(part.codegenName), `The codegen_name '${part.codegenName}' already exists as parameter in query_parameters.`)
270+
assert(pathMember as Node, !type.query.map(p => p.codegenName ?? p.name).includes(part.codegenName), `The codegen_name '${part.codegenName}' already exists as parameter in query_parameters.`)
271271
}
272272
}
273273
if (bodyProperties.map(p => p.name).includes(part.name)) {
274274
const bodyType = bodyProperties.find(property => property != null && property.name === part.name) as model.Property
275275
if (!deepEqual(bodyType.type, part.type)) {
276276
assert(pathMember as Node, part.codegenName != null, `'${part.name}' already exist in the body with a different type, you should define an @codegen_name.`)
277-
assert(pathMember as Node, !bodyProperties.map(p => p.name).includes(part.codegenName), `The codegen_name '${part.codegenName}' already exists as parameter in body.`)
277+
assert(pathMember as Node, !bodyProperties.map(p => p.codegenName ?? p.name).includes(part.codegenName), `The codegen_name '${part.codegenName}' already exists as parameter in body.`)
278278
}
279279
}
280280
}
@@ -293,7 +293,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
293293
)
294294
assert(
295295
(bodyMember as PropertySignature).getJsDocs(),
296-
!type.path.map(p => p.name).concat(type.query.map(p => p.name)).includes(tags.codegen_name),
296+
!type.path.map(p => p.codegenName ?? p.name).concat(type.query.map(p => p.codegenName ?? p.name)).includes(tags.codegen_name),
297297
`The codegen_name '${tags.codegen_name}' already exists as a property in the path or query.`
298298
)
299299
type.body = {

0 commit comments

Comments
 (0)