feat(compiler)!: Force aqua header [LNG-308]

api/api/.js/src/main/scala/api/AquaAPI.scala

@@ -19,8 +19,6 @@ import aqua.logging.{LogFormatter, LogLevels}
 import aqua.model.AquaContext
 import aqua.model.transform.{Transform, TransformConfig}
 import aqua.parser.lexer.{LiteralToken, Token}
-import aqua.parser.lift.FileSpan.F
-import aqua.parser.lift.{FileSpan, Span}
 import aqua.parser.{ArrowReturnError, BlockIndentError, LexerError, ParserError}
 import aqua.raw.ops.Call
 import aqua.raw.ops.CallArrowRawTag

api/api/src/main/scala/aqua/api/APICompilation.scala

@@ -16,7 +16,7 @@ import aqua.parser.expr.AbilityExpr.p
 import aqua.parser.lexer.{LiteralToken, Token}
 import aqua.parser.lift.FileSpan.F
 import aqua.parser.lift.{FileSpan, Span}
-import aqua.parser.{ArrowReturnError, BlockIndentError, LexerError, ParserError}
+import aqua.parser.{ArrowReturnError, LexerError, ParserError}
 import aqua.raw.ConstantRaw
 import aqua.raw.ops.Call
 import aqua.raw.value.ValueRaw

aqua-run/src/main/scala/aqua/run/RunPreparer.scala

@@ -2,14 +2,14 @@ package aqua.run
 
 import aqua.backend.air.FuncAirGen
 import aqua.definitions.{FunctionDef, TypeDefinition}
-import aqua.io.OutputPrinter
 import aqua.model.transform.{Transform, TransformConfig}
 import aqua.model.{FuncArrow, ValueModel, VarModel}
 import aqua.parser.lexer.CallArrowToken
 import aqua.parser.lift.Span
 import aqua.raw.ops.{Call, CallArrowRawTag, SeqTag}
 import aqua.raw.value.{LiteralRaw, ValueRaw, VarRaw}
 import aqua.types.*
+
 import cats.data.Validated.{invalid, invalidNec, invalidNel, validNec, validNel}
 import cats.data.{NonEmptyList, Validated, ValidatedNec}
 import cats.effect.kernel.Async
@@ -18,8 +18,7 @@ import cats.syntax.flatMap.*
 import cats.syntax.partialOrder.*
 import cats.syntax.show.*
 import cats.syntax.traverse.*
-import cats.{~>, Id}
-
+import cats.{Id, ~>}
 import scala.collection.immutable.SortedMap
 import scala.concurrent.ExecutionContext
 

aqua-src/antithesis.aqua

@@ -37,4 +37,4 @@ func bugLng317() -> []string:
    worker_job = WorkerJob(runOnSingleWorker = clos())
    subnet_job <- disjoint_run{worker_job}()
    finalRes <- runJob(subnet_job)
-   <- finalRes
+   <- finalRes

compiler/src/main/scala/aqua/compiler/AquaParser.scala

@@ -6,20 +6,19 @@ import aqua.parser.head.{FilenameExpr, ImportExpr}
 import aqua.parser.lift.{LiftParser, Span}
 import aqua.parser.{Ast, ParserError}
 
+import cats.data.Chain.*
+import cats.data.Validated.*
 import cats.data.{Chain, EitherNec, EitherT, NonEmptyChain, Validated, ValidatedNec}
 import cats.parse.Parser0
-import cats.syntax.either.*
 import cats.syntax.applicative.*
+import cats.syntax.either.*
 import cats.syntax.flatMap.*
+import cats.syntax.foldable.*
 import cats.syntax.functor.*
 import cats.syntax.monad.*
-import cats.syntax.foldable.*
 import cats.syntax.traverse.*
 import cats.syntax.validated.*
-import cats.data.Chain.*
-import cats.data.Validated.*
-import cats.syntax.traverse.*
-import cats.{~>, Comonad, Monad}
+import cats.{Comonad, Monad, ~>}
 import scribe.Logging
 
 // TODO: add tests
