format Package.juvix when formatting project

app/App.hs

@@ -188,6 +188,9 @@ getEntryPointStdin' RunAppIOArgs {..} = do
         | otherwise -> return Nothing
   set entryPointStdin estdin <$> entryPointFromGlobalOptionsNoFile root opts
 
+askPackageDotJuvixPath :: (Members '[App] r) => Sem r (Path Abs File)
+askPackageDotJuvixPath = mkPackagePath . (^. rootRootDir) <$> askRoot
+
 fromRightGenericError :: (Members '[App] r, ToGenericError err, Typeable err) => Either err a -> Sem r a
 fromRightGenericError = fromRightJuvixError . mapLeft JuvixError
 

app/Commands/Format.hs

@@ -49,15 +49,22 @@ targetFromOptions opts = do
 -- | Formats the project on the root
 formatProject ::
   forall r.
-  (Members '[App, EmbedIO, TaggedLock, Logger, Files, Output FormattedFileInfo] r) =>
+  (Members '[App, EmbedIO, TaggedLock, Logger, ScopeEff, Files, Output FormattedFileInfo] r) =>
   Sem r FormatResult
 formatProject = silenceProgressLog . runPipelineOptions . runPipelineSetup $ do
   res :: [(ImportNode, PipelineResult ModuleInfo)] <- processProject
-  res' :: [(ImportNode, SourceCode)] <- forM res $ \(node, nfo) -> do
-    pkgId :: PackageId <- (^. entryPointPackageId) <$> ask
-    src <- runReader pkgId (formatModuleInfo node nfo)
+  pkgId :: PackageId <- (^. entryPointPackageId) <$> ask
+  res' :: [(ImportNode, SourceCode)] <- runReader pkgId $ forM res $ \(node, nfo) -> do
+    src <- formatModuleInfo node nfo
     return (node, src)
-  formatProjectSourceCode res'
+  formatRes <- formatProjectSourceCode res'
+  formatPkgRes <- formatPackageDotJuvix
+  return (formatRes <> formatPkgRes)
+
+formatPackageDotJuvix :: forall r. (Members '[App, Files, Logger, Output FormattedFileInfo, ScopeEff] r) => Sem r FormatResult
+formatPackageDotJuvix = do
+  pkgDotJuvix <- askPackageDotJuvixPath
+  ifM (fileExists' pkgDotJuvix) (format pkgDotJuvix) (return mempty)
 
 runCommand :: forall r. (Members AppEffects r) => FormatOptions -> Sem r ()
 runCommand opts = do

src/Juvix/Formatter.hs

@@ -94,7 +94,7 @@ format p = do
 -- contents of a file) for every processed file.
 --
 -- NB: This function does not traverse into Juvix sub-projects, i.e into
--- subdirectories that contain a juvix.yaml file.
+-- subdirectories that contain a Package.juvix file.
 formatProjectSourceCode ::
   forall r.
   (Members '[Output FormattedFileInfo] r) =>
@@ -178,12 +178,11 @@ formatResultSourceCode filepath src = do
     mkResult :: FormatResult -> Sem r FormatResult
     mkResult res = do
       output
-        ( FormattedFileInfo
-            { _formattedFileInfoPath = filepath,
-              _formattedFileInfoContents = src ^. sourceCodeFormatted,
-              _formattedFileInfoContentsModified = res == FormatResultNotFormatted
-            }
-        )
+        FormattedFileInfo
+          { _formattedFileInfoPath = filepath,
+            _formattedFileInfoContents = src ^. sourceCodeFormatted,
+            _formattedFileInfoContentsModified = res == FormatResultNotFormatted
+          }
       return res
 
 formatScoperResult' ::