fluencelabs/aqua
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua.git synced 2024-12-04 22:50:18 +00:00
Code Issues Projects Releases Wiki Activity

find json service in imported services too (#529)

Browse Source
This commit is contained in:
Dima 2022-06-27 14:41:44 +03:00 committed by GitHub
parent 9bba41abbe
commit 7bd70ebe3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/.js/src/main/scala/aqua/FuncCompiler.scala
View File

@ -41,30 +41,28 @@ class FuncCompiler[F[_]: Files: AquaIO: Async](
contexts: Chain[AquaContext],
func: CliFunc,
services: List[JsonService]
): ValidatedNec[String, (FuncArrow, List[Service])] = {
): ValidatedNec[String, (FuncArrow, List[Service])] =
contexts
.collectFirstSome(c => c.allFuncs.get(func.name).map(f => (f, c)))
.collectFirstSome(c => c.allFuncs.get(func.name))
.map(validNec)
.getOrElse(
Validated.invalidNec[String, (FuncArrow, AquaContext)](
Validated.invalidNec[String, FuncArrow](
s"There is no function '${func.name}' or it is not exported. Check the spelling or see https://doc.fluence.dev/aqua-book/language/header#export"
)
)
.andThen { case (func, context) =>
findServices(context, services).map { l =>
.andThen { func =>
findServices(contexts, services).map { l =>
(func, l)
}
}
}
private def findServices(
context: AquaContext,
contexts: Chain[AquaContext],
services: List[JsonService]
): ValidatedNec[String, List[Service]] = {
services
.map(js =>
context.services
.get(js.name)
contexts.collectFirstSome(_.services.get(js.name))
.map(sm => (js, sm))
.map(validNec)
.getOrElse(