Improvements to Test

compiler/app/Main.hs

@@ -37,8 +37,8 @@ run cmd = do
             Left  e ->
               putStrLn e
 
-    Test entrypoint target debug watch coverage optLevel ->
-      runTests entrypoint target debug watch coverage optLevel
+    Test entrypoint target debug watch coverage optLevel verbose ->
+      runTests entrypoint target debug watch coverage optLevel verbose
 
     Install ->
       runPackageInstaller

compiler/main/Run/CommandLine.hs

@@ -39,6 +39,7 @@ data Command
       , testWatch :: Bool
       , testCoverage :: Bool
       , testOptimizationLevel :: OptimizationLevel
+      , testVerbose :: Bool
       }
   | Install
   | New { newFolder :: FilePath }
@@ -232,7 +233,7 @@ parseTestInput =
   strOption (long "input" <> short 'i' <> metavar "INPUT" <> help "What to test" <> showDefault <> value ".")
 
 parseTest :: Parser Command
-parseTest = Test <$> parseTestInput <*> parseTarget <*> parseDebug <*> parseWatch <*> parseCoverage <*> parseOptimizationLevel
+parseTest = Test <$> parseTestInput <*> parseTarget <*> parseDebug <*> parseWatch <*> parseCoverage <*> parseOptimizationLevel <*> parseVerbose
 
 
 parseRunInput :: Parser FilePath

compiler/main/Run/TestRunner.hs

@@ -54,8 +54,8 @@ backToTopCode :: String
 backToTopCode = "\x1b[0;0H"
 
 
-runTests :: String -> Target -> Bool -> Bool -> Bool -> OptimizationLevel -> IO ()
-runTests entrypoint target debug watchMode coverage optLevel = do
+runTests :: String -> Target -> Bool -> Bool -> Bool -> OptimizationLevel -> Bool -> IO ()
+runTests entrypoint target debug watchMode coverage optLevel verbose = do
   canonicalEntrypoint <- canonicalizePath entrypoint
   rootPath            <- canonicalizePath "./"
 

madlib.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -123,6 +123,8 @@ library
       VersionLock.VersionLock
   other-modules:
       Paths_madlib
+  autogen-modules:
+      Paths_madlib
   hs-source-dirs:
       compiler/main
   ghc-options: -threaded -funbox-strict-fields -O3 -optc-O3 -fsimpl-tick-factor=500 -rtsopts -fexcess-precision -optc-ffast-math -funfolding-use-threshold=16 -Wunused-binds -Wunused-local-binds -Wunused-matches -Wunused-pattern-binds -Wunused-top-binds -Wunused-type-patterns
@@ -213,6 +215,8 @@ library common
       Parse.DocString.DocString
   other-modules:
       Paths_madlib
+  autogen-modules:
+      Paths_madlib
   hs-source-dirs:
       compiler/common
   ghc-options: -threaded -funbox-strict-fields -O3 -optc-O3 -fsimpl-tick-factor=500 -rtsopts -fexcess-precision -optc-ffast-math -funfolding-use-threshold=16 -Wunused-binds -Wunused-local-binds -Wunused-matches -Wunused-pattern-binds -Wunused-top-binds -Wunused-type-patterns
@@ -281,6 +285,8 @@ executable madlib
   main-is: Main.hs
   other-modules:
       Paths_madlib
+  autogen-modules:
+      Paths_madlib
   hs-source-dirs:
       compiler/app
   ghc-options: -threaded -funbox-strict-fields -O3 -optc-O3 -fsimpl-tick-factor=500 -rtsopts -fexcess-precision -optc-ffast-math -funfolding-use-threshold=16 -Wunused-binds -Wunused-local-binds -Wunused-matches -Wunused-pattern-binds -Wunused-top-binds -Wunused-type-patterns
@@ -343,9 +349,9 @@ executable madlib
     , transformers-base ==0.4.6
     , unordered-containers ==0.2.16.0
     , utf8-string
+  default-language: Haskell2010
   if flag(static)
     ld-options: -static
