diff --git a/backend/ts/src/main/scala/aqua/backend/Header.scala b/backend/ts/src/main/scala/aqua/backend/Header.scala index 0014f211..4273c737 100644 --- a/backend/ts/src/main/scala/aqua/backend/Header.scala +++ b/backend/ts/src/main/scala/aqua/backend/Header.scala @@ -3,6 +3,7 @@ package aqua.backend object Header { def header(isJs: Boolean, isCommonJS: Boolean): String = { + val callParams = if (isJs) "" else "CallParams," val imports = if (isCommonJS) { """const { Fluence, FluencePeer } = require('@fluencelabs/fluence'); |const { @@ -13,7 +14,7 @@ object Header { } else { s"""import { Fluence, FluencePeer } from '@fluencelabs/fluence'; |import { - | CallParams, + | $callParams | callFunction, | registerService, |} from '@fluencelabs/fluence/dist/internal/compilerSupport/v3${if (isJs) ".js" diff --git a/backend/ts/src/main/scala/aqua/backend/OutputFile.scala b/backend/ts/src/main/scala/aqua/backend/OutputFile.scala index d524eec9..0a1d13d3 100644 --- a/backend/ts/src/main/scala/aqua/backend/OutputFile.scala +++ b/backend/ts/src/main/scala/aqua/backend/OutputFile.scala @@ -6,7 +6,7 @@ import aqua.res.AquaRes case class OutputFile(res: AquaRes) { - def generate(types: Types, isCommonJS: Boolean): String = { + def generate(types: Types, isJs: Boolean, isCommonJS: Boolean): String = { import types.* val services = res.services .map(s => OutputService(s, types)) @@ -15,7 +15,7 @@ case class OutputFile(res: AquaRes) { .mkString("\n\n") val functions = res.funcs.map(f => OutputFunc(f, types)).map(_.generate).toList.mkString("\n\n") - s"""${Header.header(false, isCommonJS)} + s"""${Header.header(isJs, isCommonJS)} | |// Services |$services diff --git a/backend/ts/src/main/scala/aqua/backend/js/JavaScriptBackend.scala b/backend/ts/src/main/scala/aqua/backend/js/JavaScriptBackend.scala index 2ca996d5..12c0baaa 100644 --- a/backend/ts/src/main/scala/aqua/backend/js/JavaScriptBackend.scala +++ b/backend/ts/src/main/scala/aqua/backend/js/JavaScriptBackend.scala @@ -18,7 +18,7 @@ case class JavaScriptBackend(isCommonJS: Boolean) extends Backend { val functions = res.funcs.map(f => TypeScriptTypes.funcType(f)).map(_.generate).toList.mkString("\n") - val body = s"""${Header.header(false, false)} + val body = s"""${Header.header(true, false)} | |// Services |$services @@ -33,6 +33,6 @@ case class JavaScriptBackend(isCommonJS: Boolean) extends Backend { override def generate(res: AquaRes): Seq[Generated] = if (res.isEmpty) Nil else { - Generated(ext, OutputFile(res).generate(EmptyTypes, isCommonJS)):: typesFile(res) :: Nil + Generated(ext, OutputFile(res).generate(EmptyTypes, true, isCommonJS)):: typesFile(res) :: Nil } } diff --git a/backend/ts/src/main/scala/aqua/backend/ts/TypeScriptBackend.scala b/backend/ts/src/main/scala/aqua/backend/ts/TypeScriptBackend.scala index 2431340b..ee261264 100644 --- a/backend/ts/src/main/scala/aqua/backend/ts/TypeScriptBackend.scala +++ b/backend/ts/src/main/scala/aqua/backend/ts/TypeScriptBackend.scala @@ -9,5 +9,5 @@ object TypeScriptBackend extends Backend { val ext = ".ts" override def generate(res: AquaRes): Seq[Generated] = - if (res.isEmpty) Nil else Generated(ext, OutputFile(res).generate(TypeScriptTypes, false)) :: Nil + if (res.isEmpty) Nil else Generated(ext, OutputFile(res).generate(TypeScriptTypes, false, false)) :: Nil }