feat: Dev basepoint (#128)

* Setup projectFile path parsing * Disable the damned OverloadedLists * Parse JSON config * Add error * wip * wip * refactor * Refactor * wip * wip * Fix compilation * Remove event-sourcing from CLI * Parse JSON * Nix file * Update * Fix * deps * Update * Fix deps on darwin * Generate cabal and nix file * Build properly * Add neo.build * Start working on Task * Refactor errors * Add utf8 by default * Update * Retrieve nhcore * Evaluate Nix expression * Update * update * Remove optenv-conf * Update gitignore * Remove devenv * "working" build * Add FIXME comments * update * Update * Update envrc * Move files into .neohaskell * Walk dirs * Update * Remove leading path Co-authored-by: CoderCris Æ <[email protected]> * Update * Update * Fix recursive directory copying --------- Co-authored-by: Nikita Tchayka <[email protected]> Co-authored-by: Nick Seagull <[email protected]> Co-authored-by: CoderCris Æ <[email protected]>
neohaskell · Mar 7, 2025 · 6c03d95 · 6c03d95
1 parent deb9780
commit 6c03d95
Show file tree

Hide file tree

Showing 55 changed files with 1,094 additions and 668 deletions.
diff --git a/.envrc b/.envrc
@@ -1,3 +1 @@
-source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
-
-use devenv
+use nix
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,11 @@ cabal.project.local~
 .aider*
 
 # hie cradle generated automatically
-hie.yaml
+hie.yaml
+
+.neo
+sandbox/*.cabal
+sandbox/*.nix
+
+example.cabal
+result
diff --git a/.hlint.yaml b/.hlint.yaml
@@ -5,12 +5,10 @@
 # This file contains a template configuration file, which is typically
 # placed as .hlint.yaml in the root of your project
 
-
 # Specify additional command line arguments
 #
 # - arguments: [--color, --cpp-simple, -XQuasiQuotes]
 
-
 # Control which extensions/flags/modules/functions can be used
 #
 # - extensions:
@@ -28,7 +26,6 @@
 # - functions:
 #   - {name: (.), within: []} # Cannot use (.) at all
 
-
 # Add custom hints for this project
 #
 # Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
@@ -56,25 +53,22 @@
 # Warn on use of partial functions
 # - group: {name: partial, enabled: true}
 
-
 # Ignore some builtin hints
 # - ignore: {name: Use let}
 # - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
-- ignore: {name: Eta reduce}
-- ignore: {name: Redundant bracket}
-- ignore: {name: Use newtype instead of data}
-- ignore: {name: Use const}
-- ignore: {name: Avoid lambda using `infix`}
-- ignore: {name: Avoid lambda}
-- ignore: {name: Use /=}
-- ignore: {name: Use <$>}
-- ignore: {name: Replace case with maybe}
-- ignore: {name: Use when}
-
-
+- ignore: { name: Eta reduce }
+- ignore: { name: Redundant bracket }
+- ignore: { name: Use newtype instead of data }
+- ignore: { name: Use const }
+- ignore: { name: Avoid lambda using `infix` }
+- ignore: { name: Avoid lambda }
+- ignore: { name: Use /= }
+- ignore: { name: Use <$> }
+- ignore: { name: Replace case with maybe }
+- ignore: { name: Use when }
+- ignore: { name: Use lambda case }
 # Define some custom infix operators
 # - fixity: infixr 3 ~^#^~
 
-
 # To generate a suitable file for HLint do:
 # $ hlint --default > .hlint.yaml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,15 +6,22 @@
     "Appendable",
     "clippy",
     "Defaultable",
+    "devenv",
+    "dont",
     "foldl",
     "fprint",
     "GADT",
+    "hlint",
     "Monoid",
     "Nanotime",
     "NEOHASKELL",
+    "nhcore",
+    "nixfmt",
+    "nixpkgs",
     "NOINLINE",
     "optparse",
     "OVERLAPPABLE",
+    "pkgs",
     "Posix",
     "reldir",
     "relfile",
@@ -24,5 +31,5 @@
     "Unagi"
   ],
   "haskell.manageHLS": "PATH",
-  "nixEnvSelector.nixFile": "${workspaceFolder}/devenv.nix"
+  "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix"
 }
diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ different parts of NeoHaskell.
 
 (This assumes that you're using MacOS, WSL2 or Linux)
 
-- Install DevEnv by following [the official instructions](https://devenv.sh/getting-started/).
-- Run `devenv shell`
+- Install [Nix](https://nixos.org/download/)
+- Run `nix-shell`
 - Run `cabal update && cabal build all`
 
 The recommended IDE for any NeoHaskell project is [Visual Studio Code](https://code.visualstudio.com/).

diff --git a/cabal.project b/cabal.project
@@ -1,2 +1,3 @@
 packages:
-  */*.cabal
+  cli/*.cabal
+  core/*.cabal
diff --git a/cli/app/Main.hs b/cli/app/Main.hs
@@ -1,8 +1,9 @@
 module Main where
 
 import Core
-import qualified Neo
+import Neo qualified
+import Task qualified
 
 
-main :: IO Unit
-main = Neo.main
+main :: IO ()
+main = Task.runOrPanic Neo.run
diff --git a/cli/default.nix b/cli/default.nix
@@ -0,0 +1,8 @@
+{ pkgs ? import ../nix/nixpkgs.nix { } }:
+pkgs.haskellPackages.developPackage {
+  root = ./.;
+  source-overrides = {
+    nhcore = ../core;
+  };
+  modifier = drv: pkgs.haskell.lib.dontHaddock drv;
+}
diff --git a/cli/nhcli.cabal b/cli/nhcli.cabal
@@ -16,6 +16,8 @@ common common_cfg
     ghc-options:    -Wall
                     -Werror
                     -threaded
+                    -fno-warn-partial-type-signatures
+                    -fno-warn-name-shadowing
     default-extensions:
       ApplicativeDo
       BlockArguments
@@ -28,23 +30,29 @@ common common_cfg
       ImpredicativeTypes
       ImportQualifiedPost
       OverloadedStrings
-      OverloadedLists
       OverloadedLabels
       OverloadedRecordDot
       DuplicateRecordFields
       PackageImports
       NamedFieldPuns
       Strict
       TypeFamilies
+      PartialTypeSignatures
 
     build-depends:
       nhcore,
 
+
+
 library
     import:           common_cfg
     exposed-modules:
       Neo,
       Neo.Build,
+      Neo.Build.Templates.Cabal,
+      Neo.Build.Templates.Nix,
+      Neo.Core,
+      Neo.Core.ProjectConfiguration,
     -- other-modules:
     -- other-extensions:
     hs-source-dirs:   src

diff --git a/cli/src/Neo.hs b/cli/src/Neo.hs
@@ -1,28 +1,57 @@
-module Neo (main) where
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+
+module Neo (
+  run,
+) where
 
-import Action qualified
-import Array (Array)
 import Array qualified
 import Command qualified
+import Console qualified
 import Core
+import File qualified
+import Json qualified
 import Neo.Build qualified as Build
-import Service qualified
+import Task qualified
+import Text qualified
 
 
-data State = State
-  { build :: Build.State
+data CommonFlags = CommonFlags
+  { projectFile :: Path
   }
   deriving (Show, Eq, Ord)
 
 
-data Event
-  = Build Build.Event
-  | NoOp
+data NeoCommand
+  = Build CommonFlags
   deriving (Show, Eq, Ord)
 
 
-commandParser :: Command.OptionsParser Event
-commandParser = do
+run :: Task _ Unit
+run = do
+  let message1 = "⚠️ NEOHASKELL IS IN ITS EARLY DAYS ⚠️"
+  let message2 = "HERE BE DRAGONS, BEWARE!"
+  let msgLength = Text.length message1 + 4
+  let paddedMessage1 = message1 |> Text.pad msgLength ' '
+  let paddedMessage2 = message2 |> Text.pad msgLength ' '
+  Console.print ""
+  Console.print ""
+  Console.print paddedMessage1
+  Console.print paddedMessage2
+  Console.print ""
+  Console.print ""
+  let parser =
+        Command.CommandOptions
+          { name = "neo",
+            description = "NeoHaskell's console helper",
+            version = Just [Core.version|0.5.0|],
+            decoder = commandsParser
+          }
+  cmd <- Command.parseHandler parser
+  handleCommand cmd
+
+
+commandsParser :: Command.OptionsParser NeoCommand
+commandsParser = do
   let build =
         Command.CommandOptions
           { name = "build",
@@ -34,57 +63,39 @@ commandParser = do
     (Array.fromLinkedList [build])
 
 
-buildParser :: Command.OptionsParser Event
+buildParser :: Command.OptionsParser NeoCommand
 buildParser = do
-  event <- Build.commandParser
-  pure (Build event)
-
-
-init :: (State, Action Event)
-init = do
-  let emptyState = State {build = Build.initialState}
-  let action =
-        Command.parse
-          Command.CommandOptions
-            { name = "neo",
-              description = "NeoHaskell's console helper",
-              version = Just [version|0.5.0|],
-              decoder = commandParser
-            }
-  (emptyState, action)
-
-
-update :: Event -> State -> (State, Action Event)
-update event state =
-  case event of
-    Build buildEvent -> do
-      let (newBuildState, buildAction) = Build.update buildEvent state.build
-      let newState = state {build = newBuildState}
-      let action = buildAction |> Action.map Build
-      (newState, action)
-    NoOp -> do
-      let newState = state
-      let action = Action.none
-      (newState, action)
-
-
-view :: State -> Text
-view s =
-  if s.build.message == ""
-    then "Loading"
-    else s.build.message
-
-
-triggers :: Array (Trigger Event)
-triggers = Array.empty
-
-
-main :: IO ()
-main =
-  Service.run
-    Service.UserApp
-      { init = init,
-        view = view,
-        triggers = triggers,
-        update = update
-      }
+  common <- flagsParser
+  pure (Build common)
+
+
+flagsParser :: Command.OptionsParser CommonFlags
+flagsParser = do
+  projectFilePath <-
+    Command.path
+      Command.PathConfig
+        { metavar = "PATH",
+          short = 'c',
+          help = "Path to the project configuration file",
+          long = "projectConfig",
+          value = Just [path|neo.json|]
+        }
+  pure (CommonFlags {projectFile = projectFilePath})
+
+
+data Error
+  = BuildError Build.Error
+  | Other
+  deriving (Show)
+
+
+handleCommand :: NeoCommand -> Task Error ()
+handleCommand command =
+  case command of
+    Build flags -> do
+      txt <- File.readText flags.projectFile |> Task.mapError (\_ -> Other)
+      case Json.decodeText txt of
+        Err err -> panic err
+        Ok config ->
+          Build.handle config
+            |> Task.mapError (\e -> BuildError e)