Skip to content

Fix pr comments #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JordanMartinez merged 2 commits into from
Feb 14, 2022
Merged

Fix pr comments #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbcd2a
Rename node.js to Node.js
sigma-andex Feb 13, 2022
fa698b9
Remove unused Unsafe.hs
sigma-andex Feb 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion purescript.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ library
Language.PureScript.Constants.Prelude
Language.PureScript.Constants.Data.Generic.Rep
Language.PureScript.Constants.Data.Newtype
Language.PureScript.Constants.Effect.Unsafe
Language.PureScript.CoreFn
Language.PureScript.CoreFn.Ann
Language.PureScript.CoreFn.Binders
Expand Down
9 changes: 0 additions & 9 deletions src/Language/PureScript/Constants/Effect/Unsafe.hs
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions src/Language/PureScript/Interactive/IO.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import System.FilePath (takeDirectory, (</>))
import System.Process (readProcessWithExitCode)
import Text.Parsec ((<?>), many1, parse, sepBy)
import Text.Parsec.Char (char, digit)
import Protolude (note)

mkdirp :: FilePath -> IO ()
mkdirp = createDirectoryIfMissing True . takeDirectory
Expand All @@ -34,7 +35,7 @@ onFirstFileMatching f pathVariants = runMaybeT . msum $ map (MaybeT . f) pathVar
--
findNodeProcess :: IO (Either String String)
findNodeProcess = onFirstFileMatching findExecutable ["nodejs", "node"] <&>
maybe (throwError "Could not find node.js. Do you have node.js installed and available in your PATH?") pure
note "Could not find Node.js. Do you have Node.js installed and available in your PATH?"

findNodeVersion :: String -> IO (Maybe String)
findNodeVersion node = do
Expand All @@ -47,16 +48,16 @@ readNodeProcessWithExitCode :: Maybe FilePath -> [String] -> String -> IO (Eithe
readNodeProcessWithExitCode nodePath nodeArgs stdin = runExceptT $ do
process <- maybe (ExceptT findNodeProcess) pure nodePath
(major, _, _) <- lift (findNodeVersion process) >>= \case
Nothing -> throwError "Could not find node.js version."
Nothing -> throwError "Could not find Node.js version."
Just version -> do
let semver = do
void $ char 'v'
major : minor : patch : _ <- fmap (read @Int) (many1 digit) `sepBy` void (char '.')
pure (major, minor, patch)
case parse (semver <?> "Could not parse node.js version.") "" version of
case parse (semver <?> "Could not parse Node.js version.") "" version of
Left err -> throwError $ show err
Right (major, minor, patch)
| major < 12 -> throwError $ "Unsupported node.js version " <> show major <> ". Required node.js version >=12."
| major < 12 -> throwError $ "Unsupported Node.js version " <> show major <> ". Required Node.js version >=12."
| otherwise -> pure (major, minor, patch)
let nodeArgs' = if major < 13 then "--experimental-modules" : nodeArgs else nodeArgs
lift (readProcessWithExitCode process nodeArgs' stdin) <&> \case
Expand Down