fluencelabs/aqua
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua.git synced 2025-05-29 15:31:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix type convertion for option type (#294)

Browse Source
This commit is contained in:
Pavel 2021-09-09 19:47:23 +03:00 committed by GitHub
parent 49da2a07ad
commit dc1f6c2faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/js/src/main/scala/aqua/backend/js/JavaScriptCommon.scala
View File

@ -18,16 +18,28 @@ object JavaScriptCommon {
def callBackExprBody(at: ArrowType, callbackName: String): String = { def callBackExprBody(at: ArrowType, callbackName: String): String = {
val arrowArgumentsToCallbackArgumentsList = val arrowArgumentsToCallbackArgumentsList =
at.domain.toList.zipWithIndex at.domain.toList.zipWithIndex
.map(_._2) .map((`type`, idx) => {
.map(idx => s"req.args[$idx]") val valueFromArg = s"req.args[$idx]"
`type` match {
case OptionType(t) =>
s"${valueFromArg}.length === 0 ? null : ${valueFromArg}[0]"
case _ => valueFromArg
}
})
.concat(List("callParams")) .concat(List("callParams"))
.mkString(", ") .mkString(", ")
val callCallbackStatement = s"$callbackName(${arrowArgumentsToCallbackArgumentsList})" val callCallbackStatement = s"$callbackName(${arrowArgumentsToCallbackArgumentsList})"
val callCallbackStatementAndReturn = val callCallbackStatementAndReturn =
at.res.fold(s"${callCallbackStatement}; resp.result = {}")(_ => at.res.fold(s"${callCallbackStatement}; resp.result = {}")(`type` =>
s"resp.result = ${callCallbackStatement}" `type` match {
case OptionType(t) => s"""
| var respResult = ${callCallbackStatement};
| resp.result = respResult === null ? [] : [respResult]
|""".stripMargin
case _ => s"resp.result = ${callCallbackStatement}"
}
) )
val tetraplets = FuncRes val tetraplets = FuncRes

19
backend/ts/src/main/scala/aqua/backend/ts/TypeScriptCommon.scala
View File

@ -70,16 +70,27 @@ object TypeScriptCommon {
val arrowArgumentsToCallbackArgumentsList = val arrowArgumentsToCallbackArgumentsList =
at.domain.toList at.domain.toList
.zipWithIndex .zipWithIndex
.map(_._2) .map((`type`, idx) => {
.map(idx => s"req.args[$idx]") val valueFromArg = s"req.args[$idx]"
`type` match {
case OptionType(t) => s"${valueFromArg}.length === 0 ? null : ${valueFromArg}[0]"
case _ => valueFromArg
}
})
.concat(List("callParams")) .concat(List("callParams"))
.mkString(", ") .mkString(", ")
val callCallbackStatement = s"$callbackName(${arrowArgumentsToCallbackArgumentsList})" val callCallbackStatement = s"$callbackName(${arrowArgumentsToCallbackArgumentsList})"
val callCallbackStatementAndReturn = val callCallbackStatementAndReturn =
at.res.fold(s"${callCallbackStatement}; resp.result = {}")(_ => at.res.fold(s"${callCallbackStatement}; resp.result = {}")(`type` =>
s"resp.result = ${callCallbackStatement}" `type` match {
case OptionType(t) => s"""
| var respResult = ${callCallbackStatement};
| resp.result = respResult === null ? [] : [respResult]
|""".stripMargin
case _ => s"resp.result = ${callCallbackStatement}"
}
) )
val tetraplets = FuncRes val tetraplets = FuncRes