Skip to content

Commit 629b4d4

Browse files
Expand snapshot repository types (#2255) (#2441)
(cherry picked from commit c45e69e) Co-authored-by: Josh Mock <joshua.mock@elastic.co>
1 parent 39bbe89 commit 629b4d4

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
@@ -270,14 +270,14 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
270270
const queryType = type.query.find(property => property != null && property.name === part.name) as model.Property
271271
if (!deepEqual(queryType.type, part.type)) {
272272
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.`)
273-
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.`)
273+
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.`)
274274
}
275275
}
276276
if (bodyProperties.map(p => p.name).includes(part.name)) {
277277
const bodyType = bodyProperties.find(property => property != null && property.name === part.name) as model.Property
278278
if (!deepEqual(bodyType.type, part.type)) {
279279
assert(pathMember as Node, part.codegenName != null, `'${part.name}' already exist in the body with a different type, you should define an @codegen_name.`)
280-
assert(pathMember as Node, !bodyProperties.map(p => p.name).includes(part.codegenName), `The codegen_name '${part.codegenName}' already exists as parameter in body.`)
280+
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.`)
281281
}
282282
}
283283
}
@@ -296,7 +296,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
296296
)
297297
assert(
298298
(bodyMember as PropertySignature).getJsDocs(),
299-
!type.path.map(p => p.name).concat(type.query.map(p => p.name)).includes(tags.codegen_name),
299+
!type.path.map(p => p.codegenName ?? p.name).concat(type.query.map(p => p.codegenName ?? p.name)).includes(tags.codegen_name),
300300
`The codegen_name '${tags.codegen_name}' already exists as a property in the path or query.`
301301
)
302302
type.body = {

0 commit comments

Comments
 (0)