@@ -48,9 +47,9 @@ class AquaParser[F[_]: Monad, E, I, S[_]: Comonad](
 
   // Resolve imports (not parse, just resolve) of the given file
   private def resolveImports(id: I, ast: Body): F[ValidatedNec[Err, AquaModule[I, Err, Body]]] =
-    ast.collectHead { case fe: FilenameExpr[S] =>
+    ast.head.collect { case fe: FilenameExpr[S] =>
       fe.fileValue -> fe.token
-    }.value.traverse { case (filename, token) =>
+    }.traverse { case (filename, token) =>
       sources
         .resolveImport(id, filename)
         .map(

compiler/src/test/scala/aqua/compiler/AquaCompilerSpec.scala

@@ -89,7 +89,7 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
 
     val src = Map(
       "index.aqua" ->
-        """module Foo declares X
+        """aqua Foo declares X
           |
           |export foo, foo2 as foo_two, X
           |
@@ -135,7 +135,11 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
   it should "create right topology" in {
     val src = Map(
       "index.aqua" ->
-        """service Op("op"):
+        """aqua Test
+          |
+          |export exec
+          |
+          |service Op("op"):
           |  identity(s: string) -> string
           |
           |func exec(peers: []string) -> []string:
@@ -224,7 +228,11 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
   it should "not generate hop back with empty response" in {
     val src = Map(
       "index.aqua" ->
-        """service Op("op"):
+        """aqua HopBackTest
+          |
+          |export exec
+          |
+          |service Op("op"):
           |  call(s: string)
           |
           |func exec(peers: []string):
@@ -288,7 +296,7 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
 
     val src = Map(
       "index.aqua" ->
-        """module Import
+        """aqua Import
           |import foobar from "export2.aqua"
           |
           |use foo as f from "export2.aqua" as Exp
@@ -307,7 +315,7 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
     )
     val imports = Map(
       "export2.aqua" ->
-        """module Export declares foobar, foo
+        """aqua Export declares foobar, foo
           |
           |func bar() -> string:
           |    <- " I am MyFooBar bar"
@@ -323,7 +331,7 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
           |
           |""".stripMargin,
       "../gen/OneMore.aqua" ->
-        """
+        """aqua Test declares OneMore
           |service OneMore:
           |  more_call()
           |  consume(s: string)
@@ -379,7 +387,10 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
 
   it should "optimize math inside stream join" in {
     val src = Map(
-      "main.aqua" -> """
+      "main.aqua" -> """aqua Test
+                       |
+                       |export main
+                       |
                        |func main(i: i32):
                        |  stream: *string
                        |  stream <<- "a"
@@ -434,8 +445,7 @@ class AquaCompilerSpec extends AnyFlatSpec with Matchers with Inside {
 
   it should "allow returning and passing services as abilities" in {
     val src = Map(
-      "main.aqua" -> """
-                       |aqua Test
+      "main.aqua" -> """aqua Test
                        |
                        |export test
                        |

integration-tests/aqua/examples/abilities.aqua

@@ -1,9 +1,9 @@
 aqua Main
 
-use DECLARE_CONST, decl_bar from "imports_exports/declare.aqua" as Declare
-
 export handleAb, SomeService, bug214, checkAbCalls, bugLNG258_1, bugLNG258_2, bugLNG258_3, multipleAbilityWithClosure, MySrv, returnSrvAsAbility
 
+use DECLARE_CONST, decl_bar from "imports_exports/declare.aqua" as Declare
+
 service SomeService("wed"):
   getStr(s: string) -> string
 

integration-tests/aqua/examples/assignment.aqua

@@ -1,3 +1,7 @@
+aqua Assignment
+
+export doSmth
+
 data Prod:
    value: string
 

integration-tests/aqua/examples/callArrow.aqua

@@ -1,6 +1,11 @@
+aqua CallArrow
+
+export passFunctionAsArg, reproArgsBug426
+
 import "println.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
+
 -- functions like `c` are called an 'arrow function' in Aqua
 -- `c` passed to a function from a client, so, it could be called only on a client
 func passFunctionAsArg(node: string, str: string, c: string -> string):

integration-tests/aqua/examples/canon.aqua

@@ -1,3 +1,7 @@
+aqua Canon
+
+export Ser, bugLng79
+
 data Record:
     relay_id: []string
     peer_id: string

integration-tests/aqua/examples/closures.aqua

@@ -1,9 +1,9 @@
-module Closure declares *
-
-import "@fluencelabs/aqua-lib/builtin.aqua"
+aqua Closure declares *
 
 export LocalSrv, closureIn, closureOut, closureBig, closureOut2, lng58Bug, multipleClosuresBugLNG262, lng317Bug
 
+import "@fluencelabs/aqua-lib/builtin.aqua"
+
 service MyOp("op"):
   identity(s: string) -> string
 

integration-tests/aqua/examples/co.aqua

@@ -1,3 +1,7 @@
+aqua Co
+
+export CoService, coFunc
+
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
 service CoService("coservice-id"):

integration-tests/aqua/examples/collectionSugar.aqua

@@ -1,3 +1,7 @@
+aqua CollectionSugar
+
+export arraySugar, streamSugar, optionSugar, GetArr, bugLNG59
+
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
 func arraySugar(n: u32, m: u32) -> []u32, []u32:

integration-tests/aqua/examples/complex.aqua

@@ -1,3 +1,7 @@
+aqua Complex
+
+export TestS, doStuff
+
 import "helloWorld.aqua"
 import "println.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"

integration-tests/aqua/examples/constants.aqua

@@ -1,3 +1,7 @@
+aqua Constants
+
+export Getter, callConstant, timestampAndTtl
+
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
 service Getter("test"):

integration-tests/aqua/examples/dataAlias.aqua

@@ -1,3 +1,7 @@
+aqua DataAlias
+
+export NodeIdGetter, getAliasedData
+
 -- set `PeerId` name to be a type alias for `string` type
 alias PeerId : string
 

integration-tests/aqua/examples/example.aqua

@@ -1,3 +1,5 @@
+aqua Example
+
 service Peer("peer"):
     is_connected: string -> bool
 

integration-tests/aqua/examples/fold.aqua

@@ -1,3 +1,7 @@
+aqua Fold
+
+export iterateAndPrint, iterateAndPrintParallel, forBug499
+
 import "println.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 

integration-tests/aqua/examples/foldJoin.aqua

@@ -1,9 +1,9 @@
-module FoldJoin
-
-import "@fluencelabs/aqua-lib/builtin.aqua"
+aqua FoldJoin
 
 export getTwoResults
 
+import "@fluencelabs/aqua-lib/builtin.aqua"
+
 service Op2("op"):
     identity(s: u64)
 

integration-tests/aqua/examples/func.aqua

@@ -1,3 +1,7 @@
+aqua Func
+
+export TestSrv, testFunc
+
 service TestSrv("test-service-id"):
     str: -> string
 

integration-tests/aqua/examples/funcs.aqua

@@ -1,4 +1,4 @@
-module Funcs declares main, A, calc
+aqua Funcs declares main, A, calc
 
 export main, A, calc, calc2, ifCalc, bugLNG260
 

integration-tests/aqua/examples/functors.aqua

@@ -1,3 +1,7 @@
+aqua Functors
+
+export lng119Bug
+
 func lng119Bug() -> []u32:
   nums = [1,2,3,4,5]
   results: *u32

integration-tests/aqua/examples/helloWorld.aqua

@@ -1,3 +1,7 @@
+aqua HelloWorld
+
+export StringExtra, helloWorld
+
 service StringExtra("service-id"):
     addNameToHello: string -> string
 

integration-tests/aqua/examples/if.aqua

@@ -1,3 +1,7 @@
+aqua If
+
+export ifElseCall, ifElseNumCall, ifCorrectXorWrap, bugLNG69
+
 import "println.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 

integration-tests/aqua/examples/imports_exports/declare.aqua

@@ -1,4 +1,4 @@
-module FooBars declares decl_foo, decl_bar, SuperFoo, DECLARE_CONST, DECLARE_CONST2
+aqua FooBars declares decl_foo, decl_bar, SuperFoo, DECLARE_CONST, DECLARE_CONST2
 export SuperFoo
 
 const DECLARE_CONST = "declare_const"

integration-tests/aqua/examples/imports_exports/export2.aqua

@@ -1,4 +1,4 @@
-module Export declares foobar, foo
+aqua Export declares foobar, foo
 
 import Op as Noop from "@fluencelabs/aqua-lib/builtin.aqua"
 

integration-tests/aqua/examples/imports_exports/export3.aqua

@@ -1,5 +1,5 @@
 -- exports3.aqua
-module Export3 declares *
+aqua Export3 declares *
 
 import Op as Noop from "@fluencelabs/aqua-lib/builtin.aqua"
 

integration-tests/aqua/examples/imports_exports/exports.aqua

@@ -1,4 +1,4 @@
-module Exports declares some_string, MyExportSrv, EXPORT_CONST, some_random_func
+aqua Exports declares some_string, MyExportSrv, EXPORT_CONST, some_random_func
 
 import Op as Noop from "@fluencelabs/aqua-lib/builtin.aqua"