-  default-language: Haskell2010
 
 test-suite madlib-test
   type: exitcode-stdio-1.0
@@ -358,6 +364,8 @@ test-suite madlib-test
       TestUtils
       Utils.PathSpec
       Paths_madlib
+  autogen-modules:
+      Paths_madlib
   hs-source-dirs:
       compiler/test
   build-depends:

prelude/__internal__/IO.mad

@@ -51,6 +51,7 @@ export colortrace = (fn, v, a) => trace(prettyCase(fn, v), a)
 
 export red = Terminal.text.red
 export green = Terminal.text.green
+export blue = Terminal.text.blue
 export yellow = Terminal.text.yellow
 export grey = Terminal.text.white
 

prelude/__internal__/Terminal.mad

@@ -1,5 +1,7 @@
 import String from "String"
 
+
+
 type HandlerId = HandlerId
 export type HandlerId
 
@@ -24,7 +26,6 @@ export ansi = {
   FGMagenta: "35",
   FGCyan: "36",
   FGWhite: "37",
-
   FGBrightBlack: "90",
   FGBrightRed: "91",
   FGBrightGreen: "92",
@@ -33,7 +34,6 @@ export ansi = {
   FGBrightMagenta: "95",
   FGBrightCyan: "96",
   FGBrightWhite: "97",
-
   BGBlack: "40",
   BGRed: "41",
   BGGreen: "42",
@@ -42,7 +42,6 @@ export ansi = {
   BGMagenta: "45",
   BGCyan: "46",
   BGWhite: "47",
-
   BGBrightBlack: "100",
   BGBrightRed: "101",
   BGBrightGreen: "102",
@@ -51,15 +50,14 @@ export ansi = {
   BGBrightMagenta: "105",
   BGBrightCyan: "106",
   BGBrightWhite: "107",
-
   FormatUnderline: "4",
   FormatNoUnderline: "24",
   FormatBold: "1",
   FormatNoBold: "21",
-
   FormatInvert: "7",
 }
 
+ansify = (parts) => `\x1b[${String.join(";", parts)}m`
 
 /**
  * Adds ansi escape codes to a string given a list of styles.
@@ -69,10 +67,16 @@ export ansi = {
  * ansiColor([ansi.FormatBold, ansi.FGBrightRed], "will be red and bold")
  */
 ansiColor :: List String -> String -> String
-export ansiColor = (parts, str) => colorize(
-  `\x1b[${String.join(";", parts)}m`,
-  str
-)
+export ansiColor = (parts, str) => colorize(ansify(parts), str)
+
+/**
+ * Set an ansi color conditionally
+ * @since 0.24.1
+ * @example
+ * ansiCond(successPattern, failurePattern, condition, string)
+ */
+ansiCond :: List String -> List String -> Boolean -> String -> String
+export ansiCond = (ok, no, check, str) => ansiColor(check ? ok : no, str)
 
 export text = {
   black: ansiColor([ansi.FGBlack]),
@@ -161,9 +165,7 @@ onWindowResizedFFI :: ({} -> {}) -> HandlerId
 onWindowResizedFFI = extern "madlib__stdio__onWindowResized"
 
 onWindowResized :: (#[Integer, Integer] -> {}) -> HandlerId
-export onWindowResized = (cb) => onWindowResizedFFI(() => {
-  cb(getWindowSize())
-})
+export onWindowResized = (cb) => onWindowResizedFFI(() => { cb(getWindowSize()) })
 
 
 clearWindowResizeHandler :: HandlerId -> {}
@@ -221,10 +223,7 @@ export clearKeyPressedHandler = (id) => #- {
 
 
 getWindowSize :: {} -> #[Integer, Integer]
-export getWindowSize = () => #[
-  #- process.stdout.columns -#,
-  #- process.stdout.rows -#,
-]
+export getWindowSize = () => #[#- process.stdout.columns -#, #- process.stdout.rows -#]
 
 
 getTTYMode :: {} -> TTYMode