Skip to content

Commit cafce52

Browse files
authored
Merge pull request #327 from gren-lang/push-vwmrqzmsqxlo
Stop printing package management updates when compiling to stdout
2 parents 8027be2 + 54524da commit cafce52

File tree

3 files changed

+37
-10
lines changed

3 files changed

+37
-10
lines changed

src/Main.gren

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,20 @@ parseUserArgs model compilerPath =
471471
|> Task.perform RunCmd
472472

473473
CliParser.Make flags ->
474-
resolveProject model
474+
let
475+
determineOutputStreamForResolve =
476+
when flags.output is
477+
Just Compiler.Backend.StdOut ->
478+
-- We only want to print the actual generated JS
479+
-- in this case, ignoring everything else
480+
Terminal.Help.getNullStream
481+
|> Task.map Stream.writable
482+
483+
_ ->
484+
Task.succeed model.stdout
485+
in
486+
determineOutputStreamForResolve
487+
|> Task.andThen (\output -> resolveProject { model | stdout = output })
475488
|> Task.andThen (verifyMakeFlags model.fsPermission flags.entryPoints flags.output)
476489
|> Task.map
477490
(\resolved ->
@@ -534,7 +547,20 @@ parseUserArgs model compilerPath =
534547
|> Task.perform RunCmd
535548

536549
CliParser.Docs flags ->
537-
resolveProject model
550+
let
551+
determineOutputStreamForResolve =
552+
when flags.output is
553+
Just Compiler.Backend.DocsStdOut ->
554+
-- We only want to print the actual generated JS
555+
-- in this case, ignoring everything else
556+
Terminal.Help.getNullStream
557+
|> Task.map Stream.writable
558+
559+
_ ->
560+
Task.succeed model.stdout
561+
in
562+
determineOutputStreamForResolve
563+
|> Task.andThen (\output -> resolveProject { model | stdout = output })
538564
|> Task.map
539565
(\resolved ->
540566
Compiler.Backend.run

src/Terminal/Help.gren

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Terminal.Help exposing
33
, prettyPrint
44
, report
55
, makeLink
6+
, getNullStream
67
)
78

89
import CLI.PrettyPrinter as PP
@@ -124,3 +125,10 @@ makeNakedLink filename =
124125
, PP.text (SemanticVersion.toString Meta.version)
125126
, PP.text ("/hints/" ++ filename ++ ".md")
126127
]
128+
129+
130+
getNullStream : Task x (Stream.Transformation Bytes Bytes)
131+
getNullStream =
132+
Stream.customTransformation
133+
(\state _ -> Stream.UpdateState state)
134+
Bytes.empty

src/Terminal/Run.gren

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ makeProject config projectOutline =
143143
, onComplete = config.onCompiled outputPath
144144
}
145145
in
146-
getNullStream
146+
Help.getNullStream
147147
|> Task.andThen installPackages
148148
|> Task.map backendCommand
149149
|> Task.map compile
@@ -227,13 +227,6 @@ run config =
227227
-- HELPERS
228228

229229

230-
getNullStream : Task x (Stream.Transformation Bytes Bytes)
231-
getNullStream =
232-
Stream.customTransformation
233-
(\state _ -> Stream.UpdateState state)
234-
Bytes.empty
235-
236-
237230
getProjectOutline : FileSystem.Permission -> Path -> Task Error Outline
238231
getProjectOutline fsPermission path =
239232
path

0 commit comments

Comments
 (0)