Skip to content

Gh857 add run support for es modules #858

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
f-f merged 3 commits into from
Feb 16, 2022
Merged

Gh857 add run support for es modules #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
415565b
Change spago run to support es modules from 0.15 onwards
sigma-andex Feb 11, 2022
c8c8cbd
Update changelog with spago run
sigma-andex Feb 11, 2022
65b39b8
Correct changelog entry
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

Features:
- Make `spago run` use es modules for projects >= v0.15

## [0.20.7] - 2022-02-12

Bugfixes
Expand Down
31 changes: 25 additions & 6 deletions src/Spago/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,26 @@ runBackend
runBackend maybeBackend RunDirectories{ sourceDir, executeDir } moduleName maybeSuccessMessage failureMessage extraArgs = do
logDebug $ display $ "Running with backend: " <> fromMaybe "nodejs" maybeBackend
BuildOptions{ pursArgs } <- view (the @BuildOptions)
let postBuild = maybe (nodeAction $ Path.getOutputPath pursArgs) backendAction maybeBackend
isES <- Purs.hasMinPursVersion "0.15.0"
let postBuild = maybe (nodeAction isES $ Path.getOutputPath pursArgs) backendAction maybeBackend
build (Just postBuild)
where
fromFilePath = Text.pack . Turtle.encodeString
nodeArgs = Text.intercalate " " $ map unBackendArg extraArgs
nodeContents outputPath' =
esContents outputPath' =
fold
[ "import { main } from '"
, Text.replace "\\" "/" (fromFilePath sourceDir)
, "/"
, Text.pack outputPath'
, "/"
, unModuleName moduleName
, "/"
, "index.js"
, "'\n\n"
, "main()"
]
cjsContents outputPath' =
fold
[ "require('"
, Text.replace "\\" "/" (fromFilePath sourceDir)
Expand All @@ -337,14 +351,19 @@ runBackend maybeBackend RunDirectories{ sourceDir, executeDir } moduleName maybe
, unModuleName moduleName
, "').main()"
]
nodeCmd outputPath'= "node -e \"" <> nodeContents outputPath' <> "\" -- " <> nodeArgs
nodeAction outputPath' = do
nodeCmd isES outputPath'=
if isES then
"node --input-type=module -e \"" <> esContents outputPath' <> "\" -- " <> nodeArgs
else
"node -e \"" <> cjsContents outputPath' <> "\" -- " <> nodeArgs

nodeAction isES outputPath' = do
-- cd to executeDir in case it isn't the same as sourceDir
logDebug $ "Executing from: " <> displayShow @FilePath executeDir
Turtle.cd executeDir
-- We build a process by hand here because we need to forward the stdin to the backend process
logDebug $ "Running node command: `" <> (display $ nodeCmd outputPath') <> "`"
let processWithStdin = (Process.shell (Text.unpack $ nodeCmd outputPath')) { Process.std_in = Process.Inherit }
logDebug $ "Running node command: `" <> display (nodeCmd isES outputPath') <> "`"
let processWithStdin = (Process.shell (Text.unpack $ nodeCmd isES outputPath')) { Process.std_in = Process.Inherit }
Turtle.system processWithStdin empty >>= \case
ExitSuccess -> maybe (pure ()) (logInfo . display) maybeSuccessMessage
ExitFailure n -> die [ display failureMessage <> "exit code: " <> repr n ]
Expand Down