teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(client/codegen): better handling of overloads

Browse source
This commit is contained in:
teidesu 2021-04-24 18:01:35 +03:00
parent 63471115ae
commit 3b88ac0bab
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/client/scripts/generate-client.js
View file

@ -53,6 +53,8 @@ async function addSingleMethod(state, fileName) {
.find((i) => i.startsWith(flag)) .find((i) => i.startsWith(flag))
} }
const hasOverloads = {}
for (const stmt of program.statements) { for (const stmt of program.statements) {
const isCopy = checkForFlag(stmt, '@copy') const isCopy = checkForFlag(stmt, '@copy')
if (stmt.kind === ts.SyntaxKind.ImportDeclaration) { if (stmt.kind === ts.SyntaxKind.ImportDeclaration) {
@ -186,7 +188,10 @@ async function addSingleMethod(state, fileName) {
.includes('@returns-exported') .includes('@returns-exported')
// overloads // overloads
if (stmt.body) { const isOverload = !stmt.body
if (isOverload) {
hasOverloads[name] = true
} else {
state.methods.used[name] = relPath state.methods.used[name] = relPath
} }
@ -198,7 +203,8 @@ async function addSingleMethod(state, fileName) {
func: stmt, func: stmt,
comment: getLeadingComments(stmt), comment: getLeadingComments(stmt),
aliases, aliases,
overload: !stmt.body, overload: isOverload,
hasOverloads: hasOverloads[name] && !isOverload
}) })
const module = `./${relPath.replace(/\.ts$/, '')}` const module = `./${relPath.replace(/\.ts$/, '')}`
@ -293,7 +299,7 @@ async function main() {
const classContents = [] const classContents = []
state.methods.list.forEach( state.methods.list.forEach(
({ name: origName, isPrivate, func, comment, aliases, overload }) => { ({ name: origName, isPrivate, func, comment, aliases, overload, hasOverloads }) => {
// create method that calls that function and passes `this` // create method that calls that function and passes `this`
// first let's determine the signature // first let's determine the signature
const returnType = func.type ? ': ' + func.type.getText() : '' const returnType = func.type ? ': ' + func.type.getText() : ''
@ -390,10 +396,11 @@ async function main() {
) )
for (const name of [origName, ...aliases]) { for (const name of [origName, ...aliases]) {
if (!isPrivate) { if (!isPrivate && !hasOverloads) {
if (!comment.match(/\/\*\*?\s*\*\//)) if (!comment.match(/\/\*\*?\s*\*\//))
// empty comment, no need to write it // empty comment, no need to write it
output.write(comment) output.write(comment)
output.write( output.write(
`${name}${generics}(${parameters})${returnType}` `${name}${generics}(${parameters})${returnType}`
) )
@ -401,10 +408,7 @@ async function main() {
if (!overload) { if (!overload) {
classContents.push( classContents.push(
`${isPrivate ? 'protected ' : ''}${name} = ${origName}${ `${isPrivate ? 'protected ' : ''}${name} = ${origName}`
// dirty hack required for overloads
isPrivate ? '' : ` as TelegramClient['${name}']`
}`
) )
} }
} }