on master help sign in
.github/CONTRIBUTING.md+18−20
since splitsnapshots
unifiedsplit
@@ -4,10 +4,15 @@ Thanks helping with the development of Elm! This document describes the basic
4standards for opening pull requests and making the review process as smooth as
4standards for opening pull requests and making the review process as smooth as
5possible.
5possible.
6
6
7−## Licensing
8
7
9−You need to sign the [contributor agreement](ContributorAgreement.pdf)
8+## Expectations
10−and send it to <info@elm-lang.org> before opening your pull request.
9+
10+- Pull requests are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.
11+- Smaller pull requests are easier to review. To fix nine typos, nine specific issues will always go faster than one big one. Learn why [here](https://github.com/elm/expectations/blob/master/small-pull-requests.md).
12+- Reviewers may not know as much as you about certain situations, so add links to supporting evidence for important claims, especially regarding standards for CSS, HTTP, URI, etc.
13+
14+Finally, please be patient with the core team. They are trying their best with limited resources!
15+
11
16
12## Style Guide
17## Style Guide
13
18
@@ -17,27 +22,20 @@ and send it to <info@elm-lang.org> before opening your pull request.
17[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
22[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
18[js]: https://google.github.io/styleguide/javascriptguide.xml
23[js]: https://google.github.io/styleguide/javascriptguide.xml
19
24
20−## Branches
21
25
22− * [The master branch][master] is the home of the next release of the compiler
26+## Branches
23− so new features and improvements get merged there. Most pull requests
24− should target this branch!
25
27
26− * [The stable branch][stable] is for tagging releases and critical bug fixes.
28+[The master branch][master] is the home of the next release of the compiler
27− This branch is handy for folks who want to build the most recent public
29+so new features and improvements get merged there. Most pull requests
28− release from source.
30+should target this branch!
29
31
30[master]: http://github.com/elm-lang/elm/tree/master
32[master]: http://github.com/elm-lang/elm/tree/master
31−[stable]: http://github.com/elm-lang/elm/tree/stable
32
33
33−If you are working on a fairly large feature, we will probably want to merge it
34−in as its own branch and do some testing before bringing it into the master
35−branch. This way we can keep releases of the master branch independent of new
36−features.
37
34
38−Note that the master branch of the compiler should always be in sync with the
35+## Licensing
39−master branch of the [website][], and the stable branch of the compiler should
36+
40−always be in sync with the stable branch of the [website][]. Make sure that
37+Nothing extra to do for this. The default on GitHub described [here](https://docs.github.com/en/github/site-policy/github-terms-of-service#6-contributions-under-repository-license) is that:
41−your changes maintain this compatibility.
38+
39+> Whenever you add Content to a repository containing notice of a license, you license that Content under the same terms, and you agree that you have the right to license that Content under those terms. If you have a separate agreement to license that Content under different terms, such as a contributor license agreement, that agreement will supersede.
40+
42
41
43−[website]: https://github.com/elm-lang/elm-lang.org
.github/workflows/set-issue-expectations.ymlnew file+21
@@ -0,0 +1,21 @@
1+name: Set Issue Expectations
2+on:
3+ issues:
4+ types: [opened]
5+jobs:
6+ comment-on-issue:
7+ name: Comment On Issue
8+ runs-on: ubuntu-latest
9+ steps:
10+ - uses: actions/github@v1.0.0
11+ env:
12+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13+ with:
14+ args: |
15+ comment "Thanks for reporting this! To set expectations:
16+
17+ - Issues are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.
18+ - Ask questions in a [community forum](https://elm-lang.org/community). You will get an answer quicker that way!
19+ - If you experience something similar, open a new issue. [We like duplicates](https://github.com/elm/expectations/blob/master/duplicates.md).
20+
21+ Finally, please be patient with the core team. They are trying their best with limited resources."
.github/workflows/set-pull-expectations.ymlnew file+19
@@ -0,0 +1,19 @@
1+on:
2+ pull_request_target:
3+ types: [opened]
4+
5+jobs:
6+ comment-on-pull:
7+ name: Comment On Pull
8+ runs-on: ubuntu-latest
9+ steps:
10+ - uses: actions/github-script@v3
11+ with:
12+ github-token: ${{secrets.GITHUB_TOKEN}}
13+ script: |
14+ github.issues.createComment({
15+ issue_number: context.issue.number,
16+ owner: context.repo.owner,
17+ repo: context.repo.repo,
18+ body: "Thanks for suggesting these code changes. To set expectations:\n\n- Pull requests are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.\n- Smaller pull requests are easier to review. To fix nine typos, nine specific issues will always go faster than one big one. Learn why [here](https://github.com/elm/expectations/blob/master/small-pull-requests.md).\n- Reviewers may not know as much as you about certain situations, so add links to supporting evidence for important claims, especially regarding standards for CSS, HTTP, URI, etc.\n\nFinally, please be patient with the core team. They are trying their best with limited resources."
19+ })
.gitignore+1
@@ -5,3 +5,4 @@ cabal-dev
5cabal.sandbox.config
5cabal.sandbox.config
6.DS_Store
6.DS_Store
7*~
7*~
8+travis.log
.travis.ymlnew file+28
@@ -0,0 +1,28 @@
1+language: minimal
2+services: docker
3+
4+env:
5+ global:
6+ - LINUX_ARCHIVE=binary-for-linux-64-bit.gz
7+
8+before_install:
9+ - docker build -t elm -f installers/linux/Dockerfile .
10+ - docker cp $(docker create elm):/usr/local/bin/elm .
11+ - gzip -9 -c elm > $LINUX_ARCHIVE
12+
13+deploy:
14+ provider: releases
15+ api_key:
16+ secure: Yz2Lo4u9rZQ7Ee7ohAsrZpkqsYDUerCSMdSQIH8ryrf7phHhiloPEkTKsM+NupHqU/LEAVsunxbau4QrCEjA2vPavAPVk8cKomRUWK/YjbXHKa24hPkal2c+A2bnMQ6w3qYk/PjL9rW+Goq++/SNLcYZwHBV0Chl2blivMwWCSA=
17+ file: $LINUX_ARCHIVE
18+ skip_cleanup: true
19+ on:
20+ branch: master
21+ tags: true
22+
23+notifications:
24+ email:
25+ recipients:
26+ - rlefevre@dmy.fr
27+ on_success: change
28+ on_failure: change
ContributorAgreement.pdfdeleted

Binary file not shown.

README.md+10−5
@@ -1,17 +1,22 @@
1−# The Elm Compiler
1+# Elm
2
2
3−Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/).
3+A delightful language for reliable webapps.
4
4
5+Check out the [Home Page](http://elm-lang.org/), [Try Online](http://elm-lang.org/try), or [The Official Guide](http://guide.elm-lang.org/)
6+
7+
8+<br>
5
9
6## Install
10## Install
7
11
8−Follow [these instructions][installer]!
12+✨ [Install](https://guide.elm-lang.org/install/elm.html) ✨
9
13
10− [installer]: https://guide.elm-lang.org/install.html
14+For multiple versions, previous versions, and uninstallation, see the instructions [here](https://github.com/elm/compiler/blob/master/installers/README.md).
11
15
16+<br>
12
17
13## Help
18## Help
14
19
15If you are stuck, ask around on [the Elm slack channel][slack]. Folks are friendly and happy to help with questions!
20If you are stuck, ask around on [the Elm slack channel][slack]. Folks are friendly and happy to help with questions!
16
21
17−[slack]: http://elmlang.herokuapp.com/
22+[slack]: http://elmlang.herokuapp.com/
builder/src/Build.hs+118−112
@@ -2,15 +2,15 @@
2{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings #-}
2{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings #-}
3module Build
3module Build
4 ( fromExposed
4 ( fromExposed
5− , fromMains
5+ , fromPaths
6 , fromRepl
6 , fromRepl
7 , Artifacts(..)
7 , Artifacts(..)
8− , Main(..)
8+ , Root(..)
9 , Module(..)
9 , Module(..)
10 , CachedInterface(..)
10 , CachedInterface(..)
11 , ReplArtifacts(..)
11 , ReplArtifacts(..)
12 , DocsGoal(..)
12 , DocsGoal(..)
13− , getMainNames
13+ , getRootNames
14 )
14 )
15 where
15 where
16
16
@@ -50,6 +50,7 @@ import qualified Parse.Module as Parse
50import qualified Reporting
50import qualified Reporting
51import qualified Reporting.Annotation as A
51import qualified Reporting.Annotation as A
52import qualified Reporting.Error as Error
52import qualified Reporting.Error as Error
53+import qualified Reporting.Error.Docs as EDocs
53import qualified Reporting.Error.Syntax as Syntax
54import qualified Reporting.Error.Syntax as Syntax
54import qualified Reporting.Error.Import as Import
55import qualified Reporting.Error.Import as Import
55import qualified Reporting.Exit as Exit
56import qualified Reporting.Exit as Exit
@@ -163,14 +164,14 @@ fromExposed style root details docsGoal exposed@(NE.List e es) =
163
164
164
165
165
166
166−-- FROM MAINS
167+-- FROM PATHS
167
168
168
169
169data Artifacts =
170data Artifacts =
170 Artifacts
171 Artifacts
171 { _name :: Pkg.Name
172 { _name :: Pkg.Name
172 , _deps :: Dependencies
173 , _deps :: Dependencies
173− , _mains :: NE.List Main
174+ , _roots :: NE.List Root
174 , _modules :: [Module]
175 , _modules :: [Module]
175 }
176 }
176
177
@@ -184,25 +185,25 @@ type Dependencies =
184 Map.Map ModuleName.Canonical I.DependencyInterface
185 Map.Map ModuleName.Canonical I.DependencyInterface
185
186
186
187
187−fromMains :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)
188+fromPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)
188−fromMains style root details paths =
189+fromPaths style root details paths =
189 Reporting.trackBuild style $ \key ->
190 Reporting.trackBuild style $ \key ->
190 do env <- makeEnv key root details
191 do env <- makeEnv key root details
191
192
192− elmains <- findMains env paths
193+ elroots <- findRoots env paths
193− case elmains of
194+ case elroots of
194 Left problem ->
195 Left problem ->
195 return (Left (Exit.BuildProjectProblem problem))
196 return (Left (Exit.BuildProjectProblem problem))
196
197
197− Right lmains ->
198+ Right lroots ->
198 do -- crawl
199 do -- crawl
199 dmvar <- Details.loadInterfaces root details
200 dmvar <- Details.loadInterfaces root details
200 smvar <- newMVar Map.empty
201 smvar <- newMVar Map.empty
201− smainMVars <- traverse (fork . crawlMain env smvar) lmains
202+ srootMVars <- traverse (fork . crawlRoot env smvar) lroots
202− smains <- traverse readMVar smainMVars
203+ sroots <- traverse readMVar srootMVars
203 statuses <- traverse readMVar =<< readMVar smvar
204 statuses <- traverse readMVar =<< readMVar smvar
204
205
205− midpoint <- checkMainsMidpoint dmvar statuses smains
206+ midpoint <- checkMidpointAndRoots dmvar statuses sroots
206 case midpoint of
207 case midpoint of
207 Left problem ->
208 Left problem ->
208 return (Left (Exit.BuildProjectProblem problem))
209 return (Left (Exit.BuildProjectProblem problem))
@@ -212,24 +213,24 @@ fromMains style root details paths =
212 rmvar <- newEmptyMVar
213 rmvar <- newEmptyMVar
213 resultsMVars <- forkWithKey (checkModule env foreigns rmvar) statuses
214 resultsMVars <- forkWithKey (checkModule env foreigns rmvar) statuses
214 putMVar rmvar resultsMVars
215 putMVar rmvar resultsMVars
215− rmainMVars <- traverse (fork . checkMain env resultsMVars) smains
216+ rrootMVars <- traverse (fork . checkRoot env resultsMVars) sroots
216 results <- traverse readMVar resultsMVars
217 results <- traverse readMVar resultsMVars
217 writeDetails root details results
218 writeDetails root details results
218− toArtifacts env foreigns results <$> traverse readMVar rmainMVars
219+ toArtifacts env foreigns results <$> traverse readMVar rrootMVars
219
220
220
221
221
222
222−-- GET MAIN NAMES
223+-- GET ROOT NAMES
223
224
224
225
225−getMainNames :: Artifacts -> NE.List ModuleName.Raw
226+getRootNames :: Artifacts -> NE.List ModuleName.Raw
226−getMainNames (Artifacts _ _ mains _) =
227+getRootNames (Artifacts _ _ roots _) =
227− fmap getMainName mains
228+ fmap getRootName roots
228
229
229
230
230−getMainName :: Main -> ModuleName.Raw
231+getRootName :: Root -> ModuleName.Raw
231−getMainName main =
232+getRootName root =
232− case main of
233+ case root of
233 Inside name -> name
234 Inside name -> name
234 Outside name _ _ -> name
235 Outside name _ _ -> name
235
236
@@ -584,11 +585,11 @@ checkMidpoint dmvar statuses =
584 return (Left (Exit.BP_Cycle name names))
585 return (Left (Exit.BP_Cycle name names))
585
586
586
587
587−checkMainsMidpoint :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List MainStatus -> IO (Either Exit.BuildProjectProblem Dependencies)
588+checkMidpointAndRoots :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List RootStatus -> IO (Either Exit.BuildProjectProblem Dependencies)
588−checkMainsMidpoint dmvar statuses smains =
589+checkMidpointAndRoots dmvar statuses sroots =
589 case checkForCycles statuses of
590 case checkForCycles statuses of
590 Nothing ->
591 Nothing ->
591− case checkUniqueMains statuses smains of
592+ case checkUniqueRoots statuses sroots of
592 Nothing ->
593 Nothing ->
593 do maybeForeigns <- readMVar dmvar
594 do maybeForeigns <- readMVar dmvar
594 case maybeForeigns of
595 case maybeForeigns of
@@ -650,14 +651,14 @@ addToGraph name status graph =
650
651
651
652
652
653
653−-- CHECK UNIQUE MAINS
654+-- CHECK UNIQUE ROOTS
654
655
655
656
656−checkUniqueMains :: Map.Map ModuleName.Raw Status -> NE.List MainStatus -> Maybe Exit.BuildProjectProblem
657+checkUniqueRoots :: Map.Map ModuleName.Raw Status -> NE.List RootStatus -> Maybe Exit.BuildProjectProblem
657−checkUniqueMains insides smains =
658+checkUniqueRoots insides sroots =
658 let
659 let
659 outsidesDict =
660 outsidesDict =
660− Map.fromListWith OneOrMore.more (Maybe.mapMaybe mainStatusToNamePathPair (NE.toList smains))
661+ Map.fromListWith OneOrMore.more (Maybe.mapMaybe rootStatusToNamePathPair (NE.toList sroots))
661 in
662 in
662 case Map.traverseWithKey checkOutside outsidesDict of
663 case Map.traverseWithKey checkOutside outsidesDict of
663 Left problem ->
664 Left problem ->
@@ -669,9 +670,9 @@ checkUniqueMains insides smains =
669 Left problem -> Just problem
670 Left problem -> Just problem
670
671
671
672
672−mainStatusToNamePathPair :: MainStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)
673+rootStatusToNamePathPair :: RootStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)
673−mainStatusToNamePathPair smain =
674+rootStatusToNamePathPair sroot =
674− case smain of
675+ case sroot of
675 SInside _ -> Nothing
676 SInside _ -> Nothing
676 SOutsideOk (Details.Local path _ _ _ _ _) _ modul -> Just (Src.getName modul, OneOrMore.one path)
677 SOutsideOk (Details.Local path _ _ _ _ _) _ modul -> Just (Src.getName modul, OneOrMore.one path)
677 SOutsideErr _ -> Nothing
678 SOutsideErr _ -> Nothing
@@ -681,14 +682,14 @@ checkOutside :: ModuleName.Raw -> OneOrMore.OneOrMore FilePath -> Either Exit.Bu
681checkOutside name paths =
682checkOutside name paths =
682 case OneOrMore.destruct NE.List paths of
683 case OneOrMore.destruct NE.List paths of
683 NE.List p [] -> Right p
684 NE.List p [] -> Right p
684− NE.List p1 (p2:_) -> Left (Exit.BP_MainNameDuplicate name p1 p2)
685+ NE.List p1 (p2:_) -> Left (Exit.BP_RootNameDuplicate name p1 p2)
685
686
686
687
687checkInside :: ModuleName.Raw -> FilePath -> Status -> Either Exit.BuildProjectProblem ()
688checkInside :: ModuleName.Raw -> FilePath -> Status -> Either Exit.BuildProjectProblem ()
688checkInside name p1 status =
689checkInside name p1 status =
689 case status of
690 case status of
690− SCached (Details.Local p2 _ _ _ _ _) -> Left (Exit.BP_MainNameDuplicate name p1 p2)
691+ SCached (Details.Local p2 _ _ _ _ _) -> Left (Exit.BP_RootNameDuplicate name p1 p2)
691− SChanged (Details.Local p2 _ _ _ _ _) _ _ _ -> Left (Exit.BP_MainNameDuplicate name p1 p2)
692+ SChanged (Details.Local p2 _ _ _ _ _) _ _ _ -> Left (Exit.BP_RootNameDuplicate name p1 p2)
692 SBadImport _ -> Right ()
693 SBadImport _ -> Right ()
693 SBadSyntax _ _ _ _ -> Right ()
694 SBadSyntax _ _ _ _ -> Right ()
694 SForeign _ -> Right ()
695 SForeign _ -> Right ()
@@ -706,25 +707,30 @@ compile (Env key root projectType _ buildID _ _) docsNeed (Details.Local path ti
706 in
707 in
707 case Compile.compile pkg ifaces modul of
708 case Compile.compile pkg ifaces modul of
708 Right (Compile.Artifacts canonical annotations objects) ->
709 Right (Compile.Artifacts canonical annotations objects) ->
710+ case makeDocs docsNeed canonical of
711+ Left err ->
712+ return $ RProblem $
713+ Error.Module (Src.getName modul) path time source (Error.BadDocs err)
714+
715+ Right docs ->
709− do let name = Src.getName modul
716+ do let name = Src.getName modul
710− let iface = I.fromModule pkg canonical annotations
717+ let iface = I.fromModule pkg canonical annotations
711− let docs = makeDocs docsNeed canonical
712− let elmi = Stuff.elmi root name
718+ let elmi = Stuff.elmi root name
713− File.writeBinary (Stuff.elmo root name) objects
719+ File.writeBinary (Stuff.elmo root name) objects
714− maybeOldi <- File.readBinary elmi
720+ maybeOldi <- File.readBinary elmi
715− case maybeOldi of
721+ case maybeOldi of
716− Just oldi | oldi == iface ->
722+ Just oldi | oldi == iface ->
717− do -- iface should be fully forced by equality check
723+ do -- iface should be fully forced by equality check
718− Reporting.report key Reporting.BDone
724+ Reporting.report key Reporting.BDone
719− let local = Details.Local path time deps main lastChange buildID
725+ let local = Details.Local path time deps main lastChange buildID
720− return (RSame local iface objects docs)
726+ return (RSame local iface objects docs)
721−
727+
722− _ ->
728+ _ ->
723− do -- iface may be lazy still
729+ do -- iface may be lazy still
724− File.writeBinary elmi iface
730+ File.writeBinary elmi iface
725− Reporting.report key Reporting.BDone
731+ Reporting.report key Reporting.BDone
726− let local = Details.Local path time deps main buildID buildID
732+ let local = Details.Local path time deps main buildID buildID
727− return (RNew local iface objects docs)
733+ return (RNew local iface objects docs)
728
734
729 Left err ->
735 Left err ->
730 return $ RProblem $
736 return $ RProblem $
@@ -825,14 +831,14 @@ toDocsNeed goal =
825 KeepDocs -> DocsNeed True
831 KeepDocs -> DocsNeed True
826
832
827
833
828−makeDocs :: DocsNeed -> Can.Module -> Maybe Docs.Module
834+makeDocs :: DocsNeed -> Can.Module -> Either EDocs.Error (Maybe Docs.Module)
829makeDocs (DocsNeed isNeeded) modul =
835makeDocs (DocsNeed isNeeded) modul =
830 if isNeeded then
836 if isNeeded then
831 case Docs.fromModule modul of
837 case Docs.fromModule modul of
832− Right docs -> Just docs
838+ Right docs -> Right (Just docs)
833− Left _ -> Nothing
839+ Left err -> Left err
834 else
840 else
835− Nothing
841+ Right Nothing
836
842
837
843
838finalizeDocs :: DocsGoal docs -> Map.Map ModuleName.Raw Result -> IO docs
844finalizeDocs :: DocsGoal docs -> Map.Map ModuleName.Raw Result -> IO docs
@@ -958,25 +964,25 @@ finalizeReplArtifacts env@(Env _ root projectType _ _ _ _) source modul@(Src.Mod
958
964
959
965
960
966
961−-- FIND MAIN
967+-- FIND ROOT
962
968
963
969
964−data MainLocation
970+data RootLocation
965 = LInside ModuleName.Raw
971 = LInside ModuleName.Raw
966 | LOutside FilePath
972 | LOutside FilePath
967
973
968
974
969−findMains :: Env -> NE.List FilePath -> IO (Either Exit.BuildProjectProblem (NE.List MainLocation))
975+findRoots :: Env -> NE.List FilePath -> IO (Either Exit.BuildProjectProblem (NE.List RootLocation))
970−findMains env paths =
976+findRoots env paths =
971− do mvars <- traverse (fork . findLocation env) paths
977+ do mvars <- traverse (fork . getRootInfo env) paths
972− elocs <- traverse readMVar mvars
978+ einfos <- traverse readMVar mvars
973− return $ checkLocations =<< sequence elocs
979+ return $ checkRoots =<< sequence einfos
974
980
975
981
976−checkLocations :: NE.List Location -> Either Exit.BuildProjectProblem (NE.List MainLocation)
982+checkRoots :: NE.List RootInfo -> Either Exit.BuildProjectProblem (NE.List RootLocation)
977−checkLocations locations =
983+checkRoots infos =
978 let
984 let
979− toOneOrMore loc@(Location absolute _ _) =
985+ toOneOrMore loc@(RootInfo absolute _ _) =
980 (absolute, OneOrMore.one loc)
986 (absolute, OneOrMore.one loc)
981
987
982 fromOneOrMore loc locs =
988 fromOneOrMore loc locs =
@@ -984,33 +990,33 @@ checkLocations locations =
984 [] -> Right ()
990 [] -> Right ()
985 loc2:_ -> Left (Exit.BP_MainPathDuplicate (_relative loc) (_relative loc2))
991 loc2:_ -> Left (Exit.BP_MainPathDuplicate (_relative loc) (_relative loc2))
986 in
992 in
987− fmap (\_ -> fmap _location locations) $
993+ fmap (\_ -> fmap _location infos) $
988 traverse (OneOrMore.destruct fromOneOrMore) $
994 traverse (OneOrMore.destruct fromOneOrMore) $
989− Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList locations)
995+ Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList infos)
990
996
991
997
992
998
993−-- LOCATIONS
999+-- ROOT INFO
994
1000
995
1001
996−data Location =
1002+data RootInfo =
997− Location
1003+ RootInfo
998 { _absolute :: FilePath
1004 { _absolute :: FilePath
999 , _relative :: FilePath
1005 , _relative :: FilePath
1000− , _location :: MainLocation
1006+ , _location :: RootLocation
1001 }
1007 }
1002
1008
1003
1009
1004−findLocation :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem Location)
1010+getRootInfo :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)
1005−findLocation env path =
1011+getRootInfo env path =
1006 do exists <- File.exists path
1012 do exists <- File.exists path
1007 if exists
1013 if exists
1008− then findLoc env path =<< Dir.canonicalizePath path
1014+ then getRootInfoHelp env path =<< Dir.canonicalizePath path
1009 else return (Left (Exit.BP_PathUnknown path))
1015 else return (Left (Exit.BP_PathUnknown path))
1010
1016
1011
1017
1012−findLoc :: Env -> FilePath -> FilePath -> IO (Either Exit.BuildProjectProblem Location)
1018+getRootInfoHelp :: Env -> FilePath -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)
1013−findLoc (Env _ root _ srcDirs _ _ _) path absolutePath =
1019+getRootInfoHelp (Env _ _ _ srcDirs _ _ _) path absolutePath =
1014 let
1020 let
1015 (dirs, file) = FP.splitFileName absolutePath
1021 (dirs, file) = FP.splitFileName absolutePath
1016 (final, ext) = FP.splitExtension file
1022 (final, ext) = FP.splitExtension file
@@ -1024,7 +1030,7 @@ findLoc (Env _ root _ srcDirs _ _ _) path absolutePath =
1024 in
1030 in
1025 case Maybe.mapMaybe (isInsideSrcDirByPath absoluteSegments) srcDirs of
1031 case Maybe.mapMaybe (isInsideSrcDirByPath absoluteSegments) srcDirs of
1026 [] ->
1032 [] ->
1027− return $ Right $ Location absolutePath path (LOutside path)
1033+ return $ Right $ RootInfo absolutePath path (LOutside path)
1028
1034
1029 [(_, Right names)] ->
1035 [(_, Right names)] ->
1030 do let name = Name.fromChars (List.intercalate "." names)
1036 do let name = Name.fromChars (List.intercalate "." names)
@@ -1033,13 +1039,13 @@ findLoc (Env _ root _ srcDirs _ _ _) path absolutePath =
1033 d1:d2:_ ->
1039 d1:d2:_ ->
1034 do let p1 = addRelative d1 (FP.joinPath names <.> "elm")
1040 do let p1 = addRelative d1 (FP.joinPath names <.> "elm")
1035 let p2 = addRelative d2 (FP.joinPath names <.> "elm")
1041 let p2 = addRelative d2 (FP.joinPath names <.> "elm")
1036− return $ Left $ Exit.BP_MainNameDuplicate name p1 p2
1042+ return $ Left $ Exit.BP_RootNameDuplicate name p1 p2
1037
1043
1038 _ ->
1044 _ ->
1039− return $ Right $ Location absolutePath path (LInside name)
1045+ return $ Right $ RootInfo absolutePath path (LInside name)
1040
1046
1041 [(s, Left names)] ->
1047 [(s, Left names)] ->
1042− return $ Left $ Exit.BP_MainNameInvalid path s names
1048+ return $ Left $ Exit.BP_RootNameInvalid path s names
1043
1049
1044 (s1,_):(s2,_):_ ->
1050 (s1,_):(s2,_):_ ->
1045 return $ Left $ Exit.BP_WithAmbiguousSrcDir path s1 s2
1051 return $ Left $ Exit.BP_WithAmbiguousSrcDir path s1 s2
@@ -1088,18 +1094,18 @@ dropPrefix roots paths =
1088
1094
1089
1095
1090
1096
1091−-- CRAWL MAINS
1097+-- CRAWL ROOTS
1092
1098
1093
1099
1094−data MainStatus
1100+data RootStatus
1095 = SInside ModuleName.Raw
1101 = SInside ModuleName.Raw
1096 | SOutsideOk Details.Local B.ByteString Src.Module
1102 | SOutsideOk Details.Local B.ByteString Src.Module
1097 | SOutsideErr Error.Module
1103 | SOutsideErr Error.Module
1098
1104
1099
1105
1100−crawlMain :: Env -> MVar StatusDict -> MainLocation -> IO MainStatus
1106+crawlRoot :: Env -> MVar StatusDict -> RootLocation -> IO RootStatus
1101−crawlMain env@(Env _ _ projectType _ buildID _ _) mvar given =
1107+crawlRoot env@(Env _ _ projectType _ buildID _ _) mvar root =
1102− case given of
1108+ case root of
1103 LInside name ->
1109 LInside name ->
1104 do statusMVar <- newEmptyMVar
1110 do statusMVar <- newEmptyMVar
1105 statusDict <- takeMVar mvar
1111 statusDict <- takeMVar mvar
@@ -1122,19 +1128,19 @@ crawlMain env@(Env _ _ projectType _ buildID _ _) mvar given =
1122
1128
1123
1129
1124
1130
1125−-- CHECK MAINS
1131+-- CHECK ROOTS
1126
1132
1127
1133
1128−data MainResult
1134+data RootResult
1129 = RInside ModuleName.Raw
1135 = RInside ModuleName.Raw
1130 | ROutsideOk ModuleName.Raw I.Interface Opt.LocalGraph
1136 | ROutsideOk ModuleName.Raw I.Interface Opt.LocalGraph
1131 | ROutsideErr Error.Module
1137 | ROutsideErr Error.Module
1132 | ROutsideBlocked
1138 | ROutsideBlocked
1133
1139
1134
1140
1135−checkMain :: Env -> ResultDict -> MainStatus -> IO MainResult
1141+checkRoot :: Env -> ResultDict -> RootStatus -> IO RootResult
1136−checkMain env@(Env _ root _ _ _ _ _) results pendingMain =
1142+checkRoot env@(Env _ root _ _ _ _ _) results rootStatus =
1137− case pendingMain of
1143+ case rootStatus of
1138 SInside name ->
1144 SInside name ->
1139 return (RInside name)
1145 return (RInside name)
1140
1146
@@ -1161,7 +1167,7 @@ checkMain env@(Env _ root _ _ _ _ _) results pendingMain =
1161 Error.BadImports (toImportErrors env results imports problems)
1167 Error.BadImports (toImportErrors env results imports problems)
1162
1168
1163
1169
1164−compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO MainResult
1170+compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO RootResult
1165compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _) source ifaces modul =
1171compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _) source ifaces modul =
1166 let
1172 let
1167 pkg = projectTypeToPkg projectType
1173 pkg = projectTypeToPkg projectType
@@ -1180,35 +1186,35 @@ compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _)
1180-- TO ARTIFACTS
1186-- TO ARTIFACTS
1181
1187
1182
1188
1183−data Main
1189+data Root
1184 = Inside ModuleName.Raw
1190 = Inside ModuleName.Raw
1185 | Outside ModuleName.Raw I.Interface Opt.LocalGraph
1191 | Outside ModuleName.Raw I.Interface Opt.LocalGraph
1186
1192
1187
1193
1188−toArtifacts :: Env -> Dependencies -> Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either Exit.BuildProblem Artifacts
1194+toArtifacts :: Env -> Dependencies -> Map.Map ModuleName.Raw Result -> NE.List RootResult -> Either Exit.BuildProblem Artifacts
1189−toArtifacts (Env _ root projectType _ _ _ _) foreigns results mainResults =
1195+toArtifacts (Env _ root projectType _ _ _ _) foreigns results rootResults =
1190− case gatherProblemsOrMains results mainResults of
1196+ case gatherProblemsOrMains results rootResults of
1191 Left (NE.List e es) ->
1197 Left (NE.List e es) ->
1192 Left (Exit.BuildBadModules root e es)
1198 Left (Exit.BuildBadModules root e es)
1193
1199
1194− Right mains ->
1200+ Right roots ->
1195− Right $ Artifacts (projectTypeToPkg projectType) foreigns mains $
1201+ Right $ Artifacts (projectTypeToPkg projectType) foreigns roots $
1196− Map.foldrWithKey addInside (foldr addOutside [] mainResults) results
1202+ Map.foldrWithKey addInside (foldr addOutside [] rootResults) results
1197
1203
1198
1204
1199−gatherProblemsOrMains :: Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either (NE.List Error.Module) (NE.List Main)
1205+gatherProblemsOrMains :: Map.Map ModuleName.Raw Result -> NE.List RootResult -> Either (NE.List Error.Module) (NE.List Root)
1200−gatherProblemsOrMains results (NE.List mainResult mainResults) =
1206+gatherProblemsOrMains results (NE.List rootResult rootResults) =
1201 let
1207 let
1202− sortMain result (es, mains) =
1208+ addResult result (es, roots) =
1203 case result of
1209 case result of
1204− RInside n -> ( es, Inside n : mains)
1210+ RInside n -> ( es, Inside n : roots)
1205− ROutsideOk n i o -> ( es, Outside n i o : mains)
1211+ ROutsideOk n i o -> ( es, Outside n i o : roots)
1206− ROutsideErr e -> (e:es, mains)
1212+ ROutsideErr e -> (e:es, roots)
1207− ROutsideBlocked -> ( es, mains)
1213+ ROutsideBlocked -> ( es, roots)
1208
1214
1209 errors = Map.foldr addErrors [] results
1215 errors = Map.foldr addErrors [] results
1210 in
1216 in
1211− case (mainResult, foldr sortMain (errors, []) mainResults) of
1217+ case (rootResult, foldr addResult (errors, []) rootResults) of
1212 (RInside n , ( [], ms)) -> Right (NE.List (Inside n) ms)
1218 (RInside n , ( [], ms)) -> Right (NE.List (Inside n) ms)
1213 (RInside _ , (e:es, _ )) -> Left (NE.List e es)
1219 (RInside _ , (e:es, _ )) -> Left (NE.List e es)
1214 (ROutsideOk n i o, ( [], ms)) -> Right (NE.List (Outside n i o) ms)
1220 (ROutsideOk n i o, ( [], ms)) -> Right (NE.List (Outside n i o) ms)
@@ -1236,9 +1242,9 @@ badInside name =
1236 "Error from `" ++ Name.toChars name ++ "` should have been reported already."
1242 "Error from `" ++ Name.toChars name ++ "` should have been reported already."
1237
1243
1238
1244
1239−addOutside :: MainResult -> [Module] -> [Module]
1245+addOutside :: RootResult -> [Module] -> [Module]
1240−addOutside main modules =
1246+addOutside root modules =
1241− case main of
1247+ case root of
1242 RInside _ -> modules
1248 RInside _ -> modules
1243 ROutsideOk name iface objs -> Fresh name iface objs : modules
1249 ROutsideOk name iface objs -> Fresh name iface objs : modules
1244 ROutsideErr _ -> modules
1250 ROutsideErr _ -> modules
builder/src/Generate.hs+6−6
@@ -99,18 +99,18 @@ checkForDebugUses (Objects _ locals) =
99-- GATHER MAINS
99-- GATHER MAINS
100
100
101
101
102−gatherMains :: Pkg.Name -> Objects -> NE.List Build.Main -> Map.Map ModuleName.Canonical Opt.Main
102+gatherMains :: Pkg.Name -> Objects -> NE.List Build.Root -> Map.Map ModuleName.Canonical Opt.Main
103−gatherMains pkg (Objects _ locals) buildMains =
103+gatherMains pkg (Objects _ locals) roots =
104− Map.fromList $ Maybe.mapMaybe (lookupMain pkg locals) (NE.toList buildMains)
104+ Map.fromList $ Maybe.mapMaybe (lookupMain pkg locals) (NE.toList roots)
105
105
106
106
107−lookupMain :: Pkg.Name -> Map.Map ModuleName.Raw Opt.LocalGraph -> Build.Main -> Maybe (ModuleName.Canonical, Opt.Main)
107+lookupMain :: Pkg.Name -> Map.Map ModuleName.Raw Opt.LocalGraph -> Build.Root -> Maybe (ModuleName.Canonical, Opt.Main)
108−lookupMain pkg locals buildMain =
108+lookupMain pkg locals root =
109 let
109 let
110 toPair name (Opt.LocalGraph maybeMain _ _) =
110 toPair name (Opt.LocalGraph maybeMain _ _) =
111 (,) (ModuleName.Canonical pkg name) <$> maybeMain
111 (,) (ModuleName.Canonical pkg name) <$> maybeMain
112 in
112 in
113− case buildMain of
113+ case root of
114 Build.Inside name -> toPair name =<< Map.lookup name locals
114 Build.Inside name -> toPair name =<< Map.lookup name locals
115 Build.Outside name _ g -> toPair name g
115 Build.Outside name _ g -> toPair name g
116
116
builder/src/Http.hs+1−1
@@ -241,4 +241,4 @@ jsonPart name filePath value =
241
241
242stringPart :: String -> String -> Multi.Part
242stringPart :: String -> String -> Multi.Part
243stringPart name string =
243stringPart name string =
244− Multi.partBS (String.fromString name) (BS.pack string)
244+ Multi.partBS (String.fromString name) (BS.pack string)
builder/src/Reporting/Exit.hs+10−49
@@ -8,7 +8,6 @@ module Reporting.Exit
8 , Publish(..), publishToReport
8 , Publish(..), publishToReport
9 , Install(..), installToReport
9 , Install(..), installToReport
10 , Reactor(..), reactorToReport
10 , Reactor(..), reactorToReport
11− , Worker(..), workerToReport
12 , newPackageOverview
11 , newPackageOverview
13 --
12 --
14 , Solver(..)
13 , Solver(..)
@@ -1283,8 +1282,7 @@ toDetailsReport details =
1283 "The dependencies in your elm.json are not compatible."
1282 "The dependencies in your elm.json are not compatible."
1284 [ D.fillSep
1283 [ D.fillSep
1285 ["Did","you","change","them","by","hand?","Try","to","change","it","back!"
1284 ["Did","you","change","them","by","hand?","Try","to","change","it","back!"
1286− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1285+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1287− ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1288 ]
1286 ]
1289 , D.reflow $
1287 , D.reflow $
1290 "Please ask for help on the community forums if you try those paths and are still\
1288 "Please ask for help on the community forums if you try those paths and are still\
@@ -1301,8 +1299,7 @@ toDetailsReport details =
1301 \ get access to the registry!"
1299 \ get access to the registry!"
1302 , D.toFancyNote
1300 , D.toFancyNote
1303 ["If","you","changed","your","dependencies","by","hand,","try","to","change","them","back!"
1301 ["If","you","changed","your","dependencies","by","hand,","try","to","change","them","back!"
1304− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1302+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1305− ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1306 ]
1303 ]
1307 ]
1304 ]
1308
1305
@@ -1338,8 +1335,7 @@ toDetailsReport details =
1338 \ party tool) leaving them in an invalid state."
1335 \ party tool) leaving them in an invalid state."
1339 [ D.fillSep
1336 [ D.fillSep
1340 ["Try","to","change","them","back","to","what","they","were","before!"
1337 ["Try","to","change","them","back","to","what","they","were","before!"
1341− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1338+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1342− ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1343 ]
1339 ]
1344 , D.reflow $
1340 , D.reflow $
1345 "Please ask for help on the community forums if you try those paths and are still\
1341 "Please ask for help on the community forums if you try those paths and are still\
@@ -1526,7 +1522,7 @@ toHttpErrorReport title err context =
1526
1522
1527 Http.BadHttp url httpExceptionContent ->
1523 Http.BadHttp url httpExceptionContent ->
1528 case httpExceptionContent of
1524 case httpExceptionContent of
1529− HTTP.StatusCodeException response _ ->
1525+ HTTP.StatusCodeException response body ->
1530 let
1526 let
1531 (HTTP.Status code message) = HTTP.responseStatus response
1527 (HTTP.Status code message) = HTTP.responseStatus response
1532 in
1528 in
@@ -1534,6 +1530,7 @@ toHttpErrorReport title err context =
1534 [ D.fillSep $
1530 [ D.fillSep $
1535 ["But","it","came","back","as",D.red (D.fromInt code)]
1531 ["But","it","came","back","as",D.red (D.fromInt code)]
1536 ++ map D.fromChars (words (BS_UTF8.toString message))
1532 ++ map D.fromChars (words (BS_UTF8.toString message))
1533+ , D.indent 4 $ D.reflow $ BS_UTF8.toString body
1537 , D.reflow $
1534 , D.reflow $
1538 "This may mean some online endpoint changed in an unexpected way, so if does not\
1535 "This may mean some online endpoint changed in an unexpected way, so if does not\
1539 \ seem like something on your side is causing this (e.g. firewall) please report\
1536 \ seem like something on your side is causing this (e.g. firewall) please report\
@@ -1768,8 +1765,8 @@ data BuildProjectProblem
1768 | BP_WithBadExtension FilePath
1765 | BP_WithBadExtension FilePath
1769 | BP_WithAmbiguousSrcDir FilePath FilePath FilePath
1766 | BP_WithAmbiguousSrcDir FilePath FilePath FilePath
1770 | BP_MainPathDuplicate FilePath FilePath
1767 | BP_MainPathDuplicate FilePath FilePath
1771− | BP_MainNameDuplicate ModuleName.Raw FilePath FilePath
1768+ | BP_RootNameDuplicate ModuleName.Raw FilePath FilePath
1772− | BP_MainNameInvalid FilePath FilePath [String]
1769+ | BP_RootNameInvalid FilePath FilePath [String]
1773 | BP_CannotLoadDependencies
1770 | BP_CannotLoadDependencies
1774 | BP_Cycle ModuleName.Raw [ModuleName.Raw]
1771 | BP_Cycle ModuleName.Raw [ModuleName.Raw]
1775 | BP_MissingExposed (NE.List (ModuleName.Raw, Import.Problem))
1772 | BP_MissingExposed (NE.List (ModuleName.Raw, Import.Problem))
@@ -1836,7 +1833,7 @@ toProjectProblemReport projectProblem =
1836 \ unstuck!"
1833 \ unstuck!"
1837 ]
1834 ]
1838
1835
1839− BP_MainNameDuplicate name outsidePath otherPath ->
1836+ BP_RootNameDuplicate name outsidePath otherPath ->
1840 Help.report "MODULE NAME CLASH" Nothing
1837 Help.report "MODULE NAME CLASH" Nothing
1841 "These two files are causing a module name clash:"
1838 "These two files are causing a module name clash:"
1842 [ D.indent 4 $ D.red $ D.vcat $ map D.fromChars [ outsidePath, otherPath ]
1839 [ D.indent 4 $ D.red $ D.vcat $ map D.fromChars [ outsidePath, otherPath ]
@@ -1847,7 +1844,7 @@ toProjectProblemReport projectProblem =
1847 "Try changing to a different module name in one of them!"
1844 "Try changing to a different module name in one of them!"
1848 ]
1845 ]
1849
1846
1850− BP_MainNameInvalid givenPath srcDir _ ->
1847+ BP_RootNameInvalid givenPath srcDir _ ->
1851 Help.report "UNEXPECTED FILE NAME" Nothing
1848 Help.report "UNEXPECTED FILE NAME" Nothing
1852 "I am having trouble with this file name:"
1849 "I am having trouble with this file name:"
1853 [ D.indent 4 $ D.red $ D.fromChars givenPath
1850 [ D.indent 4 $ D.red $ D.fromChars givenPath
@@ -1971,7 +1968,7 @@ toGenerateReport problem =
1971 "The issue is that --optimize strips out info needed by `Debug` functions.\
1968 "The issue is that --optimize strips out info needed by `Debug` functions.\
1972 \ Here are two examples:"
1969 \ Here are two examples:"
1973 , D.indent 4 $ D.reflow $
1970 , D.indent 4 $ D.reflow $
1974− "(1) It shortens record field names. This makes the generated JavaScript is\
1971+ "(1) It shortens record field names. This makes the generated JavaScript\
1975 \ smaller, but `Debug.toString` cannot know the real field names anymore."
1972 \ smaller, but `Debug.toString` cannot know the real field names anymore."
1976 , D.indent 4 $ D.reflow $
1973 , D.indent 4 $ D.reflow $
1977 "(2) Values like `type Height = Height Float` are unboxed. This reduces\
1974 "(2) Values like `type Height = Height Float` are unboxed. This reduces\
@@ -2070,39 +2067,3 @@ replToReport problem =
2070
2067
2071 ReplBlocked ->
2068 ReplBlocked ->
2072 corruptCacheReport
2069 corruptCacheReport
2073−
2074−
2075−
2076−-- WORKER
2077−
2078−
2079−data Worker
2080− = WorkerInputError Error.Module
2081− | WorkerNoMain
2082−
2083−
2084−workerToReport :: Worker -> Help.Report
2085−workerToReport problem =
2086− case problem of
2087− WorkerInputError err ->
2088− Help.compilerReport "/" err []
2089−
2090− WorkerNoMain ->
2091− Help.report "NO MAIN" Nothing
2092− (
2093− "Without a `main` value, I do not know what to show on screen!"
2094− )
2095− [ D.reflow $
2096− "Adding a `main` value can be as brief as:"
2097− , D.vcat
2098− [ D.fillSep [D.cyan "import","Html"]
2099− , ""
2100− , D.fillSep [D.green "main","="]
2101− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
2102− ]
2103− , D.reflow $
2104− "Try adding something like that!"
2105− , D.toSimpleNote $
2106− "I recommend looking through https://guide.elm-lang.org for more advice on\
2107− \ how to fill in `main` values."
2108− ]
builder/src/Stuff.hs+1−1
@@ -62,7 +62,7 @@ prepublishDir root =
62
62
63compilerVersion :: FilePath
63compilerVersion :: FilePath
64compilerVersion =
64compilerVersion =
65− V.toChars V.compiler ++ "-beta-1"
65+ V.toChars V.compiler
66
66
67
67
68
68
compiler/src/AST/Source.hs+5−5
@@ -195,15 +195,15 @@ newtype Comment =
195
195
196data Exposing
196data Exposing
197 = Open
197 = Open
198− | Explicit [A.Located Exposed]
198+ | Explicit [Exposed]
199
199
200
200
201data Exposed
201data Exposed
202− = Lower Name
202+ = Lower (A.Located Name)
203− | Upper Name Privacy
203+ | Upper (A.Located Name) Privacy
204− | Operator Name
204+ | Operator A.Region Name
205
205
206
206
207data Privacy
207data Privacy
208− = Public
208+ = Public A.Region
209 | Private
209 | Private
compiler/src/AST/Utils/Type.hs−1
@@ -1,5 +1,4 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2−{-# LANGUAGE OverloadedStrings #-}
3module AST.Utils.Type
2module AST.Utils.Type
4 ( delambda
3 ( delambda
5 , dealias
4 , dealias
compiler/src/Canonicalize/Environment.hs+50−20
@@ -4,6 +4,8 @@ module Canonicalize.Environment
4 ( Env(..)
4 ( Env(..)
5 , Exposed
5 , Exposed
6 , Qualified
6 , Qualified
7+ , Info(..)
8+ , mergeInfo
7 , Var(..)
9 , Var(..)
8 , Type(..)
10 , Type(..)
9 , Ctor(..)
11 , Ctor(..)
@@ -20,8 +22,8 @@ module Canonicalize.Environment
20
22
21import qualified Data.Map.Merge.Strict as Map
23import qualified Data.Map.Merge.Strict as Map
22import qualified Data.Map.Strict as Map
24import qualified Data.Map.Strict as Map
23−import qualified Data.Map.Strict.Internal as I
24import qualified Data.Name as Name
25import qualified Data.Name as Name
26+import qualified Data.OneOrMore as OneOrMore
25
27
26import qualified AST.Utils.Binop as Binop
28import qualified AST.Utils.Binop as Binop
27import qualified AST.Canonical as Can
29import qualified AST.Canonical as Can
@@ -58,11 +60,34 @@ data Env =
58
60
59
61
60type Exposed a =
62type Exposed a =
61− Map.Map Name.Name (Map.Map ModuleName.Canonical a)
63+ Map.Map Name.Name (Info a)
62
64
63
65
64type Qualified a =
66type Qualified a =
65− Map.Map Name.Name (Map.Map Name.Name (Map.Map ModuleName.Canonical a))
67+ Map.Map Name.Name (Map.Map Name.Name (Info a))
68+
69+
70+
71+-- INFO
72+
73+
74+data Info a
75+ = Specific ModuleName.Canonical a
76+ | Ambiguous ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
77+
78+
79+mergeInfo :: Info a -> Info a -> Info a
80+mergeInfo info1 info2 =
81+ case info1 of
82+ Specific h1 _ ->
83+ case info2 of
84+ Specific h2 _ -> if h1 == h2 then info1 else Ambiguous h1 (OneOrMore.one h2)
85+ Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more (OneOrMore.one h2) hs2)
86+
87+ Ambiguous h1 hs1 ->
88+ case info2 of
89+ Specific h2 _ -> Ambiguous h1 (OneOrMore.more hs1 (OneOrMore.one h2))
90+ Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more hs1 (OneOrMore.more (OneOrMore.one h2) hs2))
66
91
67
92
68
93
@@ -72,7 +97,8 @@ type Qualified a =
72data Var
97data Var
73 = Local A.Region
98 = Local A.Region
74 | TopLevel A.Region
99 | TopLevel A.Region
75− | Foreign (Map.Map ModuleName.Canonical Can.Annotation)
100+ | Foreign ModuleName.Canonical Can.Annotation
101+ | Foreigns ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
76
102
77
103
78
104
@@ -139,7 +165,10 @@ addLocalLeft _ region =
139addLocalBoth :: Name.Name -> A.Region -> Var -> Result i w Var
165addLocalBoth :: Name.Name -> A.Region -> Var -> Result i w Var
140addLocalBoth name region var =
166addLocalBoth name region var =
141 case var of
167 case var of
142− Foreign _ ->
168+ Foreign _ _ ->
169+ Result.ok (Local region)
170+
171+ Foreigns _ _ ->
143 Result.ok (Local region)
172 Result.ok (Local region)
144
173
145 Local parentRegion ->
174 Local parentRegion ->
@@ -150,17 +179,18 @@ addLocalBoth name region var =
150
179
151
180
152
181
182+
153-- FIND TYPE
183-- FIND TYPE
154
184
155
185
156findType :: A.Region -> Env -> Name.Name -> Result i w Type
186findType :: A.Region -> Env -> Name.Name -> Result i w Type
157findType region (Env _ _ ts _ _ _ qts _) name =
187findType region (Env _ _ ts _ _ _ qts _) name =
158 case Map.lookup name ts of
188 case Map.lookup name ts of
159− Just (I.Bin 1 _ tipe _ _) ->
189+ Just (Specific _ tipe) ->
160 Result.ok tipe
190 Result.ok tipe
161
191
162− Just homes ->
192+ Just (Ambiguous h hs) ->
163− Result.throw (Error.AmbiguousType region Nothing name (Map.keys homes))
193+ Result.throw (Error.AmbiguousType region Nothing name h hs)
164
194
165 Nothing ->
195 Nothing ->
166 Result.throw (Error.NotFoundType region Nothing name (toPossibleNames ts qts))
196 Result.throw (Error.NotFoundType region Nothing name (toPossibleNames ts qts))
@@ -171,11 +201,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =
171 case Map.lookup prefix qts of
201 case Map.lookup prefix qts of
172 Just qualified ->
202 Just qualified ->
173 case Map.lookup name qualified of
203 case Map.lookup name qualified of
174− Just (I.Bin 1 _ tipe _ _) ->
204+ Just (Specific _ tipe) ->
175 Result.ok tipe
205 Result.ok tipe
176
206
177− Just homes ->
207+ Just (Ambiguous h hs) ->
178− Result.throw (Error.AmbiguousType region (Just prefix) name (Map.keys homes))
208+ Result.throw (Error.AmbiguousType region (Just prefix) name h hs)
179
209
180 Nothing ->
210 Nothing ->
181 Result.throw (Error.NotFoundType region (Just prefix) name (toPossibleNames ts qts))
211 Result.throw (Error.NotFoundType region (Just prefix) name (toPossibleNames ts qts))
@@ -191,11 +221,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =
191findCtor :: A.Region -> Env -> Name.Name -> Result i w Ctor
221findCtor :: A.Region -> Env -> Name.Name -> Result i w Ctor
192findCtor region (Env _ _ _ cs _ _ _ qcs) name =
222findCtor region (Env _ _ _ cs _ _ _ qcs) name =
193 case Map.lookup name cs of
223 case Map.lookup name cs of
194− Just (I.Bin 1 _ ctor _ _) ->
224+ Just (Specific _ ctor) ->
195 Result.ok ctor
225 Result.ok ctor
196
226
197− Just homes ->
227+ Just (Ambiguous h hs) ->
198− Result.throw (Error.AmbiguousVariant region Nothing name (Map.keys homes))
228+ Result.throw (Error.AmbiguousVariant region Nothing name h hs)
199
229
200 Nothing ->
230 Nothing ->
201 Result.throw (Error.NotFoundVariant region Nothing name (toPossibleNames cs qcs))
231 Result.throw (Error.NotFoundVariant region Nothing name (toPossibleNames cs qcs))
@@ -206,11 +236,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =
206 case Map.lookup prefix qcs of
236 case Map.lookup prefix qcs of
207 Just qualified ->
237 Just qualified ->
208 case Map.lookup name qualified of
238 case Map.lookup name qualified of
209− Just (I.Bin 1 _ pattern _ _) ->
239+ Just (Specific _ pattern) ->
210 Result.ok pattern
240 Result.ok pattern
211
241
212− Just homes ->
242+ Just (Ambiguous h hs) ->
213− Result.throw (Error.AmbiguousVariant region (Just prefix) name (Map.keys homes))
243+ Result.throw (Error.AmbiguousVariant region (Just prefix) name h hs)
214
244
215 Nothing ->
245 Nothing ->
216 Result.throw (Error.NotFoundVariant region (Just prefix) name (toPossibleNames cs qcs))
246 Result.throw (Error.NotFoundVariant region (Just prefix) name (toPossibleNames cs qcs))
@@ -226,11 +256,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =
226findBinop :: A.Region -> Env -> Name.Name -> Result i w Binop
256findBinop :: A.Region -> Env -> Name.Name -> Result i w Binop
227findBinop region (Env _ _ _ _ binops _ _ _) name =
257findBinop region (Env _ _ _ _ binops _ _ _) name =
228 case Map.lookup name binops of
258 case Map.lookup name binops of
229− Just (I.Bin 1 _ binop _ _) ->
259+ Just (Specific _ binop) ->
230 Result.ok binop
260 Result.ok binop
231
261
232− Just homes ->
262+ Just (Ambiguous h hs) ->
233− Result.throw (Error.AmbiguousBinop region name (Map.keys homes))
263+ Result.throw (Error.AmbiguousBinop region name h hs)
234
264
235 Nothing ->
265 Nothing ->
236 Result.throw (Error.NotFoundBinop region name (Map.keysSet binops))
266 Result.throw (Error.NotFoundBinop region name (Map.keysSet binops))
compiler/src/Canonicalize/Environment/Dups.hs+1−1
@@ -105,7 +105,7 @@ one name region value =
105
105
106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a
106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a
107insert name region value dict =
107insert name region value dict =
108− Map.insertWith OneOrMore.more name (OneOrMore.one (Info region value)) dict
108+ Map.insertWith (\new old -> OneOrMore.more old new) name (OneOrMore.one (Info region value)) dict
109
109
110
110
111union :: Dict a -> Dict a -> Dict a
111union :: Dict a -> Dict a -> Dict a
compiler/src/Canonicalize/Environment/Foreign.hs+49−37
@@ -35,7 +35,14 @@ type Result i w a =
35createInitialEnv :: ModuleName.Canonical -> Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Result i w Env.Env
35createInitialEnv :: ModuleName.Canonical -> Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Result i w Env.Env
36createInitialEnv home ifaces imports =
36createInitialEnv home ifaces imports =
37 do (State vs ts cs bs qvs qts qcs) <- foldM (addImport ifaces) emptyState (toSafeImports home imports)
37 do (State vs ts cs bs qvs qts qcs) <- foldM (addImport ifaces) emptyState (toSafeImports home imports)
38− Result.ok (Env.Env home (Map.map Env.Foreign vs) ts cs bs qvs qts qcs)
38+ Result.ok (Env.Env home (Map.map infoToVar vs) ts cs bs qvs qts qcs)
39+
40+
41+infoToVar :: Env.Info Can.Annotation -> Env.Var
42+infoToVar info =
43+ case info of
44+ Env.Specific home tipe -> Env.Foreign home tipe
45+ Env.Ambiguous h hs -> Env.Foreigns h hs
39
46
40
47
41
48
@@ -61,7 +68,7 @@ emptyState =
61
68
62emptyTypes :: Env.Exposed Env.Type
69emptyTypes :: Env.Exposed Env.Type
63emptyTypes =
70emptyTypes =
64− Map.singleton "List" (Map.singleton ModuleName.list (Env.Union 1 ModuleName.list))
71+ Map.singleton "List" (Env.Specific ModuleName.list (Env.Union 1 ModuleName.list))
65
72
66
73
67
74
@@ -102,8 +109,8 @@ addImport ifaces (State vs ts cs bs qvs qts qcs) (Src.Import (A.At _ name) maybe
102 (Map.mapMaybeWithKey (unionToType home) unions)
109 (Map.mapMaybeWithKey (unionToType home) unions)
103 (Map.mapMaybeWithKey (aliasToType home) aliases)
110 (Map.mapMaybeWithKey (aliasToType home) aliases)
104
111
105− !vars = Map.map (Map.singleton home) defs
112+ !vars = Map.map (Env.Specific home) defs
106− !types = Map.map (Map.singleton home . fst) rawTypeInfo
113+ !types = Map.map (Env.Specific home . fst) rawTypeInfo
107 !ctors = Map.foldr (addExposed . snd) Map.empty rawTypeInfo
114 !ctors = Map.foldr (addExposed . snd) Map.empty rawTypeInfo
108
115
109 !qvs2 = addQualified prefix vars qvs
116 !qvs2 = addQualified prefix vars qvs
@@ -129,7 +136,7 @@ addImport ifaces (State vs ts cs bs qvs qts qcs) (Src.Import (A.At _ name) maybe
129
136
130addExposed :: Env.Exposed a -> Env.Exposed a -> Env.Exposed a
137addExposed :: Env.Exposed a -> Env.Exposed a -> Env.Exposed a
131addExposed =
138addExposed =
132− Map.unionWith Map.union
139+ Map.unionWith Env.mergeInfo
133
140
134
141
135addQualified :: Name.Name -> Env.Exposed a -> Env.Qualified a -> Env.Qualified a
142addQualified :: Name.Name -> Env.Exposed a -> Env.Qualified a -> Env.Qualified a
@@ -150,7 +157,7 @@ unionToTypeHelp :: ModuleName.Canonical -> Name.Name -> Can.Union -> (Env.Type,
150unionToTypeHelp home name union@(Can.Union vars ctors _ _) =
157unionToTypeHelp home name union@(Can.Union vars ctors _ _) =
151 let
158 let
152 addCtor dict (Can.Ctor ctor index _ args) =
159 addCtor dict (Can.Ctor ctor index _ args) =
153− Map.insert ctor (Map.singleton home (Env.Ctor home name union index args)) dict
160+ Map.insert ctor (Env.Specific home (Env.Ctor home name union index args)) dict
154 in
161 in
155 ( Env.Union (length vars) home
162 ( Env.Union (length vars) home
156 , List.foldl' addCtor Map.empty ctors
163 , List.foldl' addCtor Map.empty ctors
@@ -181,7 +188,7 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =
181 (Can.TAlias home name avars (Can.Filled tipe))
188 (Can.TAlias home name avars (Can.Filled tipe))
182 (Can.fieldsToList fields)
189 (Can.fieldsToList fields)
183 in
190 in
184− Map.singleton name (Map.singleton home (Env.RecordCtor home vars alias))
191+ Map.singleton name (Env.Specific home (Env.RecordCtor home vars alias))
185
192
186 _ ->
193 _ ->
187 Map.empty
194 Map.empty
@@ -192,9 +199,9 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =
192-- BINOP
199-- BINOP
193
200
194
201
195−binopToBinop :: ModuleName.Canonical -> Name.Name -> I.Binop -> Map.Map ModuleName.Canonical Env.Binop
202+binopToBinop :: ModuleName.Canonical -> Name.Name -> I.Binop -> Env.Info Env.Binop
196binopToBinop home op (I.Binop name annotation associativity precedence) =
203binopToBinop home op (I.Binop name annotation associativity precedence) =
197− Map.singleton home (Env.Binop op home name annotation associativity precedence)
204+ Env.Specific home (Env.Binop op home name annotation associativity precedence)
198
205
199
206
200
207
@@ -207,19 +214,19 @@ addExposedValue
207 -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor)
214 -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor)
208 -> Map.Map Name.Name I.Binop
215 -> Map.Map Name.Name I.Binop
209 -> State
216 -> State
210− -> A.Located Src.Exposed
217+ -> Src.Exposed
211 -> Result i w State
218 -> Result i w State
212−addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) (A.At region exposed) =
219+addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =
213 case exposed of
220 case exposed of
214− Src.Lower name ->
221+ Src.Lower (A.At region name) ->
215 case Map.lookup name vars of
222 case Map.lookup name vars of
216 Just info ->
223 Just info ->
217− Result.ok (State (Map.insertWith Map.union name info vs) ts cs bs qvs qts qcs)
224+ Result.ok (State (Map.insertWith Env.mergeInfo name info vs) ts cs bs qvs qts qcs)
218
225
219 Nothing ->
226 Nothing ->
220 Result.throw (Error.ImportExposingNotFound region home name (Map.keys vars))
227 Result.throw (Error.ImportExposingNotFound region home name (Map.keys vars))
221
228
222− Src.Upper name privacy ->
229+ Src.Upper (A.At region name) privacy ->
223 case privacy of
230 case privacy of
224 Src.Private ->
231 Src.Private ->
225 case Map.lookup name types of
232 case Map.lookup name types of
@@ -227,43 +234,43 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) (A.At reg
227 case tipe of
234 case tipe of
228 Env.Union _ _ ->
235 Env.Union _ _ ->
229 let
236 let
230− !ts2 = Map.insert name (Map.singleton home tipe) ts
237+ !ts2 = Map.insert name (Env.Specific home tipe) ts
231 in
238 in
232 Result.ok (State vs ts2 cs bs qvs qts qcs)
239 Result.ok (State vs ts2 cs bs qvs qts qcs)
233
240
234 Env.Alias _ _ _ _ ->
241 Env.Alias _ _ _ _ ->
235 let
242 let
236− !ts2 = Map.insert name (Map.singleton home tipe) ts
243+ !ts2 = Map.insert name (Env.Specific home tipe) ts
237 !cs2 = addExposed cs ctors
244 !cs2 = addExposed cs ctors
238 in
245 in
239 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
246 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
240
247
241 Nothing ->
248 Nothing ->
242− case Map.lookup name (toCtors types) of
249+ case checkForCtorMistake name types of
243− Just tipe ->
250+ tipe:_ ->
244 Result.throw $ Error.ImportCtorByName region name tipe
251 Result.throw $ Error.ImportCtorByName region name tipe
245
252
246− Nothing ->
253+ [] ->
247 Result.throw $ Error.ImportExposingNotFound region home name (Map.keys types)
254 Result.throw $ Error.ImportExposingNotFound region home name (Map.keys types)
248
255
249− Src.Public ->
256+ Src.Public dotDotRegion ->
250 case Map.lookup name types of
257 case Map.lookup name types of
251 Just (tipe, ctors) ->
258 Just (tipe, ctors) ->
252 case tipe of
259 case tipe of
253 Env.Union _ _ ->
260 Env.Union _ _ ->
254 let
261 let
255− !ts2 = Map.insert name (Map.singleton home tipe) ts
262+ !ts2 = Map.insert name (Env.Specific home tipe) ts
256 !cs2 = addExposed cs ctors
263 !cs2 = addExposed cs ctors
257 in
264 in
258 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
265 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
259
266
260 Env.Alias _ _ _ _ ->
267 Env.Alias _ _ _ _ ->
261− Result.throw (Error.ImportOpenAlias region name)
268+ Result.throw (Error.ImportOpenAlias dotDotRegion name)
262
269
263 Nothing ->
270 Nothing ->
264 Result.throw (Error.ImportExposingNotFound region home name (Map.keys types))
271 Result.throw (Error.ImportExposingNotFound region home name (Map.keys types))
265
272
266− Src.Operator op ->
273+ Src.Operator region op ->
267 case Map.lookup op binops of
274 case Map.lookup op binops of
268 Just binop ->
275 Just binop ->
269 let
276 let
@@ -275,18 +282,23 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) (A.At reg
275 Result.throw (Error.ImportExposingNotFound region home op (Map.keys binops))
282 Result.throw (Error.ImportExposingNotFound region home op (Map.keys binops))
276
283
277
284
278−
279−toCtors :: Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> Map.Map Name.Name Name.Name
285+checkForCtorMistake :: Name.Name -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> [Name.Name]
280−toCtors types =
286+checkForCtorMistake givenName types =
281− Map.foldr addCtors Map.empty types
287+ Map.foldr addMatches [] types
282 where
288 where
283− addCtors (_, exposedCtors) dict =
289+ addMatches (_, exposedCtors) matches =
284− Map.foldrWithKey addCtor dict exposedCtors
290+ Map.foldrWithKey addMatch matches exposedCtors
285−
291+
286− addCtor ctorName homes dict =
292+ addMatch ctorName info matches =
293+ if ctorName /= givenName
294+ then matches
295+ else
287− case Map.elems homes of
296+ case info of
288− [Env.Ctor _ tipeName _ _ _] ->
297+ Env.Specific _ (Env.Ctor _ tipeName _ _ _) ->
289− Map.insert ctorName tipeName dict
298+ tipeName : matches
290−
299+
291− _ ->
300+ Env.Specific _ (Env.RecordCtor _ _ _) ->
292− dict
301+ matches
302+
303+ Env.Ambiguous _ _ ->
304+ matches
compiler/src/Canonicalize/Environment/Local.hs+5−5
@@ -110,7 +110,7 @@ addTypes (Src.Module _ _ _ _ _ unions aliases _ _) (Env.Env home vs ts cs bs qvs
110addUnion :: ModuleName.Canonical -> Env.Exposed Env.Type -> A.Located Src.Union -> Result i w (Env.Exposed Env.Type)
110addUnion :: ModuleName.Canonical -> Env.Exposed Env.Type -> A.Located Src.Union -> Result i w (Env.Exposed Env.Type)
111addUnion home types union@(A.At _ (Src.Union (A.At _ name) _ _)) =
111addUnion home types union@(A.At _ (Src.Union (A.At _ name) _ _)) =
112 do arity <- checkUnionFreeVars union
112 do arity <- checkUnionFreeVars union
113− let one = Map.singleton home (Env.Union arity home)
113+ let one = Env.Specific home (Env.Union arity home)
114 Result.ok $ Map.insert name one types
114 Result.ok $ Map.insert name one types
115
115
116
116
@@ -133,7 +133,7 @@ addAlias env@(Env.Env home vs ts cs bs qvs qts qcs) scc =
133 Graph.AcyclicSCC alias@(A.At _ (Src.Alias (A.At _ name) _ tipe)) ->
133 Graph.AcyclicSCC alias@(A.At _ (Src.Alias (A.At _ name) _ tipe)) ->
134 do args <- checkAliasFreeVars alias
134 do args <- checkAliasFreeVars alias
135 ctype <- Type.canonicalize env tipe
135 ctype <- Type.canonicalize env tipe
136− let one = Map.singleton home (Env.Alias (length args) home args ctype)
136+ let one = Env.Specific home (Env.Alias (length args) home args ctype)
137 let ts1 = Map.insert name one ts
137 let ts1 = Map.insert name one ts
138 Result.ok $ Env.Env home vs ts1 cs bs qvs qts qcs
138 Result.ok $ Env.Env home vs ts1 cs bs qvs qts qcs
139
139
@@ -281,7 +281,7 @@ addCtors (Src.Module _ _ _ _ _ unions aliases _ _) env@(Env.Env home vs ts cs bs
281 )
281 )
282
282
283
283
284−type CtorDups = Dups.Dict (Map.Map ModuleName.Canonical Env.Ctor)
284+type CtorDups = Dups.Dict (Env.Info Env.Ctor)
285
285
286
286
287
287
@@ -297,7 +297,7 @@ canonicalizeAlias env@(Env.Env home _ _ _ _ _ _ _) (A.At _ (Src.Alias (A.At regi
297 ,
297 ,
298 case ctipe of
298 case ctipe of
299 Can.TRecord fields Nothing ->
299 Can.TRecord fields Nothing ->
300− Dups.one name region (Map.singleton home (toRecordCtor home name vars fields))
300+ Dups.one name region (Env.Specific home (toRecordCtor home name vars fields))
301
301
302 _ ->
302 _ ->
303 Dups.none
303 Dups.none
@@ -351,5 +351,5 @@ toOpts ctors =
351
351
352toCtor :: ModuleName.Canonical -> Name.Name -> Can.Union -> A.Located Can.Ctor -> CtorDups
352toCtor :: ModuleName.Canonical -> Name.Name -> Can.Union -> A.Located Can.Ctor -> CtorDups
353toCtor home typeName union (A.At region (Can.Ctor name index _ args)) =
353toCtor home typeName union (A.At region (Can.Ctor name index _ args)) =
354− Dups.one name region $ Map.singleton home $
354+ Dups.one name region $ Env.Specific home $
355 Env.Ctor home typeName union index args
355 Env.Ctor home typeName union index args
compiler/src/Canonicalize/Expression.hs+6−7
@@ -14,7 +14,6 @@ import Control.Monad (foldM)
14import qualified Data.Graph as Graph
14import qualified Data.Graph as Graph
15import qualified Data.List as List
15import qualified Data.List as List
16import qualified Data.Map.Strict as Map
16import qualified Data.Map.Strict as Map
17−import qualified Data.Map.Strict.Internal as I
18import qualified Data.Name as Name
17import qualified Data.Name as Name
19
18
20import qualified AST.Canonical as Can
19import qualified AST.Canonical as Can
@@ -696,15 +695,15 @@ findVar region (Env.Env localHome vs _ _ _ qvs _ _) name =
696 Env.TopLevel _ ->
695 Env.TopLevel _ ->
697 logVar name (Can.VarTopLevel localHome name)
696 logVar name (Can.VarTopLevel localHome name)
698
697
699− Env.Foreign (I.Bin 1 home annotation _ _) ->
698+ Env.Foreign home annotation ->
700 Result.ok $
699 Result.ok $
701 if home == ModuleName.debug then
700 if home == ModuleName.debug then
702 Can.VarDebug localHome name annotation
701 Can.VarDebug localHome name annotation
703 else
702 else
704 Can.VarForeign home name annotation
703 Can.VarForeign home name annotation
705
704
706− Env.Foreign homes ->
705+ Env.Foreigns h hs ->
707− Result.throw (Error.AmbiguousVar region Nothing name (Map.keys homes))
706+ Result.throw (Error.AmbiguousVar region Nothing name h hs)
708
707
709 Nothing ->
708 Nothing ->
710 Result.throw (Error.NotFoundVar region Nothing name (toPossibleNames vs qvs))
709 Result.throw (Error.NotFoundVar region Nothing name (toPossibleNames vs qvs))
@@ -715,15 +714,15 @@ findVarQual region (Env.Env localHome vs _ _ _ qvs _ _) prefix name =
715 case Map.lookup prefix qvs of
714 case Map.lookup prefix qvs of
716 Just qualified ->
715 Just qualified ->
717 case Map.lookup name qualified of
716 case Map.lookup name qualified of
718− Just (I.Bin 1 home annotation _ _) ->
717+ Just (Env.Specific home annotation) ->
719 Result.ok $
718 Result.ok $
720 if home == ModuleName.debug then
719 if home == ModuleName.debug then
721 Can.VarDebug localHome name annotation
720 Can.VarDebug localHome name annotation
722 else
721 else
723 Can.VarForeign home name annotation
722 Can.VarForeign home name annotation
724
723
725− Just homes ->
724+ Just (Env.Ambiguous h hs) ->
726− Result.throw (Error.AmbiguousVar region (Just prefix) name (Map.keys homes))
725+ Result.throw (Error.AmbiguousVar region (Just prefix) name h hs)
727
726
728 Nothing ->
727 Nothing ->
729 Result.throw (Error.NotFoundVar region (Just prefix) name (toPossibleNames vs qvs))
728 Result.throw (Error.NotFoundVar region (Just prefix) name (toPossibleNames vs qvs))
compiler/src/Canonicalize/Module.hs+7−7
@@ -236,11 +236,11 @@ checkExposed
236 -> Map.Map Name.Name alias
236 -> Map.Map Name.Name alias
237 -> Map.Map Name.Name binop
237 -> Map.Map Name.Name binop
238 -> Can.Effects
238 -> Can.Effects
239− -> A.Located Src.Exposed
239+ -> Src.Exposed
240 -> Result i w (Dups.Dict (A.Located Can.Export))
240 -> Result i w (Dups.Dict (A.Located Can.Export))
241−checkExposed values unions aliases binops effects (A.At region exposed) =
241+checkExposed values unions aliases binops effects exposed =
242 case exposed of
242 case exposed of
243− Src.Lower name ->
243+ Src.Lower (A.At region name) ->
244 if Map.member name values then
244 if Map.member name values then
245 ok name region Can.ExportValue
245 ok name region Can.ExportValue
246 else
246 else
@@ -252,23 +252,23 @@ checkExposed values unions aliases binops effects (A.At region exposed) =
252 Result.throw $ Error.ExportNotFound region Error.BadVar name $
252 Result.throw $ Error.ExportNotFound region Error.BadVar name $
253 ports ++ Map.keys values
253 ports ++ Map.keys values
254
254
255− Src.Operator name ->
255+ Src.Operator region name ->
256 if Map.member name binops then
256 if Map.member name binops then
257 ok name region Can.ExportBinop
257 ok name region Can.ExportBinop
258 else
258 else
259 Result.throw $ Error.ExportNotFound region Error.BadOp name $
259 Result.throw $ Error.ExportNotFound region Error.BadOp name $
260 Map.keys binops
260 Map.keys binops
261
261
262− Src.Upper name Src.Public ->
262+ Src.Upper (A.At region name) (Src.Public dotDotRegion) ->
263 if Map.member name unions then
263 if Map.member name unions then
264 ok name region Can.ExportUnionOpen
264 ok name region Can.ExportUnionOpen
265 else if Map.member name aliases then
265 else if Map.member name aliases then
266− Result.throw $ Error.ExportOpenAlias region name
266+ Result.throw $ Error.ExportOpenAlias dotDotRegion name
267 else
267 else
268 Result.throw $ Error.ExportNotFound region Error.BadType name $
268 Result.throw $ Error.ExportNotFound region Error.BadType name $
269 Map.keys unions ++ Map.keys aliases
269 Map.keys unions ++ Map.keys aliases
270
270
271− Src.Upper name Src.Private ->
271+ Src.Upper (A.At region name) Src.Private ->
272 if Map.member name unions then
272 if Map.member name unions then
273 ok name region Can.ExportUnionClosed
273 ok name region Can.ExportUnionClosed
274 else if Map.member name aliases then
274 else if Map.member name aliases then
compiler/src/Canonicalize/Pattern.hs+3−2
@@ -8,6 +8,7 @@ module Canonicalize.Pattern
8 where
8 where
9
9
10
10
11+import qualified Data.List as List
11import qualified Data.Map.Strict as Map
12import qualified Data.Map.Strict as Map
12import qualified Data.Name as Name
13import qualified Data.Name as Name
13
14
@@ -173,8 +174,8 @@ logVar name region value =
173logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a
174logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a
174logFields fields value =
175logFields fields value =
175 let
176 let
176− addField (A.At region name) dict =
177+ addField dict (A.At region name) =
177 Dups.insert name region region dict
178 Dups.insert name region region dict
178 in
179 in
179 Result.Result $ \bindings warnings _ ok ->
180 Result.Result $ \bindings warnings _ ok ->
180− ok (foldr addField bindings fields) warnings value
181+ ok (List.foldl' addField bindings fields) warnings value
compiler/src/Data/Name.hs+1−1
@@ -304,7 +304,7 @@ fromManyNames names =
304 case names of
304 case names of
305 [] ->
305 [] ->
306 blank
306 blank
307− -- this case is needed for (let _ = Debug.log "x" x in ...)
307+ -- NOTE: this case is needed for (let _ = Debug.log "x" x in ...)
308 -- but maybe unused patterns should be stripped out instead
308 -- but maybe unused patterns should be stripped out instead
309
309
310 Utf8.Utf8 ba# : _ ->
310 Utf8.Utf8 ba# : _ ->
compiler/src/Data/Utf8.hs+3−1
@@ -261,7 +261,9 @@ instance Eq (Utf8 t) where
261
261
262
262
263-- COMPARE
263-- COMPARE
264−
264+--
265+-- TODO: is it fine to sort by length and only compare bytes on length ties?
266+--
265
267
266instance Ord (Utf8 t) where
268instance Ord (Utf8 t) where
267 compare (Utf8 ba1#) (Utf8 ba2#) =
269 compare (Utf8 ba1#) (Utf8 ba2#) =
compiler/src/Elm/Compiler/Imports.hs+3−3
@@ -49,14 +49,14 @@ closed =
49
49
50typeOpen :: Name.Name -> Src.Exposing
50typeOpen :: Name.Name -> Src.Exposing
51typeOpen name =
51typeOpen name =
52− Src.Explicit [ A.At A.zero (Src.Upper name Src.Public) ]
52+ Src.Explicit [ Src.Upper (A.At A.zero name) (Src.Public A.zero) ]
53
53
54
54
55typeClosed :: Name.Name -> Src.Exposing
55typeClosed :: Name.Name -> Src.Exposing
56typeClosed name =
56typeClosed name =
57− Src.Explicit [ A.At A.zero (Src.Upper name Src.Private) ]
57+ Src.Explicit [ Src.Upper (A.At A.zero name) Src.Private ]
58
58
59
59
60operator :: Name.Name -> Src.Exposing
60operator :: Name.Name -> Src.Exposing
61operator op =
61operator op =
62− Src.Explicit [ A.At A.zero (Src.Operator op) ]
62+ Src.Explicit [ Src.Operator A.zero op ]
compiler/src/Elm/Kernel.hs+6−6
@@ -319,19 +319,19 @@ toNames exposing =
319 map toName exposedList
319 map toName exposedList
320
320
321
321
322−toName :: A.Located Src.Exposed -> Name.Name
322+toName :: Src.Exposed -> Name.Name
323−toName (A.At _ exposed) =
323+toName exposed =
324 case exposed of
324 case exposed of
325− Src.Lower name ->
325+ Src.Lower (A.At _ name) ->
326 name
326 name
327
327
328− Src.Upper name Src.Private ->
328+ Src.Upper (A.At _ name) Src.Private ->
329 name
329 name
330
330
331− Src.Upper _ Src.Public ->
331+ Src.Upper _ (Src.Public _) ->
332 error "cannot have Maybe(..) syntax in kernel code header"
332 error "cannot have Maybe(..) syntax in kernel code header"
333
333
334− Src.Operator _ ->
334+ Src.Operator _ _ ->
335 error "cannot use binops in kernel code"
335 error "cannot use binops in kernel code"
336
336
337
337
compiler/src/Elm/ModuleName.hs+2−6
@@ -7,12 +7,13 @@ module Elm.ModuleName
7 --
7 --
8 , encode
8 , encode
9 , decoder
9 , decoder
10+ , parser
10 --
11 --
11 , Canonical(..)
12 , Canonical(..)
12 , basics, char, string
13 , basics, char, string
13 , maybe, result, list, array, dict, tuple
14 , maybe, result, list, array, dict, tuple
14 , platform, cmd, sub
15 , platform, cmd, sub
15− , debug, bitwise
16+ , debug
16 , virtualDom
17 , virtualDom
17 , jsonDecode, jsonEncode
18 , jsonDecode, jsonEncode
18 , webgl, texture, vector2, vector3, vector4, matrix4
19 , webgl, texture, vector2, vector3, vector4, matrix4
@@ -225,11 +226,6 @@ debug :: Canonical
225debug = Canonical Pkg.core Name.debug
226debug = Canonical Pkg.core Name.debug
226
227
227
228
228−{-# NOINLINE bitwise #-}
229−bitwise :: Canonical
230−bitwise = Canonical Pkg.core Name.bitwise
231−
232−
233
229
234-- HTML
230-- HTML
235
231
compiler/src/Generate/JavaScript.hs+44−9
@@ -2,6 +2,7 @@
2module Generate.JavaScript
2module Generate.JavaScript
3 ( generate
3 ( generate
4 , generateForRepl
4 , generateForRepl
5+ , generateForReplEndpoint
5 )
6 )
6 where
7 where
7
8
@@ -85,7 +86,8 @@ generateForRepl ansi localizer (Opt.GlobalGraph graph _) home name (Can.Forall _
85 debugState = addGlobal mode graph emptyState (Opt.Global ModuleName.debug "toString")
86 debugState = addGlobal mode graph emptyState (Opt.Global ModuleName.debug "toString")
86 evalState = addGlobal mode graph debugState (Opt.Global home name)
87 evalState = addGlobal mode graph debugState (Opt.Global home name)
87 in
88 in
89+ "process.on('uncaughtException', function(err) { process.stderr.write(err.toString() + '\\n'); process.exit(1); });"
88− Functions.functions
90+ <> Functions.functions
89 <> stateToBuilder evalState
91 <> stateToBuilder evalState
90 <> print ansi localizer home name tipe
92 <> print ansi localizer home name tipe
91
93
@@ -98,14 +100,47 @@ print ansi localizer home name tipe =
98 tipeDoc = RT.canToDoc localizer RT.None tipe
100 tipeDoc = RT.canToDoc localizer RT.None tipe
99 bool = if ansi then "true" else "false"
101 bool = if ansi then "true" else "false"
100 in
102 in
101− "var _value = " <> toString <> "(" <> bool <> ", " <> value <> ");\n\
103+ "var _value = " <> toString <> "(" <> bool <> ", " <> value <> ");\n\
102− \var _type = " <> B.stringUtf8 (show (D.toString tipeDoc)) <> ";\n\
104+ \var _type = " <> B.stringUtf8 (show (D.toString tipeDoc)) <> ";\n\
103− \function _print(t) { console.log(_value + (" <> bool <> " ? '\x1b[90m' + t + '\x1b[0m' : t)); }\n\
105+ \function _print(t) { console.log(_value + (" <> bool <> " ? '\x1b[90m' + t + '\x1b[0m' : t)); }\n\
104− \if (_value.length + 3 + _type.length >= 80 || _type.indexOf('\\n') >= 0) {\n\
106+ \if (_value.length + 3 + _type.length >= 80 || _type.indexOf('\\n') >= 0) {\n\
105− \ _print('\\n : ' + _type.split('\\n').join('\\n '));\n\
107+ \ _print('\\n : ' + _type.split('\\n').join('\\n '));\n\
106− \} else {\n\
108+ \} else {\n\
107− \ _print(' : ' + _type);\n\
109+ \ _print(' : ' + _type);\n\
110+ \}\n"
111+
112+
113+
114+-- GENERATE FOR REPL ENDPOINT
115+
116+
117+generateForReplEndpoint :: L.Localizer -> Opt.GlobalGraph -> ModuleName.Canonical -> Maybe Name.Name -> Can.Annotation -> B.Builder
118+generateForReplEndpoint localizer (Opt.GlobalGraph graph _) home maybeName (Can.Forall _ tipe) =
119+ let
120+ name = maybe Name.replValueToPrint id maybeName
121+ mode = Mode.Dev Nothing
122+ debugState = addGlobal mode graph emptyState (Opt.Global ModuleName.debug "toString")
123+ evalState = addGlobal mode graph debugState (Opt.Global home name)
124+ in
125+ Functions.functions
126+ <> stateToBuilder evalState
127+ <> postMessage localizer home maybeName tipe
128+
129+
130+postMessage :: L.Localizer -> ModuleName.Canonical -> Maybe Name.Name -> Can.Type -> B.Builder
131+postMessage localizer home maybeName tipe =
132+ let
133+ name = maybe Name.replValueToPrint id maybeName
134+ value = JsName.toBuilder (JsName.fromGlobal home name)
135+ toString = JsName.toBuilder (JsName.fromKernel Name.debug "toAnsiString")
136+ tipeDoc = RT.canToDoc localizer RT.None tipe
137+ toName n = "\"" <> Name.toBuilder n <> "\""
138+ in
139+ "self.postMessage({\n\
140+ \ name: " <> maybe "null" toName maybeName <> ",\n\
141+ \ value: " <> toString <> "(true, " <> value <> "),\n\
142+ \ type: " <> B.stringUtf8 (show (D.toString tipeDoc)) <> "\n\
108− \}\n"
143+ \});\n"
109
144
110
145
111
146
compiler/src/Parse/Module.hs+21−14
@@ -434,18 +434,18 @@ exposing =
434 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
434 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
435 word1 0x29 {-)-} E.ExposingEnd
435 word1 0x29 {-)-} E.ExposingEnd
436 return Src.Open
436 return Src.Open
437− , do exposed <- addLocation chompExposed
437+ , do exposed <- chompExposed
438 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
438 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
439 exposingHelp [exposed]
439 exposingHelp [exposed]
440 ]
440 ]
441
441
442
442
443−exposingHelp :: [A.Located Src.Exposed] -> Parser E.Exposing Src.Exposing
443+exposingHelp :: [Src.Exposed] -> Parser E.Exposing Src.Exposing
444exposingHelp revExposed =
444exposingHelp revExposed =
445 oneOf E.ExposingEnd
445 oneOf E.ExposingEnd
446 [ do word1 0x2C {-,-} E.ExposingEnd
446 [ do word1 0x2C {-,-} E.ExposingEnd
447 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValue
447 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValue
448− exposed <- addLocation chompExposed
448+ exposed <- chompExposed
449 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
449 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
450 exposingHelp (exposed:revExposed)
450 exposingHelp (exposed:revExposed)
451 , do word1 0x29 {-)-} E.ExposingEnd
451 , do word1 0x29 {-)-} E.ExposingEnd
@@ -455,16 +455,21 @@ exposingHelp revExposed =
455
455
456chompExposed :: Parser E.Exposing Src.Exposed
456chompExposed :: Parser E.Exposing Src.Exposed
457chompExposed =
457chompExposed =
458+ do start <- getPosition
458− oneOf E.ExposingValue
459+ oneOf E.ExposingValue
459− [ Src.Lower <$> Var.lower E.ExposingValue
460+ [ do name <- Var.lower E.ExposingValue
461+ end <- getPosition
462+ return $ Src.Lower $ A.at start end name
460− , do word1 0x28 {-(-} E.ExposingValue
463+ , do word1 0x28 {-(-} E.ExposingValue
461− op <- Symbol.operator E.ExposingOperator E.ExposingOperatorReserved
464+ op <- Symbol.operator E.ExposingOperator E.ExposingOperatorReserved
462− word1 0x29 {-)-} E.ExposingOperatorRightParen
465+ word1 0x29 {-)-} E.ExposingOperatorRightParen
466+ end <- getPosition
463− return (Src.Operator op)
467+ return $ Src.Operator (A.Region start end) op
464− , do name <- Var.upper E.ExposingValue
468+ , do name <- Var.upper E.ExposingValue
469+ end <- getPosition
465− Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
470+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
466− Src.Upper name <$> privacy
471+ Src.Upper (A.at start end name) <$> privacy
467− ]
472+ ]
468
473
469
474
470privacy :: Parser E.Exposing Src.Privacy
475privacy :: Parser E.Exposing Src.Privacy
@@ -472,9 +477,11 @@ privacy =
472 oneOfWithFallback
477 oneOfWithFallback
473 [ do word1 0x28 {-(-} E.ExposingTypePrivacy
478 [ do word1 0x28 {-(-} E.ExposingTypePrivacy
474 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
479 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
480+ start <- getPosition
475 word2 0x2E 0x2E {-..-} E.ExposingTypePrivacy
481 word2 0x2E 0x2E {-..-} E.ExposingTypePrivacy
482+ end <- getPosition
476 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
483 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
477 word1 0x29 {-)-} E.ExposingTypePrivacy
484 word1 0x29 {-)-} E.ExposingTypePrivacy
478− return Src.Public
485+ return $ Src.Public (A.Region start end)
479 ]
486 ]
480 Src.Private
487 Src.Private
compiler/src/Parse/Pattern.hs+1−1
@@ -129,7 +129,7 @@ recordHelp start vars =
129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd
129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd
130 recordHelp start (var:vars)
130 recordHelp start (var:vars)
131 , do word1 0x7D {-}-} E.PRecordEnd
131 , do word1 0x7D {-}-} E.PRecordEnd
132− addEnd start (Src.PRecord vars)
132+ addEnd start (Src.PRecord (reverse vars))
133 ]
133 ]
134
134
135
135
compiler/src/Reporting/Error/Canonicalize.hs+21−16
@@ -14,8 +14,10 @@ module Reporting.Error.Canonicalize
14
14
15
15
16import qualified Data.Char as Char
16import qualified Data.Char as Char
17+import qualified Data.List as List
17import qualified Data.Map as Map
18import qualified Data.Map as Map
18import qualified Data.Name as Name
19import qualified Data.Name as Name
20+import qualified Data.OneOrMore as OneOrMore
19import qualified Data.Set as Set
21import qualified Data.Set as Set
20
22
21import qualified AST.Canonical as Can
23import qualified AST.Canonical as Can
@@ -37,10 +39,10 @@ import qualified Reporting.Suggest as Suggest
37
39
38data Error
40data Error
39 = AnnotationTooShort A.Region Name.Name Index.ZeroBased Int
41 = AnnotationTooShort A.Region Name.Name Index.ZeroBased Int
40− | AmbiguousVar A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
42+ | AmbiguousVar A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
41− | AmbiguousType A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
43+ | AmbiguousType A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
42− | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
44+ | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
43− | AmbiguousBinop A.Region Name.Name [ModuleName.Canonical]
45+ | AmbiguousBinop A.Region Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
44 | BadArity A.Region BadArityContext Name.Name Int Int
46 | BadArity A.Region BadArityContext Name.Name Int Int
45 | Binop A.Region Name.Name Name.Name
47 | Binop A.Region Name.Name Name.Name
46 | DuplicateDecl Name.Name A.Region A.Region
48 | DuplicateDecl Name.Name A.Region A.Region
@@ -164,17 +166,17 @@ toReport source err =
164 <> " be deleted? Maybe some parentheses are missing?"
166 <> " be deleted? Maybe some parentheses are missing?"
165 )
167 )
166
168
167− AmbiguousVar region maybePrefix name possibleHomes ->
169+ AmbiguousVar region maybePrefix name h hs ->
168− ambiguousName source region maybePrefix name possibleHomes "variable"
170+ ambiguousName source region maybePrefix name h hs "variable"
169
171
170− AmbiguousType region maybePrefix name possibleHomes ->
172+ AmbiguousType region maybePrefix name h hs ->
171− ambiguousName source region maybePrefix name possibleHomes "type"
173+ ambiguousName source region maybePrefix name h hs "type"
172
174
173− AmbiguousVariant region maybePrefix name possibleHomes ->
175+ AmbiguousVariant region maybePrefix name h hs ->
174− ambiguousName source region maybePrefix name possibleHomes "variant"
176+ ambiguousName source region maybePrefix name h hs "variant"
175
177
176− AmbiguousBinop region name possibleHomes ->
178+ AmbiguousBinop region name h hs ->
177− ambiguousName source region Nothing name possibleHomes "operator"
179+ ambiguousName source region Nothing name h hs "operator"
178
180
179 BadArity region badArityContext name expected actual ->
181 BadArity region badArityContext name expected actual ->
180 let
182 let
@@ -677,7 +679,7 @@ toReport source err =
677 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
679 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
678 ,
680 ,
679 D.stack
681 D.stack
680− [ makeTheory "Are you are trying to mutate a variable?" $
682+ [ makeTheory "Are you trying to mutate a variable?" $
681 "Elm does not have mutation, so when I see " ++ Name.toChars name
683 "Elm does not have mutation, so when I see " ++ Name.toChars name
682 ++ " defined in terms of " ++ Name.toChars name
684 ++ " defined in terms of " ++ Name.toChars name
683 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
685 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -723,7 +725,7 @@ toReport source err =
723 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
725 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
724 ,
726 ,
725 D.stack
727 D.stack
726− [ makeTheory "Are you are trying to mutate a variable?" $
728+ [ makeTheory "Are you trying to mutate a variable?" $
727 "Elm does not have mutation, so when I see " ++ Name.toChars name
729 "Elm does not have mutation, so when I see " ++ Name.toChars name
728 ++ " defined in terms of " ++ Name.toChars name
730 ++ " defined in terms of " ++ Name.toChars name
729 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
731 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -974,8 +976,11 @@ nameClash source r1 r2 messageThatEndsWithPunctuation =
974-- AMBIGUOUS NAME
976-- AMBIGUOUS NAME
975
977
976
978
977−ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> [ModuleName.Canonical] -> String -> Report.Report
979+ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> ModuleName.Canonical -> OneOrMore.OneOrMore ModuleName.Canonical -> String -> Report.Report
978−ambiguousName source region maybePrefix name possibleHomes thing =
980+ambiguousName source region maybePrefix name h hs thing =
981+ let
982+ possibleHomes = List.sort (h : OneOrMore.destruct (:) hs)
983+ in
979 Report.Report "AMBIGUOUS NAME" region [] $
984 Report.Report "AMBIGUOUS NAME" region [] $
980 Code.toSnippet source region Nothing $
985 Code.toSnippet source region Nothing $
981 case maybePrefix of
986 case maybePrefix of
compiler/src/Reporting/Error/Import.hs+1−1
@@ -56,7 +56,7 @@ toReport source (Error region name unimportedModules problem) =
56 D.stack
56 D.stack
57 [
57 [
58 D.reflow $
58 D.reflow $
59− "I checked the \"dependencies\" and \"source-directories\" listend in your elm.json,\
59+ "I checked the \"dependencies\" and \"source-directories\" listed in your elm.json,\
60 \ but I cannot find it! Maybe it is a typo for one of these names?"
60 \ but I cannot find it! Maybe it is a typo for one of these names?"
61 ,
61 ,
62 D.dullyellow $ D.indent 4 $ D.vcat $
62 D.dullyellow $ D.indent 4 $ D.vcat $
compiler/src/Reporting/Error/Pattern.hs+2−2
@@ -41,7 +41,7 @@ toReport source err =
41 Report.Report "UNSAFE PATTERN" region [] $
41 Report.Report "UNSAFE PATTERN" region [] $
42 Code.toSnippet source region Nothing
42 Code.toSnippet source region Nothing
43 (
43 (
44− "This pattern does not cover all possiblities:"
44+ "This pattern does not cover all possibilities:"
45 ,
45 ,
46 D.stack
46 D.stack
47 [ "Other possibilities include:"
47 [ "Other possibilities include:"
@@ -64,7 +64,7 @@ toReport source err =
64 , unhandledPatternsToDocBlock unhandled
64 , unhandledPatternsToDocBlock unhandled
65 , D.reflow $
65 , D.reflow $
66 "I would have to crash if I saw one of those! You can use\
66 "I would have to crash if I saw one of those! You can use\
67− \ `let` to deconstruct values only if there is ONE possiblity.\
67+ \ `let` to deconstruct values only if there is ONE possibility.\
68 \ Switch to a `case` expression to account for all possibilities."
68 \ Switch to a `case` expression to account for all possibilities."
69 , D.toSimpleHint $
69 , D.toSimpleHint $
70 "Are you calling a function that definitely returns values\
70 "Are you calling a function that definitely returns values\
compiler/src/Reporting/Error/Syntax.hs+466−370
@@ -649,156 +649,9 @@ toParseErrorReport source modul =
649 toSpaceReport source space row col
649 toSpaceReport source space row col
650
650
651 ModuleBadEnd row col ->
651 ModuleBadEnd row col ->
652− case Code.whatIsNext source row col of
652+ if col == 1
653− Code.Keyword keyword ->
653+ then toDeclStartReport source row col
654− let
654+ else toWeirdEndReport source row col
655− region = toKeywordRegion row col keyword
656− in
657− Report.Report "RESERVED WORD" region [] $
658− Code.toSnippet source region Nothing
659− (
660− D.reflow $
661− "I got stuck on this reserved word:"
662− ,
663− D.reflow $
664− "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
665− )
666−
667− Code.Operator op ->
668− let
669− region = toKeywordRegion row col op
670− in
671− Report.Report "UNEXPECTED SYMBOL" region [] $
672− Code.toSnippet source region Nothing
673− (
674− D.reflow $
675− "I ran into an unexpected symbol:"
676− ,
677− D.reflow $
678− "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
679− \ I can give a better hint from there?"
680− )
681−
682− Code.Close term bracket ->
683− let
684− region = toRegion row col
685− in
686− Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
687− Code.toSnippet source region Nothing
688− (
689− D.reflow $
690− "I ran into an unexpected " ++ term ++ ":"
691− ,
692− D.reflow $
693− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
694− )
695−
696− Code.Other maybeChar ->
697− let
698− region = toRegion row col
699− in
700− case maybeChar of
701− Just ';' ->
702− Report.Report "UNEXPECTED SEMICOLON" region [] $
703− Code.toSnippet source region Nothing
704− (
705− D.reflow $
706− "I got stuck on this semicolon:"
707− ,
708− D.stack
709− [ D.reflow $ "Try removing it?"
710− , D.toSimpleNote $
711− "Some languages require semicolons at the end of each statement. These are\
712− \ often called C-like languages, and they usually share a lot of language design\
713− \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
714− \ and subscriptions instead, so there is no special syntax for \"statements\" and\
715− \ therefore no need to use semicolons to separate them. I think this will make\
716− \ more sense as you work through <https://guide.elm-lang.org> though!"
717− ]
718− )
719−
720− Just ',' ->
721− Report.Report "UNEXPECTED COMMA" region [] $
722− Code.toSnippet source region Nothing
723− (
724− D.reflow $
725− "I got stuck on this comma:"
726− ,
727− D.stack
728− [ D.reflow $
729− "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
730− , D.toSimpleNote $
731− "If this is supposed to be part of a list, the problem may be a bit earlier.\
732− \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
733− \ closing ] that is making me think the list ended earlier? The same kinds of\
734− \ things could be going wrong if this is supposed to be a tuple."
735− ]
736− )
737−
738− Just '`' ->
739− Report.Report "UNEXPECTED CHARACTER" region [] $
740− Code.toSnippet source region Nothing
741− (
742− D.reflow $
743− "I got stuck on this character:"
744− ,
745− D.stack
746− [ D.reflow $
747− "It is not used for anything in Elm syntax. It is used for multi-line strings in\
748− \ some languages though, so if you want a string that spans multiple lines, you\
749− \ can use Elm's multi-line string syntax like this:"
750− , D.vcat
751− [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
752− , mempty
753− , D.dullyellow "# Multi-line Strings"
754− , mempty
755− , D.dullyellow "- start with triple double quotes"
756− , D.dullyellow "- write whatever you want"
757− , D.dullyellow "- no need to escape newlines or double quotes"
758− , D.dullyellow "- end with triple double quotes"
759− , mempty
760− , D.dullyellow "\"\"\""
761− ]
762− , D.reflow $
763− "Otherwise I do not know what is going on! Try removing the character?"
764− ]
765− )
766−
767− Just '$' ->
768− Report.Report "UNEXPECTED SYMBOL" region [] $
769− Code.toSnippet source region Nothing
770− (
771− D.reflow $
772− "I got stuck on this dollar sign:"
773− ,
774− D.reflow $
775− "It is not used for anything in Elm syntax. Are you coming from a language where\
776− \ dollar signs can be used in variable names? If so, try a name that (1) starts\
777− \ with a letter and (2) only contains letters, numbers, and underscores."
778− )
779−
780− Just c | elem c ['#','@','!','%','~'] ->
781− Report.Report "UNEXPECTED SYMBOL" region [] $
782− Code.toSnippet source region Nothing
783− (
784− D.reflow $
785− "I got stuck on this symbol:"
786− ,
787− D.reflow $
788− "It is not used for anything in Elm syntax. Try removing it?"
789− )
790−
791− _ ->
792− Report.Report "SYNTAX PROBLEM" region [] $
793− Code.toSnippet source region Nothing
794− (
795− D.reflow $
796− "I got stuck here:"
797− ,
798− D.reflow $
799− "Whatever I am running into is confusing me a lot! Normally I can give fairly\
800− \ specific hints, but something is really tripping me up this time."
801− )
802
655
803 ModuleProblem row col ->
656 ModuleProblem row col ->
804 let
657 let
@@ -944,11 +797,11 @@ toParseErrorReport source modul =
944 [ D.reflow $
797 [ D.reflow $
945 "I am not sure what is going on, but I recommend starting an Elm\
798 "I am not sure what is going on, but I recommend starting an Elm\
946 \ file with the following lines:"
799 \ file with the following lines:"
947− , D.vcat
800+ , D.indent 4 $ D.vcat $
948 [ D.fillSep [D.cyan "import","Html"]
801 [ D.fillSep [D.cyan "import","Html"]
949 , ""
802 , ""
950− , D.fillSep [D.green "main","="]
803+ , "main ="
951− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
804+ , " Html.text " <> D.dullyellow "\"Hello!\""
952 ]
805 ]
953 , D.reflow $
806 , D.reflow $
954 "You should be able to copy those lines directly into your file. Check out the\
807 "You should be able to copy those lines directly into your file. Check out the\
@@ -977,11 +830,12 @@ toParseErrorReport source modul =
977 , D.indent 4 $ D.vcat $
830 , D.indent 4 $ D.vcat $
978 [ D.fillSep [D.cyan "import","Dict"]
831 [ D.fillSep [D.cyan "import","Dict"]
979 , D.fillSep [D.cyan "import","Maybe"]
832 , D.fillSep [D.cyan "import","Maybe"]
980− , D.fillSep [D.cyan "import","Html.Attributes"]
833+ , D.fillSep [D.cyan "import","Html.Attributes",D.cyan "as","A"]
981− , D.fillSep [D.cyan "import","Json.Decode"]
834+ , D.fillSep [D.cyan "import","Json.Decode",D.cyan "exposing","(..)"]
982 ]
835 ]
983 , D.reflow $
836 , D.reflow $
984 "Notice that the module names all start with capital letters. That is required!"
837 "Notice that the module names all start with capital letters. That is required!"
838+ , D.reflowLink "Read" "imports" "to learn more."
985 ]
839 ]
986 )
840 )
987
841
@@ -1008,6 +862,7 @@ toParseErrorReport source modul =
1008 ]
862 ]
1009 , D.reflow $
863 , D.reflow $
1010 "Notice that the alias always starts with a capital letter. That is required!"
864 "Notice that the alias always starts with a capital letter. That is required!"
865+ , D.reflowLink "Read" "imports" "to learn more."
1011 ]
866 ]
1012 )
867 )
1013
868
@@ -1070,6 +925,192 @@ toParseErrorReport source modul =
1070
925
1071
926
1072
927
928+-- WEIRD END
929+
930+
931+toWeirdEndReport :: Code.Source -> Row -> Col -> Report.Report
932+toWeirdEndReport source row col =
933+ case Code.whatIsNext source row col of
934+ Code.Keyword keyword ->
935+ let
936+ region = toKeywordRegion row col keyword
937+ in
938+ Report.Report "RESERVED WORD" region [] $
939+ Code.toSnippet source region Nothing
940+ (
941+ D.reflow $
942+ "I got stuck on this reserved word:"
943+ ,
944+ D.reflow $
945+ "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
946+ )
947+
948+ Code.Operator op ->
949+ let
950+ region = toKeywordRegion row col op
951+ in
952+ Report.Report "UNEXPECTED SYMBOL" region [] $
953+ Code.toSnippet source region Nothing
954+ (
955+ D.reflow $
956+ "I ran into an unexpected symbol:"
957+ ,
958+ D.reflow $
959+ "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
960+ \ I can give a better hint from there?"
961+ )
962+
963+ Code.Close term bracket ->
964+ let
965+ region = toRegion row col
966+ in
967+ Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
968+ Code.toSnippet source region Nothing
969+ (
970+ D.reflow $
971+ "I ran into an unexpected " ++ term ++ ":"
972+ ,
973+ D.reflow $
974+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
975+ )
976+
977+ Code.Lower c cs ->
978+ let
979+ region = toKeywordRegion row col (c:cs)
980+ in
981+ Report.Report "UNEXPECTED NAME" region [] $
982+ Code.toSnippet source region Nothing
983+ (
984+ D.reflow $
985+ "I got stuck on this name:"
986+ ,
987+ D.reflow $
988+ "It is confusing me a lot! Normally I can give fairly specific hints, but\
989+ \ something is really tripping me up this time."
990+ )
991+
992+ Code.Upper c cs ->
993+ let
994+ region = toKeywordRegion row col (c:cs)
995+ in
996+ Report.Report "UNEXPECTED NAME" region [] $
997+ Code.toSnippet source region Nothing
998+ (
999+ D.reflow $
1000+ "I got stuck on this name:"
1001+ ,
1002+ D.reflow $
1003+ "It is confusing me a lot! Normally I can give fairly specific hints, but\
1004+ \ something is really tripping me up this time."
1005+ )
1006+
1007+ Code.Other maybeChar ->
1008+ let
1009+ region = toRegion row col
1010+ in
1011+ case maybeChar of
1012+ Just ';' ->
1013+ Report.Report "UNEXPECTED SEMICOLON" region [] $
1014+ Code.toSnippet source region Nothing
1015+ (
1016+ D.reflow $
1017+ "I got stuck on this semicolon:"
1018+ ,
1019+ D.stack
1020+ [ D.reflow $ "Try removing it?"
1021+ , D.toSimpleNote $
1022+ "Some languages require semicolons at the end of each statement. These are\
1023+ \ often called C-like languages, and they usually share a lot of language design\
1024+ \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
1025+ \ and subscriptions instead, so there is no special syntax for \"statements\" and\
1026+ \ therefore no need to use semicolons to separate them. I think this will make\
1027+ \ more sense as you work through <https://guide.elm-lang.org> though!"
1028+ ]
1029+ )
1030+
1031+ Just ',' ->
1032+ Report.Report "UNEXPECTED COMMA" region [] $
1033+ Code.toSnippet source region Nothing
1034+ (
1035+ D.reflow $
1036+ "I got stuck on this comma:"
1037+ ,
1038+ D.stack
1039+ [ D.reflow $
1040+ "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
1041+ , D.toSimpleNote $
1042+ "If this is supposed to be part of a list, the problem may be a bit earlier.\
1043+ \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
1044+ \ closing ] that is making me think the list ended earlier? The same kinds of\
1045+ \ things could be going wrong if this is supposed to be a tuple."
1046+ ]
1047+ )
1048+
1049+ Just '`' ->
1050+ Report.Report "UNEXPECTED CHARACTER" region [] $
1051+ Code.toSnippet source region Nothing
1052+ (
1053+ D.reflow $
1054+ "I got stuck on this character:"
1055+ ,
1056+ D.stack
1057+ [ D.reflow $
1058+ "It is not used for anything in Elm syntax. It is used for multi-line strings in\
1059+ \ some languages though, so if you want a string that spans multiple lines, you\
1060+ \ can use Elm's multi-line string syntax like this:"
1061+ , D.dullyellow $ D.indent 4 $ D.vcat $
1062+ [ "\"\"\""
1063+ , "# Multi-line Strings"
1064+ , ""
1065+ , "- start with triple double quotes"
1066+ , "- write whatever you want"
1067+ , "- no need to escape newlines or double quotes"
1068+ , "- end with triple double quotes"
1069+ , "\"\"\""
1070+ ]
1071+ , D.reflow $
1072+ "Otherwise I do not know what is going on! Try removing the character?"
1073+ ]
1074+ )
1075+
1076+ Just '$' ->
1077+ Report.Report "UNEXPECTED SYMBOL" region [] $
1078+ Code.toSnippet source region Nothing
1079+ (
1080+ D.reflow $
1081+ "I got stuck on this dollar sign:"
1082+ ,
1083+ D.reflow $
1084+ "It is not used for anything in Elm syntax. Are you coming from a language where\
1085+ \ dollar signs can be used in variable names? If so, try a name that (1) starts\
1086+ \ with a letter and (2) only contains letters, numbers, and underscores."
1087+ )
1088+
1089+ Just c | elem c ['#','@','!','%','~'] ->
1090+ Report.Report "UNEXPECTED SYMBOL" region [] $
1091+ Code.toSnippet source region Nothing
1092+ (
1093+ D.reflow $
1094+ "I got stuck on this symbol:"
1095+ ,
1096+ D.reflow $
1097+ "It is not used for anything in Elm syntax. Try removing it?"
1098+ )
1099+
1100+ _ ->
1101+ Report.Report "SYNTAX PROBLEM" region [] $
1102+ Code.toSnippet source region Nothing
1103+ (
1104+ D.reflow $
1105+ "I got stuck here:"
1106+ ,
1107+ D.reflow $
1108+ "Whatever I am running into is confusing me a lot! Normally I can give fairly\
1109+ \ specific hints, but something is really tripping me up this time."
1110+ )
1111+
1112+
1113+
1073-- IMPORTS
1114-- IMPORTS
1074
1115
1075
1116
@@ -1095,6 +1136,7 @@ toImportReport source row col =
1095 ]
1136 ]
1096 , D.reflow $
1137 , D.reflow $
1097 "You are probably trying to import a different module, but try to make it look like one of these examples!"
1138 "You are probably trying to import a different module, but try to make it look like one of these examples!"
1139+ , D.reflowLink "Read" "imports" "to learn more."
1098 ]
1140 ]
1099 )
1141 )
1100
1142
@@ -1401,114 +1443,7 @@ toDeclarationsReport :: Code.Source -> Decl -> Report.Report
1401toDeclarationsReport source decl =
1443toDeclarationsReport source decl =
1402 case decl of
1444 case decl of
1403 DeclStart row col ->
1445 DeclStart row col ->
1404− case Code.whatIsNext source row col of
1446+ toDeclStartReport source row col
1405− Code.Close term bracket ->
1406− let
1407− region = toRegion row col
1408− in
1409− Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1410− Code.toSnippet source region Nothing
1411− (
1412− D.reflow $
1413− "I was not expecting to see a " ++ term ++ " here:"
1414− , D.reflow $
1415− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1416− )
1417−
1418− Code.Keyword keyword ->
1419− let
1420− region = toKeywordRegion row col keyword
1421− in
1422− Report.Report "RESERVED WORD" region [] $
1423− Code.toSnippet source region Nothing
1424− (
1425− D.reflow $
1426− "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1427− ,
1428− case keyword of
1429− "import" ->
1430− D.reflow $
1431− "It is reserved for declaring imports at the top of your module. If you want\
1432− \ another import, try moving it up top with the other imports. If you want to\
1433− \ define a value or function, try changing the name to something else!"
1434−
1435− "case" ->
1436− D.stack
1437− [ D.reflow $
1438− "It is reserved for writing `case` expressions. Try using a different name?"
1439− , D.toSimpleNote $
1440− "If you are trying to write a `case` expression, it needs to be part of a\
1441− \ definition. So you could write something like this instead:"
1442− , D.vcat $
1443− [ D.indent 0 $ D.fillSep [D.green "getWidth","maybeWidth","="]
1444− , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1445− , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1446− , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1447− , ""
1448− , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1449− , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1450− ]
1451− , D.reflow $
1452− "This defines a `getWidth` function that we can use elsewhere in our program."
1453− ]
1454−
1455− "if" ->
1456− D.stack
1457− [ D.reflow $
1458− "It is reserved for writing `if` expressions. Try using a different name?"
1459− , D.toSimpleNote $
1460− "If you are trying to write an `if` expression, it needs to be part of a\
1461− \ definition. So you could write something like this instead:"
1462− , D.vcat $
1463− [ D.indent 0 $ D.fillSep [D.green "reviewPowerLevel","powerLevel","="]
1464− , D.indent 2 $ D.fillSep $
1465− [D.cyan "if","powerLevel",">",D.dullyellow "9000"
1466− ,D.cyan "then",D.dullyellow "\"OVER 9000!!!\""
1467− ,D.cyan "else",D.dullyellow "\"not bad\""
1468− ]
1469− ]
1470− , D.reflow $
1471− "This defines a `reviewPowerLevel` function that we can use elsewhere in our program."
1472− ]
1473−
1474− _ ->
1475− D.reflow $
1476− "It is a reserved word. Try changing the name to something else?"
1477− )
1478−
1479− _ ->
1480− let
1481− region = toRegion row col
1482− in
1483− Report.Report "SYNTAX PROBLEM" region [] $
1484− Code.toSnippet source region Nothing
1485− (
1486− D.reflow $
1487− "I was expecting to see a declaration, but I am getting stuck here:"
1488− ,
1489− D.stack
1490− [ case Code.whatIsNext source row col of
1491− Code.Other (Just char) | Char.isUpper char ->
1492− D.reflow $
1493− "All declarations start with lower-case letters in Elm, so maybe this letter can\
1494− \ be changed to lower-case?"
1495−
1496− _ ->
1497− D.reflow $
1498− "Declarations normally start with a lower-case name or the `type` keyword."
1499− , D.toSimpleHint $
1500− "Here are a couple valid declarations for reference:"
1501− , D.vcat
1502− [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
1503− , D.fillSep [D.green "add","x","y","="]
1504− , D.fillSep [" ","x","+","y"]
1505− ]
1506− , D.fillSep [D.cyan "type",D.green "User","=","Anonymous","|","LoggedIn String"]
1507− , D.reflow $
1508− "Notice that these declarations start with lower-case letters. Capitalization\
1509− \ makes a difference in Elm!"
1510− ]
1511− )
1512
1447
1513 DeclSpace space row col ->
1448 DeclSpace space row col ->
1514 toSpaceReport source space row col
1449 toSpaceReport source space row col
@@ -1538,6 +1473,165 @@ toDeclarationsReport source decl =
1538 )
1473 )
1539
1474
1540
1475
1476+toDeclStartReport :: Code.Source -> Row -> Col -> Report.Report
1477+toDeclStartReport source row col =
1478+ case Code.whatIsNext source row col of
1479+ Code.Close term bracket ->
1480+ let
1481+ region = toRegion row col
1482+ in
1483+ Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1484+ Code.toSnippet source region Nothing
1485+ (
1486+ D.reflow $
1487+ "I was not expecting to see a " ++ term ++ " here:"
1488+ , D.reflow $
1489+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1490+ )
1491+
1492+ Code.Keyword keyword ->
1493+ let
1494+ region = toKeywordRegion row col keyword
1495+ in
1496+ Report.Report "RESERVED WORD" region [] $
1497+ Code.toSnippet source region Nothing
1498+ (
1499+ D.reflow $
1500+ "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1501+ ,
1502+ case keyword of
1503+ "import" ->
1504+ D.reflow $
1505+ "It is reserved for declaring imports at the top of your module. If you want\
1506+ \ another import, try moving it up top with the other imports. If you want to\
1507+ \ define a value or function, try changing the name to something else!"
1508+
1509+ "case" ->
1510+ D.stack
1511+ [ D.reflow $
1512+ "It is reserved for writing `case` expressions. Try using a different name?"
1513+ , D.toSimpleNote $
1514+ "If you are trying to write a `case` expression, it needs to be part of a\
1515+ \ definition. So you could write something like this instead:"
1516+ , D.indent 4 $ D.vcat $
1517+ [ D.indent 0 $ D.fillSep ["getWidth","maybeWidth","="]
1518+ , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1519+ , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1520+ , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1521+ , ""
1522+ , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1523+ , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1524+ ]
1525+ , D.reflow $
1526+ "This defines a `getWidth` function that you can use elsewhere in your program."
1527+ ]
1528+
1529+ "if" ->
1530+ D.stack
1531+ [ D.reflow $
1532+ "It is reserved for writing `if` expressions. Try using a different name?"
1533+ , D.toSimpleNote $
1534+ "If you are trying to write an `if` expression, it needs to be part of a\
1535+ \ definition. So you could write something like this instead:"
1536+ , D.indent 4 $ D.vcat $
1537+ [ "greet name ="
1538+ , D.fillSep $
1539+ [" "
1540+ ,D.cyan "if","name","==",D.dullyellow "\"Abraham Lincoln\""
1541+ ,D.cyan "then",D.dullyellow "\"Greetings Mr. President.\""
1542+ ,D.cyan "else",D.dullyellow "\"Hey!\""
1543+ ]
1544+ ]
1545+ , D.reflow $
1546+ "This defines a `reviewPowerLevel` function that you can use elsewhere in your program."
1547+ ]
1548+
1549+ _ ->
1550+ D.reflow $
1551+ "It is a reserved word. Try changing the name to something else?"
1552+ )
1553+
1554+ Code.Upper c cs ->
1555+ let
1556+ region = toRegion row col
1557+ in
1558+ Report.Report "UNEXPECTED CAPITAL LETTER" region [] $
1559+ Code.toSnippet source region Nothing
1560+ (
1561+ D.reflow $
1562+ "Declarations always start with a lower-case letter, so I am getting stuck here:"
1563+ ,
1564+ D.stack
1565+ [ D.fillSep $
1566+ ["Try","a","name","like"
1567+ ,D.green (D.fromChars (Char.toLower c : cs))
1568+ ,"instead?"
1569+ ]
1570+ , D.toSimpleNote $
1571+ "Here are a couple valid declarations for reference:"
1572+ , D.indent 4 $ D.vcat $
1573+ [ "greet : String -> String"
1574+ , "greet name ="
1575+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1576+ , ""
1577+ , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1578+ ]
1579+ , D.reflow $
1580+ "Notice that they always start with a lower-case letter. Capitalization matters!"
1581+ ]
1582+ )
1583+
1584+ Code.Other (Just char) | elem char ['(', '{', '[', '+', '-', '*', '/', '^', '&', '|', '"', '\'', '!', '@', '#', '$', '%'] ->
1585+ let
1586+ region = toRegion row col
1587+ in
1588+ Report.Report "UNEXPECTED SYMBOL" region [] $
1589+ Code.toSnippet source region Nothing
1590+ (
1591+ D.reflow $
1592+ "I am getting stuck because this line starts with the " ++ [char] ++ " symbol:"
1593+ ,
1594+ D.stack
1595+ [ D.reflow $
1596+ "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1597+ , D.indent 4 $ D.vcat $
1598+ [ "greet : String -> String"
1599+ , "greet name ="
1600+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1601+ , ""
1602+ , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1603+ ]
1604+ , D.reflow $
1605+ "If this is not supposed to be a declaration, try adding some spaces before it?"
1606+ ]
1607+ )
1608+
1609+ _ ->
1610+ let
1611+ region = toRegion row col
1612+ in
1613+ Report.Report "WEIRD DECLARATION" region [] $
1614+ Code.toSnippet source region Nothing
1615+ (
1616+ D.reflow $
1617+ "I am trying to parse a declaration, but I am getting stuck here:"
1618+ ,
1619+ D.stack
1620+ [ D.reflow $
1621+ "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1622+ , D.indent 4 $ D.vcat $
1623+ [ "greet : String -> String"
1624+ , "greet name ="
1625+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1626+ , ""
1627+ , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1628+ ]
1629+ , D.reflow $
1630+ "Try to make your declaration look like one of those? Or if this is not\
1631+ \ supposed to be a declaration, try adding some spaces before it?"
1632+ ]
1633+ )
1634+
1541
1635
1542-- PORT
1636-- PORT
1543
1637
@@ -1664,7 +1758,7 @@ toPortReport source port_ startRow startCol =
1664 [ D.reflow $
1758 [ D.reflow $
1665 "I was expecting to see a type next. Here are examples of outgoing and\
1759 "I was expecting to see a type next. Here are examples of outgoing and\
1666 \ incoming ports for reference:"
1760 \ incoming ports for reference:"
1667− , D.vcat
1761+ , D.indent 4 $ D.vcat $
1668 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1762 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1669 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1763 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1670 ]
1764 ]
@@ -1683,7 +1777,7 @@ portNote =
1683 D.stack
1777 D.stack
1684 [ D.toSimpleNote $
1778 [ D.toSimpleNote $
1685 "Here are some example `port` declarations for reference:"
1779 "Here are some example `port` declarations for reference:"
1686− , D.vcat
1780+ , D.indent 4 $ D.vcat $
1687 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1781 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1688 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1782 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1689 ]
1783 ]
@@ -1866,8 +1960,8 @@ typeAliasNote =
1866 [ D.toSimpleNote $
1960 [ D.toSimpleNote $
1867 "Here is an example of a valid `type alias` for reference:"
1961 "Here is an example of a valid `type alias` for reference:"
1868 , D.vcat $
1962 , D.vcat $
1869− [ D.indent 0 $ D.fillSep [D.cyan "type",D.cyan "alias",D.green "Person","="]
1963+ [ D.indent 4 $ D.fillSep [D.cyan "type",D.cyan "alias","Person","="]
1870− , D.indent 2 $ D.vcat $
1964+ , D.indent 6 $ D.vcat $
1871 ["{ name : String"
1965 ["{ name : String"
1872 ,", age : Int"
1966 ,", age : Int"
1873 ,", height : Float"
1967 ,", height : Float"
@@ -2067,10 +2161,10 @@ customTypeNote =
2067 [ D.toSimpleNote $
2161 [ D.toSimpleNote $
2068 "Here is an example of a valid `type` declaration for reference:"
2162 "Here is an example of a valid `type` declaration for reference:"
2069 , D.vcat $
2163 , D.vcat $
2070− [ D.indent 0 $ D.fillSep [D.cyan "type",D.green "Status"]
2164+ [ D.indent 4 $ D.fillSep [D.cyan "type","Status"]
2071− , D.indent 2 $ D.fillSep ["=","Failure"]
2165+ , D.indent 6 $ D.fillSep ["=","Failure"]
2072− , D.indent 2 $ D.fillSep ["|","Waiting"]
2166+ , D.indent 6 $ D.fillSep ["|","Waiting"]
2073− , D.indent 2 $ D.fillSep ["|","Success","String"]
2167+ , D.indent 6 $ D.fillSep ["|","Success","String"]
2074 ]
2168 ]
2075 , D.reflow $
2169 , D.reflow $
2076 "This defines a new `Status` type with three variants. This could be useful if\
2170 "This defines a new `Status` type with three variants. This could be useful if\
@@ -2142,10 +2236,10 @@ toDeclDefReport source name declDef startRow startCol =
2142 ,"a","type","annotation.","It","could","be","something","else","though,","so"
2236 ,"a","type","annotation.","It","could","be","something","else","though,","so"
2143 ,"here","is","a","valid","definition","for","reference:"
2237 ,"here","is","a","valid","definition","for","reference:"
2144 ]
2238 ]
2145− , D.vcat
2239+ , D.indent 4 $ D.vcat $
2146− [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2240+ [ "greet : String -> String"
2147− , D.fillSep [D.green "add","x","y","="]
2241+ , "greet name ="
2148− , D.fillSep [" ","x","+","y"]
2242+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2149 ]
2243 ]
2150 , D.reflow $
2244 , D.reflow $
2151 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
2245 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2167,10 +2261,10 @@ toDeclDefReport source name declDef startRow startCol =
2167 [ D.reflow $
2261 [ D.reflow $
2168 "I am not sure what is going wrong exactly, so here is a valid\
2262 "I am not sure what is going wrong exactly, so here is a valid\
2169 \ definition (with an optional type annotation) for reference:"
2263 \ definition (with an optional type annotation) for reference:"
2170− , D.vcat
2264+ , D.indent 4 $ D.vcat $
2171− [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2265+ [ "greet : String -> String"
2172− , D.fillSep [D.green "add","x","y","="]
2266+ , "greet name ="
2173− , D.fillSep [" ","x","+","y"]
2267+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2174 ]
2268 ]
2175 , D.reflow $
2269 , D.reflow $
2176 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
2270 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2192,10 +2286,10 @@ toDeclDefReport source name declDef startRow startCol =
2192 [ D.reflow $
2286 [ D.reflow $
2193 "I am not sure what is going wrong exactly, so here is a valid\
2287 "I am not sure what is going wrong exactly, so here is a valid\
2194 \ definition (with an optional type annotation) for reference:"
2288 \ definition (with an optional type annotation) for reference:"
2195− , D.vcat
2289+ , D.indent 4 $ D.vcat $
2196− [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2290+ [ "greet : String -> String"
2197− , D.fillSep [D.green "add","x","y","="]
2291+ , "greet name ="
2198− , D.fillSep [" ","x","+","y"]
2292+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2199 ]
2293 ]
2200 , D.reflow $
2294 , D.reflow $
2201 "Try to use that format!"
2295 "Try to use that format!"
@@ -2310,10 +2404,10 @@ declDefNote =
2310 D.stack
2404 D.stack
2311 [ D.reflow $
2405 [ D.reflow $
2312 "Here is a valid definition (with a type annotation) for reference:"
2406 "Here is a valid definition (with a type annotation) for reference:"
2313− , D.vcat
2407+ , D.indent 4 $ D.vcat $
2314− [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2408+ [ "greet : String -> String"
2315− , D.fillSep [D.green "add","x","y","="]
2409+ , "greet name ="
2316− , D.fillSep [" ","x","+","y"]
2410+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2317 ]
2411 ]
2318 , D.reflow $
2412 , D.reflow $
2319 "The top line (called a \"type annotation\") is optional. You can leave it off\
2413 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -2497,7 +2591,7 @@ toExprReport source context expr startRow startCol =
2497 ,"give","a","more","specific","hint!"
2591 ,"give","a","more","specific","hint!"
2498 ]
2592 ]
2499 , D.toSimpleNote $
2593 , D.toSimpleNote $
2500− "This can also happen if run into reserved words like `let` or `as` unexpectedly.\
2594+ "This can also happen if I run into reserved words like `let` or `as` unexpectedly.\
2501 \ Or if I run into operators in unexpected spots. Point is, there are a\
2595 \ Or if I run into operators in unexpected spots. Point is, there are a\
2502 \ couple ways I can get confused and give sort of weird advice!"
2596 \ couple ways I can get confused and give sort of weird advice!"
2503 ]
2597 ]
@@ -2646,17 +2740,15 @@ toStringReport source string row col =
2646 , D.toSimpleNote $
2740 , D.toSimpleNote $
2647 "For a string that spans multiple lines, you can use the multi-line string\
2741 "For a string that spans multiple lines, you can use the multi-line string\
2648 \ syntax like this:"
2742 \ syntax like this:"
2649− , D.vcat
2743+ , D.dullyellow $ D.indent 4 $ D.vcat $
2650− [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2744+ [ "\"\"\""
2651− , mempty
2652− , D.dullyellow "# Multi-line Strings"
2745+ , "# Multi-line Strings"
2653− , mempty
2746+ , ""
2654− , D.dullyellow "- start with triple double quotes"
2747+ , "- start with triple double quotes"
2655− , D.dullyellow "- write whatever you want"
2748+ , "- write whatever you want"
2656− , D.dullyellow "- no need to escape newlines or double quotes"
2749+ , "- no need to escape newlines or double quotes"
2657− , D.dullyellow "- end with triple double quotes"
2750+ , "- end with triple double quotes"
2658− , mempty
2659− , D.dullyellow "\"\"\""
2751+ , "\"\"\""
2660 ]
2752 ]
2661 ]
2753 ]
2662 )
2754 )
@@ -2675,17 +2767,15 @@ toStringReport source string row col =
2675 [ D.reflow "Add a \"\"\" somewhere after this to end the string."
2767 [ D.reflow "Add a \"\"\" somewhere after this to end the string."
2676 , D.toSimpleNote $
2768 , D.toSimpleNote $
2677 "Here is a valid multi-line string for reference:"
2769 "Here is a valid multi-line string for reference:"
2678− , D.vcat
2770+ , D.dullyellow $ D.indent 4 $ D.vcat $
2679− [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2771+ [ "\"\"\""
2680− , mempty
2681− , D.dullyellow "# Multi-line Strings"
2772+ , "# Multi-line Strings"
2682− , mempty
2773+ , ""
2683− , D.dullyellow "- start with triple double quotes"
2774+ , "- start with triple double quotes"
2684− , D.dullyellow "- write whatever you want"
2775+ , "- write whatever you want"
2685− , D.dullyellow "- no need to escape newlines or double quotes"
2776+ , "- no need to escape newlines or double quotes"
2686− , D.dullyellow "- end with triple double quotes"
2777+ , "- end with triple double quotes"
2687− , mempty
2688− , D.dullyellow "\"\"\""
2778+ , "\"\"\""
2689 ]
2779 ]
2690 ]
2780 ]
2691 )
2781 )
@@ -3150,8 +3240,8 @@ toUnfinishLetReport source row col startRow startCol message =
3150 [ message
3240 [ message
3151 , D.toSimpleNote $
3241 , D.toSimpleNote $
3152 "Here is an example with a valid `let` expression for reference:"
3242 "Here is an example with a valid `let` expression for reference:"
3153− , D.vcat $
3243+ , D.indent 4 $ D.vcat $
3154− [ D.indent 0 $ D.fillSep [D.green "viewPerson","person","="]
3244+ [ D.indent 0 $ D.fillSep ["viewPerson","person","="]
3155 , D.indent 2 $ D.fillSep [D.cyan "let"]
3245 , D.indent 2 $ D.fillSep [D.cyan "let"]
3156 , D.indent 4 $ D.fillSep ["fullName","="]
3246 , D.indent 4 $ D.fillSep ["fullName","="]
3157 , D.indent 6 $ D.fillSep ["person.firstName","++",D.dullyellow "\" \"","++","person.lastName"]
3247 , D.indent 6 $ D.fillSep ["person.firstName","++",D.dullyellow "\" \"","++","person.lastName"]
@@ -3269,10 +3359,10 @@ toLetDefReport source name def startRow startCol =
3269 ,"a","type","annotation.","It","could","be","something","else","though,","so"
3359 ,"a","type","annotation.","It","could","be","something","else","though,","so"
3270 ,"here","is","a","valid","definition","for","reference:"
3360 ,"here","is","a","valid","definition","for","reference:"
3271 ]
3361 ]
3272− , D.vcat
3362+ , D.indent 4 $ D.vcat $
3273− [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3363+ [ "greet : String -> String"
3274− , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3364+ , "greet name ="
3275− , D.indent 6 $ D.fillSep ["x","+","y"]
3365+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3276 ]
3366 ]
3277 , D.reflow $
3367 , D.reflow $
3278 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
3368 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3294,10 +3384,10 @@ toLetDefReport source name def startRow startCol =
3294 [ D.reflow $
3384 [ D.reflow $
3295 "I am not sure what is going wrong exactly, so here is a valid\
3385 "I am not sure what is going wrong exactly, so here is a valid\
3296 \ definition (with an optional type annotation) for reference:"
3386 \ definition (with an optional type annotation) for reference:"
3297− , D.vcat
3387+ , D.indent 4 $ D.vcat $
3298− [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3388+ [ "greet : String -> String"
3299− , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3389+ , "greet name ="
3300− , D.indent 6 $ D.fillSep ["x","+","y"]
3390+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3301 ]
3391 ]
3302 , D.reflow $
3392 , D.reflow $
3303 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
3393 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3319,10 +3409,10 @@ toLetDefReport source name def startRow startCol =
3319 [ D.reflow $
3409 [ D.reflow $
3320 "I am not sure what is going wrong exactly, so here is a valid\
3410 "I am not sure what is going wrong exactly, so here is a valid\
3321 \ definition (with an optional type annotation) for reference:"
3411 \ definition (with an optional type annotation) for reference:"
3322− , D.vcat
3412+ , D.indent 4 $ D.vcat $
3323− [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3413+ [ "greet : String -> String"
3324− , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3414+ , "greet name ="
3325− , D.indent 4 $ D.fillSep ["x","+","y"]
3415+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3326 ]
3416 ]
3327 , D.reflow $
3417 , D.reflow $
3328 "Try to use that format!"
3418 "Try to use that format!"
@@ -3412,10 +3502,10 @@ defNote =
3412 D.stack
3502 D.stack
3413 [ D.reflow $
3503 [ D.reflow $
3414 "Here is a valid definition (with a type annotation) for reference:"
3504 "Here is a valid definition (with a type annotation) for reference:"
3415− , D.vcat
3505+ , D.indent 4 $ D.vcat $
3416− [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3506+ [ "greet : String -> String"
3417− , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3507+ , "greet name ="
3418− , D.indent 6 $ D.fillSep ["x","+","y"]
3508+ , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3419 ]
3509 ]
3420 , D.reflow $
3510 , D.reflow $
3421 "The top line (called a \"type annotation\") is optional. You can leave it off\
3511 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -4056,11 +4146,13 @@ toRecordReport source context record startRow startCol =
4056 D.reflow $
4146 D.reflow $
4057 "I just saw the opening curly brace of a record, but then I got stuck here:"
4147 "I just saw the opening curly brace of a record, but then I got stuck here:"
4058 ,
4148 ,
4059− addNoteForRecordIndentError $
4149+ D.stack
4060− D.fillSep $
4150+ [ D.fillSep $
4061− ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
4151+ ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
4062− ,"Try","defining","some","fields","of","your","own?"
4152+ ,"Try","defining","some","fields","of","your","own?"
4153+ ]
4154+ , noteForRecordIndentError
4063− ]
4155+ ]
4064 )
4156 )
4065
4157
4066 RecordIndentEnd row col ->
4158 RecordIndentEnd row col ->
@@ -4094,11 +4186,13 @@ toRecordReport source context record startRow startCol =
4094 D.reflow $
4186 D.reflow $
4095 "I was partway through parsing a record, but I got stuck here:"
4187 "I was partway through parsing a record, but I got stuck here:"
4096 ,
4188 ,
4097− addNoteForRecordIndentError $
4189+ D.stack
4098− D.fillSep $
4190+ [ D.fillSep $
4099− ["I","was","expecting","to","see","a","closing","curly","brace","next."
4191+ ["I","was","expecting","to","see","a","closing","curly","brace","next."
4100− ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
4192+ ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
4193+ ]
4194+ , noteForRecordIndentError
4101− ]
4195+ ]
4102 )
4196 )
4103
4197
4104 RecordIndentField row col ->
4198 RecordIndentField row col ->
@@ -4133,10 +4227,12 @@ toRecordReport source context record startRow startCol =
4133 "I am partway through parsing a record. I just saw a record\
4227 "I am partway through parsing a record. I just saw a record\
4134 \ field, so I was expecting to see an equals sign next:"
4228 \ field, so I was expecting to see an equals sign next:"
4135 ,
4229 ,
4136− addNoteForRecordIndentError $
4230+ D.stack
4137− D.fillSep $
4231+ [ D.fillSep $
4138− ["Try","putting","an",D.green "=","followed","by","an","expression?"
4232+ ["Try","putting","an",D.green "=","followed","by","an","expression?"
4233+ ]
4234+ , noteForRecordIndentError
4139− ]
4235+ ]
4140 )
4236 )
4141
4237
4142 RecordIndentExpr row col ->
4238 RecordIndentExpr row col ->
@@ -4150,11 +4246,13 @@ toRecordReport source context record startRow startCol =
4150 D.reflow $
4246 D.reflow $
4151 "I am partway through parsing a record, and I was expecting to run into an expression next:"
4247 "I am partway through parsing a record, and I was expecting to run into an expression next:"
4152 ,
4248 ,
4153− addNoteForRecordIndentError $
4249+ D.stack
4154− D.fillSep $
4250+ [ D.fillSep $
4155− ["Try","putting","something","like"
4251+ ["Try","putting","something","like"
4156− ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4252+ ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4253+ ]
4254+ , noteForRecordIndentError
4157− ]
4255+ ]
4158 )
4256 )
4159
4257
4160
4258
@@ -4164,9 +4262,9 @@ noteForRecordError =
4164 [ D.toSimpleNote
4262 [ D.toSimpleNote
4165 "If you are trying to define a record across multiple lines, I recommend using this format:"
4263 "If you are trying to define a record across multiple lines, I recommend using this format:"
4166 , D.indent 4 $ D.vcat $
4264 , D.indent 4 $ D.vcat $
4167− [ "{ name = \"Alice\""
4265+ [ "{ name = " <> D.dullyellow "\"Alice\""
4168− , ", age = 42"
4266+ , ", age = " <> D.dullyellow "42"
4169− , ", height = 1.75"
4267+ , ", height = " <> D.dullyellow "1.75"
4170 , "}"
4268 , "}"
4171 ]
4269 ]
4172 , D.reflow $
4270 , D.reflow $
@@ -4175,18 +4273,16 @@ noteForRecordError =
4175 ]
4273 ]
4176
4274
4177
4275
4178−addNoteForRecordIndentError :: D.Doc -> D.Doc
4276+noteForRecordIndentError :: D.Doc
4179−addNoteForRecordIndentError normalRecommendation =
4277+noteForRecordIndentError =
4180− D.stack $
4278+ D.stack
4181− normalRecommendation
4182− :
4183 [ D.toSimpleNote
4279 [ D.toSimpleNote
4184 "I may be confused by indentation. For example, if you are trying to define\
4280 "I may be confused by indentation. For example, if you are trying to define\
4185 \ a record across multiple lines, I recommend using this format:"
4281 \ a record across multiple lines, I recommend using this format:"
4186 , D.indent 4 $ D.vcat $
4282 , D.indent 4 $ D.vcat $
4187− [ "{ name = \"Alice\""
4283+ [ "{ name = " <> D.dullyellow "\"Alice\""
4188− , ", age = 42"
4284+ , ", age = " <> D.dullyellow "42"
4189− , ", height = 1.75"
4285+ , ", height = " <> D.dullyellow "1.75"
4190 , "}"
4286 , "}"
4191 ]
4287 ]
4192 , D.reflow $
4288 , D.reflow $
@@ -4380,9 +4476,9 @@ toListReport source context list startRow startCol =
4380 , D.toSimpleNote
4476 , D.toSimpleNote
4381 "I recommend using the following format for lists that span multiple lines:"
4477 "I recommend using the following format for lists that span multiple lines:"
4382 , D.indent 4 $ D.vcat $
4478 , D.indent 4 $ D.vcat $
4383− [ "[ \"Alice\""
4479+ [ "[ " <> D.dullyellow "\"Alice\""
4384− , ", \"Bob\""
4480+ , ", " <> D.dullyellow "\"Bob\""
4385− , ", \"Chuck\""
4481+ , ", " <> D.dullyellow "\"Chuck\""
4386 , "]"
4482 , "]"
4387 ]
4483 ]
4388 , D.reflow $
4484 , D.reflow $
@@ -4440,9 +4536,9 @@ toListReport source context list startRow startCol =
4440 "I may be confused by indentation. For example, if you are trying to define\
4536 "I may be confused by indentation. For example, if you are trying to define\
4441 \ a list across multiple lines, I recommend using this format:"
4537 \ a list across multiple lines, I recommend using this format:"
4442 , D.indent 4 $ D.vcat $
4538 , D.indent 4 $ D.vcat $
4443− [ "[ \"Alice\""
4539+ [ "[ " <> D.dullyellow "\"Alice\""
4444− , ", \"Bob\""
4540+ , ", " <> D.dullyellow "\"Bob\""
4445− , ", \"Chuck\""
4541+ , ", " <> D.dullyellow "\"Chuck\""
4446 , "]"
4542 , "]"
4447 ]
4543 ]
4448 , D.reflow $
4544 , D.reflow $
@@ -4471,9 +4567,9 @@ toListReport source context list startRow startCol =
4471 "I may be confused by indentation. For example, if you are trying to define\
4567 "I may be confused by indentation. For example, if you are trying to define\
4472 \ a list across multiple lines, I recommend using this format:"
4568 \ a list across multiple lines, I recommend using this format:"
4473 , D.indent 4 $ D.vcat $
4569 , D.indent 4 $ D.vcat $
4474− [ "[ \"Alice\""
4570+ [ "[ " <> D.dullyellow "\"Alice\""
4475− , ", \"Bob\""
4571+ , ", " <> D.dullyellow "\"Bob\""
4476− , ", \"Chuck\""
4572+ , ", " <> D.dullyellow "\"Chuck\""
4477 , "]"
4573 , "]"
4478 ]
4574 ]
4479 , D.reflow $
4575 , D.reflow $
@@ -4499,9 +4595,9 @@ toListReport source context list startRow startCol =
4499 , D.toSimpleNote
4595 , D.toSimpleNote
4500 "I recommend using the following format for lists that span multiple lines:"
4596 "I recommend using the following format for lists that span multiple lines:"
4501 , D.indent 4 $ D.vcat $
4597 , D.indent 4 $ D.vcat $
4502− [ "[ \"Alice\""
4598+ [ "[ " <> D.dullyellow "\"Alice\""
4503− , ", \"Bob\""
4599+ , ", " <> D.dullyellow "\"Bob\""
4504− , ", \"Chuck\""
4600+ , ", " <> D.dullyellow "\"Chuck\""
4505 , "]"
4601 , "]"
4506 ]
4602 ]
4507 , D.reflow $
4603 , D.reflow $
compiler/src/Reporting/Render/Code.hs+35−24
@@ -122,7 +122,7 @@ makeUnderline width realEndLine (A.Region (A.Position start c1) (A.Position end
122 spaces = replicate (fromIntegral c1 + width + 1) ' '
122 spaces = replicate (fromIntegral c1 + width + 1) ' '
123 zigzag = replicate (max 1 (fromIntegral (c2 - c1))) '^'
123 zigzag = replicate (max 1 (fromIntegral (c2 - c1))) '^'
124 in
124 in
125− Just (D.fromChars spaces <> D.dullred (D.fromChars zigzag))
125+ Just (D.fromChars spaces <> D.red (D.fromChars zigzag))
126
126
127
127
128drawLines :: Bool -> Int -> A.Region -> [(Word16, String)] -> Doc -> Doc
128drawLines :: Bool -> Int -> A.Region -> [(Word16, String)] -> Doc -> Doc
@@ -148,7 +148,7 @@ addLineNumber addZigZag width start end n line =
148
148
149 spacer =
149 spacer =
150 if addZigZag && start <= n && n <= end then
150 if addZigZag && start <= n && n <= end then
151− D.dullred ">"
151+ D.red ">"
152 else
152 else
153 " "
153 " "
154 in
154 in
@@ -183,8 +183,8 @@ renderPair source@(Source sourceLines) region1 region2 =
183 OneLine $
183 OneLine $
184 D.vcat
184 D.vcat
185 [ D.fromChars lineNumber <> "| " <> D.fromChars line
185 [ D.fromChars lineNumber <> "| " <> D.fromChars line
186− , D.fromChars spaces1 <> D.dullred (D.fromChars zigzag1) <>
186+ , D.fromChars spaces1 <> D.red (D.fromChars zigzag1) <>
187− D.fromChars spaces2 <> D.dullred (D.fromChars zigzag2)
187+ D.fromChars spaces2 <> D.red (D.fromChars zigzag2)
188 ]
188 ]
189
189
190 else
190 else
@@ -201,6 +201,8 @@ data Next
201 = Keyword [Char]
201 = Keyword [Char]
202 | Operator [Char]
202 | Operator [Char]
203 | Close [Char] Char
203 | Close [Char] Char
204+ | Upper Char [Char]
205+ | Lower Char [Char]
204 | Other (Maybe Char)
206 | Other (Maybe Char)
205
207
206
208
@@ -211,25 +213,34 @@ whatIsNext (Source sourceLines) row col =
211 Other Nothing
213 Other Nothing
212
214
213 Just line ->
215 Just line ->
214− let
215− chars = drop (fromIntegral col - 1) line
216+ case drop (fromIntegral col - 1) line of
216− keywords = map Name.toChars (Set.toList reservedWords)
217+ [] ->
217− in
218+ Other Nothing
218− case List.find (startsWithKeyword chars) keywords of
219+
219− Just keyword ->
220+ c:cs
220− Keyword keyword
221+ | Char.isUpper c -> Upper c (takeWhile isInner cs)
221−
222+ | Char.isLower c -> detectKeywords c cs
222− Nothing ->
223− case chars of
224− [] ->
225− Other Nothing
226−
227− c:cs
228− | isSymbol c -> Operator (c : takeWhile isSymbol cs)
223+ | isSymbol c -> Operator (c : takeWhile isSymbol cs)
229− | c == ')' -> Close "parenthesis" ')'
224+ | c == ')' -> Close "parenthesis" ')'
230− | c == ']' -> Close "square bracket" ']'
225+ | c == ']' -> Close "square bracket" ']'
231− | c == '}' -> Close "curly brace" '}'
226+ | c == '}' -> Close "curly brace" '}'
232− | otherwise -> Other (Just c)
227+ | otherwise -> Other (Just c)
228+
229+
230+detectKeywords :: Char -> [Char] -> Next
231+detectKeywords c rest =
232+ let
233+ cs = takeWhile isInner rest
234+ name = c : cs
235+ in
236+ if Set.member (Name.fromChars name) reservedWords
237+ then Keyword name
238+ else Lower c name
239+
240+
241+isInner :: Char -> Bool
242+isInner char =
243+ Char.isAlphaNum char || char == '_'
233
244
234
245
235isSymbol :: Char -> Bool
246isSymbol :: Char -> Bool
@@ -246,7 +257,7 @@ startsWithKeyword restOfLine keyword =
246 True
257 True
247
258
248 c:_ ->
259 c:_ ->
249− not (Char.isAlphaNum c || c == '_')
260+ not (isInner c)
250
261
251
262
252nextLineStartsWithKeyword :: [Char] -> Source -> Row -> Maybe (Row, Col)
263nextLineStartsWithKeyword :: [Char] -> Source -> Row -> Maybe (Row, Col)
compiler/src/Reporting/Render/Type/Localizer.hs+5−5
@@ -112,9 +112,9 @@ toExposing exposing =
112 Only (foldr addType Set.empty exposedList)
112 Only (foldr addType Set.empty exposedList)
113
113
114
114
115−addType :: A.Located Src.Exposed -> Set.Set Name.Name -> Set.Set Name.Name
115+addType :: Src.Exposed -> Set.Set Name.Name -> Set.Set Name.Name
116−addType (A.At _ exposed) types =
116+addType exposed types =
117 case exposed of
117 case exposed of
118− Src.Lower _ -> types
118+ Src.Lower _ -> types
119− Src.Upper name _ -> Set.insert name types
119+ Src.Upper (A.At _ name) _ -> Set.insert name types
120− Src.Operator _ -> types
120+ Src.Operator _ _ -> types
docs/elm.json/application.md+2−2
@@ -8,7 +8,7 @@ This is a decent baseline for pretty much any applications made with Elm. You wi
8 "source-directories": [
8 "source-directories": [
9 "src"
9 "src"
10 ],
10 ],
11− "elm-version": "0.19.0",
11+ "elm-version": "0.19.1",
12 "dependencies": {
12 "dependencies": {
13 "direct": {
13 "direct": {
14 "elm/browser": "1.0.0",
14 "elm/browser": "1.0.0",
@@ -48,7 +48,7 @@ A list of directories where Elm code lives. Most projects just use `"src"` for e
48
48
49## `"elm-version"`
49## `"elm-version"`
50
50
51−The exact version of Elm this builds with. Should be `"0.19.0"` for most people!
51+The exact version of Elm this builds with. Should be `"0.19.1"` for most people!
52
52
53<br>
53<br>
54
54
docs/elm.json/package.md+1−1
@@ -49,7 +49,7 @@ A short summary that will appear on [`package.elm-lang.org`](https://package.elm
49
49
50## `"license"`
50## `"license"`
51
51
52−An OSI approved SPDX code like `"BSD-3-Clause"` or `"MIT"`. These are the two most common licenses in the Elm ecosystem, but you can see the full list of options [here](https://spdx.org/licenses/).
52+An OSI approved SPDX code like `"BSD-3-Clause"` or `"MIT"`. These are the two most common licenses in the Elm ecosystem, and BSD-3-Clause is a good default. But you can see the full list of options [here](https://spdx.org/licenses/).
53
53
54<br>
54<br>
55
55
upgrade-docs/0.16.md → docs/upgrade-instructions/0.16.mdrenamed

The content is the same.

upgrade-docs/0.17.md → docs/upgrade-instructions/0.17.mdrenamed

The content is the same.

upgrade-docs/0.18.md → docs/upgrade-instructions/0.18.mdrenamed

The content is the same.

upgrade-docs/0.19.md → docs/upgrade-instructions/0.19.0.mdrenamed

The content is the same.

docs/upgrade-instructions/0.19.1.mdnew file+60
@@ -0,0 +1,60 @@
1+# Upgrading to 0.19.1
2+
3+**There are no language changes**, so once you swap to `"elm-version": "0.19.1"` in your `elm.json`, most users should be able to proceed without any further code changes. **You may run into a handful of bugfixes though!** These cases are outlined below!
4+
5+
6+<br>
7+
8+## Improvements
9+
10+- Parse error message quality (like [this](https://github.com/elm/error-message-catalog/issues/255) and [this](https://github.com/elm/error-message-catalog/issues/225))
11+- Faster compilation, especially for incremental compiles
12+- Uses filelocks so that cached files are not corrupted when plugins run `elm make` multiple times on the same project at the same time. (Still worth avoiding that though!)
13+- More intuitive multiline declarations in REPL
14+- Various bug fixes (e.g. `--debug`, `x /= 0`, `type Height = Height Float` in `--optimize`)
15+
16+
17+<br>
18+
19+## Detectable Bug Fixes
20+
21+There are three known cases where code that compiled with 0.19.0 will not compile with 0.19.1 due to bug fixes:
22+
23+
24+### 1. Ambiguous Imports
25+
26+Say you have an import like this:
27+
28+```elm
29+import Html exposing (min)
30+import Regex exposing (never)
31+
32+x = min
33+y = never
34+```
35+
36+These should be reported as ambiguous usages since the names are also exposed by `Basics`, but there was a regression in 0.19.0 described [here](https://github.com/elm/compiler/issues/1945) such that they weren't caught in specific circumstances.
37+
38+The fix is to use a qualified name like `Html.min` or `Regex.never` to make it unambiguous.
39+
40+We found a couple instances of this in packages and have submitted PRs to the relevant authors in August 2019. You may run into this in your own code as well.
41+
42+For more details on why this is considered a regression, check out the details [here](https://github.com/elm/compiler/issues/1945#issuecomment-507871919) or try it in 0.18.0 to see how it worked before.
43+
44+
45+### 2. Tabs in Comments
46+
47+The 0.19.0 binaries did not catch tab characters in comments. The new parser is better at checking for tabs, so it will object when it finds these.
48+
49+Again, we found this in some packages and reached out to the relevant authors with PRs so patches would be published before the 0.19.1 release.
50+
51+
52+### 3. Port Module with no Ports
53+
54+If you have any files that start with:
55+
56+```elm
57+port module Main exposing (..)
58+```
59+
60+But they do not actually have any `port` declarations, the 0.19.1 binary will ask you to switch to a normal module declaration like `module Main exposing (..)`
upgrade-docs/earlier.md → docs/upgrade-instructions/earlier.mdrenamed

The content is the same.

elm.cabal+6−5
@@ -45,6 +45,7 @@ Executable elm
45 Hs-Source-Dirs:
45 Hs-Source-Dirs:
46 compiler/src
46 compiler/src
47 builder/src
47 builder/src
48+ terminal/impl
48 terminal/src
49 terminal/src
49
50
50 other-extensions:
51 other-extensions:
@@ -64,11 +65,11 @@ Executable elm
64 Repl
65 Repl
65
66
66 -- terminal args
67 -- terminal args
67− Terminal.Args
68+ Terminal
68− Terminal.Args.Chomp
69+ Terminal.Chomp
69− Terminal.Args.Error
70+ Terminal.Error
70− Terminal.Args.Helpers
71+ Terminal.Helpers
71− Terminal.Args.Internal
72+ Terminal.Internal
72
73
73 -- from terminal/
74 -- from terminal/
74 Develop.Generate.Help
75 Develop.Generate.Help
hints/bad-recursion.md+1−1
@@ -10,7 +10,7 @@ There are two problems that will lead you here, both of them pretty tricky:
10
10
11## No Mutation
11## No Mutation
12
12
13−Languages like JavaScript let you “reassign” variables. When you say `x = x + 1` it means: whatever `x` was pointing to, have it point to `x + 1` instead. This called *mutating* a variable. All values are immutable in Elm, so reassigning variables does not make any sense! Okay, so what *should* `x = x + 1` mean in Elm?
13+Languages like JavaScript let you “reassign” variables. When you say `x = x + 1` it means: whatever `x` was pointing to, have it point to `x + 1` instead. This is called *mutating* a variable. All values are immutable in Elm, so reassigning variables does not make any sense! Okay, so what *should* `x = x + 1` mean in Elm?
14
14
15Well, what does it mean with functions? In Elm, we write recursive functions like this:
15Well, what does it mean with functions? In Elm, we write recursive functions like this:
16
16
hints/comparing-custom-types.md+1−1
@@ -54,7 +54,7 @@ add info (Table nextId dict) =
54 )
54 )
55```
55```
56
56
57−There are a couple nice thing about this approach:
57+There are a couple nice things about this approach:
58
58
591. The only way to get a new `User.Id` is to `add` information to a `User.Table`.
591. The only way to get a new `User.Id` is to `add` information to a `User.Table`.
602. All the operations on a `User.Table` are explicit. Does it make sense to remove users? To merge two tables together? Are there any special details to consider in those cases? This will always be captured explicitly in the interface of the `User` module.
602. All the operations on a `User.Table` are explicit. Does it make sense to remove users? To merge two tables together? Are there any special details to consider in those cases? This will always be captured explicitly in the interface of the `User` module.
hints/comparing-records.md+3−3
@@ -7,7 +7,7 @@ This page aims to catalog these scenarios and offer alternative paths that can g
7
7
8## Sorting Records
8## Sorting Records
9
9
10−Say we want a `view` function that can show a list of students sorted by different characterists.
10+Say we want a `view` function that can show a list of students sorted by different characteristics.
11
11
12We could create something like this:
12We could create something like this:
13
13
@@ -23,7 +23,7 @@ type alias Student =
23type Order = Name | Age | GPA
23type Order = Name | Age | GPA
24
24
25viewStudents : Order -> List Student -> Html msg
25viewStudents : Order -> List Student -> Html msg
26−viewStudents order studentns =
26+viewStudents order students =
27 let
27 let
28 orderlyStudents =
28 orderlyStudents =
29 case order of
29 case order of
@@ -54,7 +54,7 @@ type alias Student =
54 }
54 }
55
55
56viewStudents : Order -> List Student -> Html msg
56viewStudents : Order -> List Student -> Html msg
57−viewStudents order studentns =
57+viewStudents order students =
58 let
58 let
59 orderlyStudents =
59 orderlyStudents =
60 case order of
60 case order of
hints/implicit-casts.md+1−4
@@ -16,9 +16,6 @@ Languages that will add in implicit casts for addition include:
16
16
17These languages generally agree that an `Int` may be implicitly cast to a `Float` when necessary. So everyone is doing it, why not Elm?!
17These languages generally agree that an `Int` may be implicitly cast to a `Float` when necessary. So everyone is doing it, why not Elm?!
18
18
19−> **Note:** Ruby does not follow the trend. They implicitly cast a `Float` to an `Int`, truncating all the decimal points!
20−
21−
22## Type Inference + Implicit Casts
19## Type Inference + Implicit Casts
23
20
24Elm comes from the ML-family of languages. Languages in the ML-family that **never** do implicit casts include:
21Elm comes from the ML-family of languages. Languages in the ML-family that **never** do implicit casts include:
@@ -41,7 +38,7 @@ So for any ML-family language designed before Scala, it is safe to assume that i
41
38
42 2. Based on experience reports from Scala users, it seemed like the convenience was not worth the hidden cost. Yes, you can convert `n` in `(n + 1.5)` and everything is nice, but when you are in larger programs that are sparsely annotated, it can be quite difficult to figure out what is going on.
39 2. Based on experience reports from Scala users, it seemed like the convenience was not worth the hidden cost. Yes, you can convert `n` in `(n + 1.5)` and everything is nice, but when you are in larger programs that are sparsely annotated, it can be quite difficult to figure out what is going on.
43
40
44−This user data may be confounded by the fact that Scala allows quite extensive conversions, not just from `Int` to `Float`, but I think it is worth taking seriously nonetheless. So it is _possible_, but it is has tradeoffs.
41+This user data may be confounded by the fact that Scala allows quite extensive conversions, not just from `Int` to `Float`, but I think it is worth taking seriously nonetheless. So it is _possible_, but it has tradeoffs.
45
42
46
43
47## Conclusion
44## Conclusion
hints/import-cycles.md+1−1
@@ -55,7 +55,7 @@ type alias User =
55 }
55 }
56```
56```
57
57
58−Notice that the `Comment` type alias is defined in terms of the `User` type alias and vice versa. Having recursive type aliases like this does not work! That problem is described in depth [here](recursive-alias), but the quick takeaway is that one `type alias` needs to become a `type` to break the recursion. So let’s try again:
58+Notice that the `Comment` type alias is defined in terms of the `User` type alias and vice versa. Having recursive type aliases like this does not work! That problem is described in depth [here](recursive-alias.md), but the quick takeaway is that one `type alias` needs to become a `type` to break the recursion. So let’s try again:
59
59
60```elm
60```elm
61module BadCombination2 exposing (..)
61module BadCombination2 exposing (..)
hints/optimize.md+2−2
@@ -21,7 +21,7 @@ Putting those together, here is how I would optimize `src/Main.elm` with two ter
21
21
22```bash
22```bash
23elm make src/Main.elm --optimize --output=elm.js
23elm make src/Main.elm --optimize --output=elm.js
24−uglifyjs elm.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output=elm.min.js
24+uglifyjs elm.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output elm.min.js
25```
25```
26
26
27After this you will have an `elm.js` and a significantly smaller `elm.min.js` file!
27After this you will have an `elm.js` and a significantly smaller `elm.min.js` file!
@@ -46,7 +46,7 @@ min="elm.min.js"
46
46
47elm make --optimize --output=$js $@
47elm make --optimize --output=$js $@
48
48
49−uglifyjs $js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output=$min
49+uglifyjs $js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output $min
50
50
51echo "Initial size: $(cat $js | wc -c) bytes ($js)"
51echo "Initial size: $(cat $js | wc -c) bytes ($js)"
52echo "Minified size:$(cat $min | wc -c) bytes ($min)"
52echo "Minified size:$(cat $min | wc -c) bytes ($min)"
hints/recursive-alias.md+2−2
@@ -39,7 +39,7 @@ It is much easier to write down `Person` in a type, and then it will just expand
39
39
40## Recursive type aliases?
40## Recursive type aliases?
41
41
42−Okay, so lets say you have some type that may contain itself. In Elm, a common example of this is a comment that might have subcomments:
42+Okay, so let's say you have some type that may contain itself. In Elm, a common example of this is a comment that might have subcomments:
43
43
44```elm
44```elm
45type alias Comment =
45type alias Comment =
@@ -102,7 +102,7 @@ type Comment =
102 }
102 }
103```
103```
104
104
105−Now lets say you want to register an upvote on a comment:
105+Now let's say you want to register an upvote on a comment:
106
106
107```elm
107```elm
108upvote : Comment -> Comment
108upvote : Comment -> Comment
hints/type-annotations.md+1−3
@@ -8,7 +8,7 @@ This document is going to outline the various things that can go wrong and show
8
8
9## Annotation vs. Definition
9## Annotation vs. Definition
10
10
11−The most common issue is with user-defined type variables that are too general. So lets say you have defined a function like this:
11+The most common issue is with user-defined type variables that are too general. So let's say you have defined a function like this:
12
12
13```elm
13```elm
14addPair : (a, a) -> a
14addPair : (a, a) -> a
@@ -58,5 +58,3 @@ filter isOkay list =
58This case is very unfortunate because all the type annotations are correct, but there is a detail of how type inference works right now that **user-defined type variables are not shared between annotations**. This can lead to probably the worst type error messages we have because the problem here is that `a` in the outer annotation does not equal `a` in the inner annotation.
58This case is very unfortunate because all the type annotations are correct, but there is a detail of how type inference works right now that **user-defined type variables are not shared between annotations**. This can lead to probably the worst type error messages we have because the problem here is that `a` in the outer annotation does not equal `a` in the inner annotation.
59
59
60For now the best route is to leave off the inner annotation. It is unfortunate, and hopefully we will be able to do a nicer thing in future releases.
60For now the best route is to leave off the inner annotation. It is unfortunate, and hopefully we will be able to do a nicer thing in future releases.
61−
62−"""
installers/README.mdnew file+32
@@ -0,0 +1,32 @@
1+# Installing Elm
2+
3+The normal path is to work through [the guide](https://guide.elm-lang.org/) until you need to install, but you can skip to installation directly by going [here](https://guide.elm-lang.org/install/terminal.html).
4+
5+
6+<br/>
7+
8+## Installing Multiple Versions
9+
10+The secret is that Elm is just a single executable file. If you are developing a project in `~/Desktop/project/` you can download this file into that directory and run commands like `~/Desktop/project/elm make src/Main.elm` or `./elm make src/Main.elm`. You just run the local copy of the executable file!
11+
12+The instructions for [Mac][mac] and [Linux][lin] explain how to do this in more detail. You can follow the same steps on Windows, but you need to do each step by hand. (E.g. download the file through your browser rather than with a terminal command.)
13+
14+[mac]: https://github.com/elm/compiler/blob/master/installers/mac/README.md
15+[lin]: https://github.com/elm/compiler/blob/master/installers/linux/README.md
16+
17+<br/>
18+
19+## Installing Previous Versions
20+
21+The past binaries for Mac, Linux, and Windows are hosted [here](https://github.com/elm/compiler/releases).
22+
23+You can download the executable files directly and use them locally.
24+
25+
26+<br/>
27+
28+## Uninstall
29+
30+- [Mac](https://github.com/elm/compiler/blob/master/installers/mac/README.md#uninstall)
31+- [Linux](https://github.com/elm/compiler/blob/master/installers/linux/README.md#uninstall)
32+- [Windows](https://github.com/elm/compiler/blob/master/installers/win/README.md#uninstall)
installers/linux/Dockerfile+33−19
@@ -1,25 +1,39 @@
1−# Create: https://gist.github.com/rlefevre/1523f47e75310e28eee243c9c5651ac9
1+# Based initially on https://gist.github.com/rlefevre/1523f47e75310e28eee243c9c5651ac9
2+#
3+# Build Linux x64 binary from elm compiler top-level directory:
4+# $ docker build -t elm -f installers/linux/Dockerfile .
5+#
6+# Retrieve elm Linux binary:
7+# $ docker cp $(docker create elm):/usr/local/bin/elm DESTINATION_DIRECTORY
8+#
9+# Delete docker elm image:
10+# $ docker rmi elm
11+#
12+# Display all images:
13+# $ docker images -a
14+#
15+# Delete all unused docker images:
2−# Delete: docker system prune -a ; docker images -a
16+# $ docker system prune -a
3
17
18+# Use Alpine 3.11 with GHC 8.6.5
4−FROM alpine:3.10
19+FROM alpine:3.11
5
20
6−# branch
21+# Install packages required to build elm
7−ARG branch=master
22+RUN apk add --no-cache ghc cabal wget musl-dev zlib-dev zlib-static ncurses-dev ncurses-static
8−# commit or tag
9−ARG commit=HEAD
10
23
11−# Install required packages
24+WORKDIR /elm
12−RUN apk add --update ghc cabal git musl-dev zlib-dev ncurses-dev ncurses-static wget
13
25
26+# Import source code
27+COPY builder builder
14−# Checkout elm compiler
28+COPY compiler compiler
15−WORKDIR /tmp
29+COPY reactor reactor
16−RUN git clone -b $branch https://github.com/elm/compiler.git
30+COPY terminal terminal
31+COPY cabal.config elm.cabal LICENSE ./
17
32
18−# Build a statically linked elm binary
33+# Build statically linked elm binary
19−WORKDIR /tmp/compiler
20−RUN git checkout $commit
21−RUN rm worker/elm.cabal
22RUN cabal new-update
34RUN cabal new-update
23−RUN cabal new-configure --disable-executable-dynamic --ghc-option=-optl=-static --ghc-option=-optl=-pthread
35+RUN cabal new-build --ghc-option=-optl=-static --ghc-option=-split-sections
24−RUN cabal new-build
25−RUN strip -s ./dist-newstyle/build/x86_64-linux/ghc-8.4.3/elm-0.19.1/x/elm/build/elm/elm
36+RUN cp ./dist-newstyle/build/x86_64-linux/ghc-*/elm-*/x/elm/build/elm/elm /usr/local/bin/elm
37+
38+# Remove debug symbols to optimize the binary size
39+RUN strip -s /usr/local/bin/elm
installers/linux/README.mdnew file+93
@@ -0,0 +1,93 @@
1+# Install Instructions
2+
3+The pre-compiled binary for Linux works on a very wide range of distributions.
4+
5+It should be possible to install it by running the following commands in your terminal:
6+
7+```bash
8+# Move to your Desktop so you can see what is going on easier.
9+#
10+cd ~/Desktop/
11+
12+# Download the 0.19.1 binary for Linux.
13+#
14+# +-----------+----------------------+
15+# | FLAG | MEANING |
16+# +-----------+----------------------+
17+# | -L | follow redirects |
18+# | -o elm.gz | name the file elm.gz |
19+# +-----------+----------------------+
20+#
21+curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
22+
23+# There should now be a file named `elm.gz` on your Desktop.
24+#
25+# The downloaded file is compressed to make it faster to download.
26+# This next command decompresses it, replacing `elm.gz` with `elm`.
27+#
28+gunzip elm.gz
29+
30+# There should now be a file named `elm` on your Desktop!
31+#
32+# Every file has "permissions" about whether it can be read, written, or executed.
33+# So before we use this file, we need to mark this file as executable:
34+#
35+chmod +x elm
36+
37+# The `elm` file is now executable. That means running `~/Desktop/elm --help`
38+# should work. Saying `./elm --help` works the same.
39+#
40+# But we want to be able to say `elm --help` without specifying the full file
41+# path every time. We can do this by moving the `elm` binary to one of the
42+# directories listed in your `PATH` environment variable:
43+#
44+sudo mv elm /usr/local/bin/
45+
46+# Now it should be possible to run the `elm` binary just by saying its name!
47+#
48+elm --help
49+```
50+
51+<br/>
52+
53+## Wait, what is the `PATH` variable?
54+
55+When you run a command like `elm make src/Main.elm`, your computer starts by trying to find an executable file called `elm`.
56+
57+The `PATH` is the list of directories that get searched. You can see these directories by running:
58+
59+```bash
60+echo $PATH
61+```
62+
63+This prints `/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin` on my computer. The directories are separated by a `:` so there are five possibilities listed here.
64+
65+When I run `elm make src/Main.elm`, my terminal starts by searching these five directories for an executable file named `elm`. It finds `/usr/local/bin/elm` and then runs `/usr/local/bin/elm make src/Main.elm` with whatever arguments I gave.
66+
67+So the `PATH` environment variable is a convention that allows you to refer to a specific executable file without knowing exactly where it lives on your computer. This is actually how all "terminal commands" work! Commands like `ls` are really executable files that live in directories listed in your `PATH` variable.
68+
69+So the point of running `sudo mv elm /usr/local/bin/` is to turn the `elm` binary into a terminal command, allowing us to call it just like `ls` and `cd`.
70+
71+**Note:** Why do we need to use `sudo` for that one command? Imagine if some program was able to add executables named `ls` or `cd` to `/usr/local/bin` that did something tricky and unexpected. That would be a security problem! Many distributions make this scenario less likely by requiring special permissions to modify the `/usr/local/bin/` directory.
72+
73+
74+<br/>
75+
76+## Uninstall
77+
78+The following commands should remove everything:
79+
80+```bash
81+# Remove the `elm` executable.
82+#
83+sudo rm /usr/local/bin/elm
84+
85+# Remove any cached files. The files here reduce compile times when
86+# starting new projects and make it possible to work offline in more
87+# cases. No need to keep it around if you are uninstalling though!
88+#
89+rm -r ~/.elm/
90+```
91+
92+If you have any Elm projects still on your computer, you can remove their `elm-stuff/` directories as well.
93+
installers/mac/Distribution.xml+5−3
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="no"?>
1<?xml version="1.0" encoding="utf-8" standalone="no"?>
2<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.6" authoringToolBuild="201">
2<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.6" authoringToolBuild="201">
3− <title>Elm Platform</title>
3+ <title>Elm</title>
4 <options customize="allow" allow-external-scripts="no"/>
4 <options customize="allow" allow-external-scripts="no"/>
5 <domains enable_localSystem="true"/>
5 <domains enable_localSystem="true"/>
6 <volume-check script="pm_volume_check();"/>
6 <volume-check script="pm_volume_check();"/>
@@ -10,7 +10,7 @@
10function pm_volume_check() {
10function pm_volume_check() {
11 if(!(my.target.systemVersion &amp;&amp; /* >= */ system.compareVersions(my.target.systemVersion.ProductVersion, '10.6.0') >= 0)) {
11 if(!(my.target.systemVersion &amp;&amp; /* >= */ system.compareVersions(my.target.systemVersion.ProductVersion, '10.6.0') >= 0)) {
12 my.result.title = 'Failure';
12 my.result.title = 'Failure';
13− my.result.message = 'This version of Elm Platform requires Mac OS X 10.6 or later.';
13+ my.result.message = 'This version of Elm requires Mac OS X 10.6 or later.';
14 my.result.type = 'Fatal';
14 my.result.type = 'Fatal';
15 return false;
15 return false;
16 }
16 }
@@ -18,13 +18,15 @@ function pm_volume_check() {
18}
18}
19
19
20</script>
20</script>
21+ <!--
21 <background file="background.png" alignment="bottomleft" scaling="none" mime-type="image/png"/>
22 <background file="background.png" alignment="bottomleft" scaling="none" mime-type="image/png"/>
23+ -->
22 <welcome mime-type="text/rtf" file="welcome.rtf" />
24 <welcome mime-type="text/rtf" file="welcome.rtf" />
23 <conclusion mime-type="text/rtf" file="conclusion.rtf" />
25 <conclusion mime-type="text/rtf" file="conclusion.rtf" />
24 <choices-outline>
26 <choices-outline>
25 <line choice="choice2"/>
27 <line choice="choice2"/>
26 </choices-outline>
28 </choices-outline>
27− <choice id="choice2" title="Elm Platform ">
29+ <choice id="choice2" title="Elm">
28 <pkg-ref id="org.elm-lang.binaries.pkg"/>
30 <pkg-ref id="org.elm-lang.binaries.pkg"/>
29 </choice>
31 </choice>
30 <pkg-ref id="org.elm-lang.binaries.pkg" installKBytes="19444" version="1" auth="Root">binaries.pkg</pkg-ref>
32 <pkg-ref id="org.elm-lang.binaries.pkg" installKBytes="19444" version="1" auth="Root">binaries.pkg</pkg-ref>
installers/mac/README.mdnew file+93
@@ -0,0 +1,93 @@
1+# Install Instructions
2+
3+The easiest way to install is to to use [the Mac installer](https://github.com/elm/compiler/releases/download/0.19.1/installer-for-mac.pkg)!
4+
5+But it is also possible to install by running the following commands in your terminal:
6+
7+```bash
8+# Move to your Desktop so you can see what is going on easier.
9+#
10+cd ~/Desktop/
11+
12+# Download the 0.19.1 binary for Linux.
13+#
14+# +-----------+----------------------+
15+# | FLAG | MEANING |
16+# +-----------+----------------------+
17+# | -L | follow redirects |
18+# | -o elm.gz | name the file elm.gz |
19+# +-----------+----------------------+
20+#
21+curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-mac-64-bit.gz
22+
23+# There should now be a file named `elm.gz` on your Desktop.
24+#
25+# The downloaded file is compressed to make it faster to download.
26+# This next command decompresses it, replacing `elm.gz` with `elm`.
27+#
28+gunzip elm.gz
29+
30+# There should now be a file named `elm` on your Desktop!
31+#
32+# Every file has "permissions" about whether it can be read, written, or executed.
33+# So before we use this file, we need to mark this file as executable:
34+#
35+chmod +x elm
36+
37+# The `elm` file is now executable. That means running `~/Desktop/elm --help`
38+# should work. Saying `./elm --help` works the same.
39+#
40+# But we want to be able to say `elm --help` without specifying the full file
41+# path every time. We can do this by moving the `elm` binary to one of the
42+# directories listed in your `PATH` environment variable:
43+#
44+sudo mv elm /usr/local/bin/
45+
46+# Now it should be possible to run the `elm` binary just by saying its name!
47+#
48+elm --help
49+```
50+
51+<br/>
52+
53+## What is the `PATH` variable?
54+
55+When you run a command like `elm make src/Main.elm`, your computer starts by trying to find an executable file called `elm`.
56+
57+The `PATH` is the list of directories that get searched. You can see these directories by running:
58+
59+```bash
60+echo $PATH
61+```
62+
63+This prints `/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin` on my computer. The directories are separated by a `:` so there are five possibilities listed here.
64+
65+When I run `elm make src/Main.elm`, my terminal starts by searching these five directories for an executable file named `elm`. It finds `/usr/local/bin/elm` and then runs `/usr/local/bin/elm make src/Main.elm` with whatever arguments I gave.
66+
67+So the `PATH` environment variable is a convention that allows you to refer to a specific executable file without knowing exactly where it lives on your computer. This is actually how all "terminal commands" work! Commands like `ls` are really executable files that live in directories listed in your `PATH` variable.
68+
69+So the point of running `sudo mv elm /usr/local/bin/` is to turn the `elm` binary into a terminal command, allowing us to call it just like `ls` and `cd`.
70+
71+**Note:** Why do we need to use `sudo` for that one command? Imagine if some program was able to add executables named `ls` or `cd` to `/usr/local/bin` that did something tricky and unexpected. That would be a security problem! Many distributions make this scenario less likely by requiring special permissions to modify the `/usr/local/bin/` directory.
72+
73+
74+<br/>
75+
76+## Uninstall
77+
78+The following commands should remove everything:
79+
80+```bash
81+# Remove the `elm` executable.
82+#
83+sudo rm /usr/local/bin/elm
84+
85+# Remove any cached files. The files here reduce compile times when
86+# starting new projects and make it possible to work offline in more
87+# cases. No need to keep it around if you are uninstalling though!
88+#
89+rm -r ~/.elm/
90+```
91+
92+If you have any Elm projects still on your computer, you can remove their `elm-stuff/` directories as well.
93+
installers/mac/Resources/en.lproj/background.pngdeleted

Binary file not shown.

installers/mac/Resources/en.lproj/conclusion.rtf+13−6
@@ -1,9 +1,16 @@
1−{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
1+{\rtf1\ansi\ansicpg1252\cocoartf2509
2−{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
2+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
3{\colortbl;\red255\green255\blue255;}
3{\colortbl;\red255\green255\blue255;}
4+{\*\expandedcolortbl;;}
4−\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
5+\paperw11900\paperh16840\margl1440\margr1440\vieww11180\viewh8400\viewkind0
5−\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
6+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
6
7
7−\f0\fs26 \cf0 A bunch of useful programs were just placed in /usr/local/bin/\
8+\f0\fs28 \cf0 Try opening the terminal and running commands like:\
8\
9\
10+
11+\f1 elm init\
12+elm make src/Main.elm --optimize\
13+elm repl
14+\f0 \
15+\
9−Check out {\field{\*\fldinst HYPERLINK "http://elm-lang.org/Get-Started.elm"}{\fldrslt this tutorial}} to learn how to use them!}
16+Check out {\field{\*\fldinst{HYPERLINK "https://guide.elm-lang.org/"}}{\fldrslt this tutorial}} for more advice!}
installers/mac/Resources/en.lproj/welcome.rtf+9−4
@@ -1,7 +1,12 @@
1−{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
1+{\rtf1\ansi\ansicpg1252\cocoartf2509
2−{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
2+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
3{\colortbl;\red255\green255\blue255;}
3{\colortbl;\red255\green255\blue255;}
4+{\*\expandedcolortbl;;}
4\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
5\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
5−\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
6+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
6
7
7−\f0\fs28 \cf0 This package will install Elm on your machine.}
8+\f0\fs28 \cf0 Thank you for trying out Elm!\
9+\
10+This installer makes
11+\f1 elm
12+\f0 available in your terminal.}
installers/mac/helper-scripts/elm-startup.sh+1−1
@@ -1,3 +1,3 @@
1#!/bin/sh
1#!/bin/sh
2
2
3−open 'http://elm-lang.org'
3+open 'http://guide.elm-lang.org'
installers/mac/make-installer.sh+30−3
@@ -29,7 +29,8 @@ cp $(pwd)/preinstall $pkg_scripts
29cp $(pwd)/postinstall $pkg_scripts
29cp $(pwd)/postinstall $pkg_scripts
30
30
31pkgbuild \
31pkgbuild \
32+ --sign "Developer ID Installer: <NAME>" \
32− --identifier org.elm-lang.binaries.pkg \
33+ --identifier org.elm-lang.binary \
33 --install-location $usr_binaries \
34 --install-location $usr_binaries \
34 --scripts $pkg_scripts \
35 --scripts $pkg_scripts \
35 --filter 'Scripts.*' \
36 --filter 'Scripts.*' \
@@ -39,16 +40,42 @@ pkgbuild \
39
40
40#### BUNDLE ASSETS ####
41#### BUNDLE ASSETS ####
41
42
42−rm -f Elm.pkg
43+rm -f installer-for-mac.pkg
43
44
44productbuild \
45productbuild \
46+ --sign "Developer ID Installer: <NAME>" \
47+ --identifier org.elm-lang.installer \
45 --distribution Distribution.xml \
48 --distribution Distribution.xml \
46 --package-path . \
49 --package-path . \
47 --resources Resources \
50 --resources Resources \
48− Elm.pkg
51+ installer-for-mac.pkg
49
52
50
53
51#### CLEAN UP ####
54#### CLEAN UP ####
52
55
53rm binaries.pkg
56rm binaries.pkg
54rm -rf $pkg_root
57rm -rf $pkg_root
58+
59+
60+#### BEGIN NOTARIZATION ####
61+
62+xcrun altool \
63+ --notarize-app \
64+ --primary-bundle-id "org.elm-lang.installer" \
65+ --username "<EMAIL>" \
66+ --password "@keychain:Developer-altool" \
67+ --file "installer-for-mac.pkg"
68+
69+# From https://scriptingosx.com/2019/09/notarize-a-command-line-tool/
70+#
71+#### Check on notarization:
72+#
73+# xcrun altool \
74+# --notarization-info "<RequestUUID>" \
75+# --username "<EMAIL>" \
76+# --password "@keychain:Developer-altool"
77+#
78+#
79+#### Staple Notarization:
80+#
81+# xcrun stapler staple installer-for-mac.pkg
installers/npm/PUBLISHING.md+29−141
@@ -1,171 +1,59 @@
1−# Publishing a new release
1+# Publishing
2
2
3−A new version of Elm came out. Huzzah! Here's how to update the `npm` installer.
3+Here's how to update the `npm` installer.
4
4
5−## 1. Create tarballs of binaries
6
5
7−You can find a list of what binaries we'll need to tar up in `index.js`.
6+## 1. GitHub Release
8
7
9−For example:
8+Create a [GitHub Release](https://github.com/elm/compiler/releases) with the following files:
10
9
11−```javascript
10+1. `binary-for-mac-64-bit.gz`
12−var root =
11+2. `binary-for-windows-64-bit.gz`
13− "https://github.com/elm/compiler/releases/download/" +
12+3. `binary-for-linux-64-bit.gz`
14− binVersion +
15− "/binaries-for-";
16
13
17−module.exports = binwrap({
14+Create each of these by running the `elm` executable for each platform through `gzip elm`.
18− binaries: ["elm"],
19− urls: {
20− "darwin-x64": root + "mac.tar.gz",
21− "win32-x64": root + "windows.tar.gz",
22− "win32-ia32": root + "windows.tar.gz",
23− "linux-x64": root + "linux.tar.gz"
24− }
25−});
26−```
27−
28−If this is the end of your `index.js`, you'll need to create these files:
29
15
30−1. `binaries-for-mac.tar.gz`
31−2. `binaries-for-windows.tar.gz`
32−3. `binaries-for-linux.tar.gz`
33
16
34−Each of these tarballs should have **only the Elm binary** inside them - no
17+## 2. Try a beta release
35−directories!
36
18
37−So create them by making a directory, putting all the binaries in it, `cd`-ing
19+In `package.json`, bump the version to `"0.19.2-beta"`.
38−into that directory, and then running something like this:
39
20
40−```shell
21+```bash
41−$ tar cvzf binaries-for-linux.tar.gz elm
22+npm publish --tag beta
42```
23```
43
24
44−Make sure each tarball contains all the binaries listed in that `binaries:` list
25+To test that it works, run these commands:
45−in `index.js`. (The Windows ones should have `.exe` at the end; `binwrap`
46−expects that they will, for Windows only.)
47−
48−## 2. Update the `bin/` binary wrappers
49−
50−Inside the npm installer's `bin/` directory, there should be a file for each of
51−the binaries that will be included in this release.
52−
53−Each of these must be executable! If you're not sure whether they are,
54−run `chmod +x` on them just to be sure.
55−
56−Their paths must also must all be listed in `package.json` in two places:
57−
58−1. The `"files":` field
59−2. The `"bin":` field
60−
61−If the executables are the same as they were for the last release, great!
62−You can proceed to the next step. If any binaries were removed, make sure to
63−remove them from these lists!
64−
65−## 3. Update `package.json` for a beta release
66−
67−In `package.json`, bump the version to the next applicable release, and add
68−a `"-beta"` suffix to it.
69−
70−For example, if it was on `"0.18.0"` you might bump it to `"0.19.0-beta"`.
71−The version number should match the release of Elm, such that if people do
72−`npm install elm@0.19.0@beta` they get what they would expect.
73−
74−## 4. Tag the beta release
75−
76−Commit this change and tag it with the name of the release **without** the
77−`-beta` suffix. (We will overwrite this tag later.)
78−
79−For example:
80
26
81−```shell
27+```bash
82−$ git tag 0.19.0
28+npm dist-tags ls elm
83−$ git push origin 0.19.0
29+npm install elm@beta --ignore-scripts
84```
30```
85
31
86−Now this tag should exist on GitHub, allowing us to upload binaries to it.
32+The `latest` tag should not be changed, and there should be an additional `beta` tag.
87
33
88−## 5. Upload binaries
34+Try this on Windows, Linux, and Mac.
89
35
90−Visit the [Create a New Release](https://github.com/elm-lang/elm-platform/releases/new)
91−page and use the `Tag version` dropdown to select the tag you just pushed. Give
92−it a title like `0.19.0`. Don't mention the `-beta` in it. The "beta" concept
93−is for `npm` only.
94
36
95−Upload the tarballs you created in step 1.
37+## 3. Publish final release
96
38
97−## 6. Publish beta release
39+Remove the `-beta` suffix from the version in `package.json`. Then run:
98
40
99−Run this to publish the beta release. The `--tag beta` is **crucial** here.
41+```bash
100−Without it, `npm` will by default publish a new top-level release, which would
101−mean that what you just published would become what everyone gets when they
102−`npm install -g elm` without any additional qualifiers.
103−
104−```shell
105−$ npm publish --tag beta
42+npm publish
106```
43```
107
44
108−Afterwards you should be able to do `npm info elm | less` and see something
109−like this in the JSON:
110−
111−```
112−'dist-tags': { latest: '0.18.0', beta: '0.19.0-beta' }
113−```
114
45
115−If you messed this up, and the `latest` tag now points to the beta you just
46+## 4. Tag the `latest-0.19.1` version
116−published, don't panic - it's fixable! `dist-tags` can always be modified after
117−the fact. Read up on `npm` [dist-tags](https://docs.npmjs.com/cli/dist-tag)
118−to learn how to fix things.
119
47
120−## 7. Verify beta installer
48+Many compiler releases have needed multiple `npm` publications. Maybe something does not work on Windows or some dependency becomes insecure. Normal `npm` problems.
121
49
122−Make an empty directory and run `npm init` inside it.
50+The convention for each Elm release is to create a tag the latest one.
123
51
124−Then run this:
52+```bash
125−
53+npm dist-tag add elm@0.19.1-3 latest-0.19.1
126−```shell
127−$ npm install elm@beta --ignore-scripts
128```
54```
129
55
130−This should succeed with an exit code of `0`.
56+That way people who want a specific version can point to `latest-0.19.1` or `latest-0.18.0` instead of knowing the particular names of all the various publications.
131−If it did, look in `node_modules/.bin/` for the binaries you expect.
132−They should be present, and they should also work as expected when you run them.
133−Because you installed them with `--ignore-scripts`, the first thing they should
134−do is to download themselves and then execute whatever command you requested
135−(e.g. `node_modules/.bin/elm make Main.elm`). If you run the same command a
136−second time, it should run faster because it doesn't have to download the binary
137−first.
138−
139−Now try it again with `--ignore-scripts` turned off:
140−
141−```shell
142−$ rm -r node_modules
143−$ npm install elm@beta --ignore-scripts=false
144−```
145−
146−This time it should download the binaries during the installation phase. Once
147−again you should be able to run the binaries from `node_modules/.bin/`, and
148−this time they should be fast from the first run because they're already
149−downloaded.
150−
151−## 8. Publish for real
152−
153−It's a good idea to ask others to try out the beta installer before doing this!
154−Especially on multiple operating systems.
155−
156−To publish the real version:
157−
158−1. Edit `package.json` to remove the `-beta` suffix from the version.
159−2. Commit that change and push it.
160−3. Use `git tag --force` to overwrite the previous tag (e.g. `0.19.0` - whatever you used before).
161−4. Force push the tag, e.g. `git push origin 0.19.0 --force-with-lease`.
162−5. `npm publish`
163
57
164−You're done! Now whenever anyone does `npm install -g elm` they'll get the
58+You can read more about dist-tags [here](https://docs.npmjs.com/cli/dist-tag).
165−version you just uploaded.
166
59
167−The reason we only used the `-beta` suffix for `npm` was so that when we ran
168−tests on the beta version, it was all against the same (non-beta) URLs we'd end
169−up using for the real version. This means there's no opportunity for us to
170−introduce some sort of mismatch between the beta that we verified and the real
171−version.
installers/npm/README.md+30−23
@@ -1,38 +1,45 @@
1−npm install elm [![Travis build Status](https://travis-ci.org/elm-lang/elm-platform.svg?branch=master)](http://travis-ci.org/elm-lang/elm-platform) [![AppVeyor build status](https://ci.appveyor.com/api/projects/status/6mcub79i04ianpm9/branch/master?svg=true)](https://ci.appveyor.com/project/rtfeldman/elm-platform/branch/master)
1+# Elm Installer
2−===============
3
2
4−Install the [Elm Platform](https://github.com/elm-lang/elm-platform) via [`npm`](https://www.npmjs.com).
3+[Elm](https://elm-lang.org) is a functional programming language that compiles to JavaScript.
5
4
6−## Installing
5+Head over to [The Official Guide](https://guide.elm-lang.org/) to start learning Elm!
7
6
8−Run this to get the binaries:
9
7
10−```
8+<br/>
11−$ npm install -g elm
12−```
13
9
14−## Installing behind a proxy server
10+## What is this package for?
15
11
16−If you are behind a proxy server, set the environment variable "HTTPS_PROXY".
12+**Normal installs** ❌
17
13
18−```
14+Use the instructions [here](https://guide.elm-lang.org/install/elm.html) instead.
19−$ export HTTPS_PROXY=$YourProxyServer$
15+
20−$ npm install -g elm
16+**Multiple versions** ✅
21−```
17+
18+People using Elm at work may use different versions of Elm in different projects. They can run `npm install elm@latest-0.19.1` in each project and use the binary at `./node_modules/.bin/elm` for compilation.
19+
20+**Continuous integration** ⚠️
21+
22+This works, but there are usually faster and more reliable options:
23+
24+1. You can download `elm` directly from GitHub with [this script](https://github.com/elm/compiler/blob/master/installers/linux/README.md). This is all the `npm` installer does, but with extra HTTP requests to `npmjs.com` servers, making it slower and adding more failure points.
25+2. Many continuous integration have ways to cache files ([example](https://docs.travis-ci.com/user/caching/)) to make builds faster and more reliable.
26+
27+That said, it will definitely work to use the `npm` installer on CI if you prefer that option.
28+
29+
30+<br/>
31+
32+## Install Locally
22
33
23−Or on Windows:
34+The following command should download the latest Elm 0.19.1 binary:
24
35
25```
36```
26−$ set HTTPS_PROXY=$YourProxyServer$
27−$ npm install -g elm
37+npm install elm@latest-0.19.1
28```
38```
29
39
30−## Troubleshooting
40+You should be able to run `./node_modules/bin/elm --version` within your project and see `0.19.1`. Now you can compile with `./node_modules/bin/elm make src/Main.elm` and not disrupt other packages.
31
41
32−1. [Troubleshooting npm](https://github.com/npm/npm/wiki/Troubleshooting)
42+Use `npm install elm@latest-0.19.0` or `npm install elm@latest-0.18.0` for earlier versions.
33−2. On Debian/Ubuntu systems, you may have to install the nodejs-legacy package: `apt-get install nodejs-legacy`.
34−3. If the installer says that it cannot find any usable binaries for your operating system and architecture, check the [Build from Source](https://github.com/elm-lang/elm-platform/blob/master/README.md#build-from-source) documentation.
35
43
36−## Getting Started
44+**Note:** The `latest-X.Y.Z` convention is used in case we need to publish patches for the `npm` installer within a given Elm release. For example, say `npm` decides that some transitive dependency is not secure. Nothing is changing about Elm or the binaries, but we need to publish a new `npm` installer that fixes this issue.
37
45
38−Once everything has installed successfully, head over to the [Get Started](http://elm-lang.org/Get-Started.elm) page!
installers/npm/bin/elm+42−17
@@ -1,29 +1,54 @@
1#!/usr/bin/env node
1#!/usr/bin/env node
2
2
3var child_process = require('child_process');
3var child_process = require('child_process');
4−var download = require('../download.js');
4+var path = require('path');
5var fs = require('fs');
5var fs = require('fs');
6
6
7
7
8−// Some npm users enable --ignore-scripts (a good security measure)
8+// Some npm users enable --ignore-scripts (a good security measure) so
9+// they do not run the post-install hook and install.js does not run.
10+// Instead they will run this script.
9//
11//
10−// They do not run the post-install hook, so install.js does not run.
12+// On Mac and Linux, we download the elm executable into the exact same
13+// location as this file. Since npm uses symlinks on these platforms,
14+// that means that the first run will invoke this file and subsequent
15+// runs will call the elm binary directly.
11//
16//
12−// This file pretends to be the downloaded binary. It then downloads
17+// On Windows, we must download a file named elm.exe for it to run properly.
13−// the real binary over itself. So in that case, the first run would
18+// Instead of symlinks, npm creates two files:
14−// also make an HTTPS request to fetch the real binary. From there,
19+//
15−// it calls the binary it downloaded on each run.
20+// - node_modules/.bin/elm (a bash file)
21+// - node_modules/.bin/elm.cmd (a batch file)
22+//
23+// Both files specifically invoke `node` to run the file listed at package.bin,
24+// so there is no way around instantiating node for no reason on Windows. So
25+// the existsSync check is needed so that it is not downloaded more than once.
16
26
17
27
28+// figure out where to put the binary (calls path.resolve() to get path separators right on Windows)
29+//
30+var binaryPath = path.resolve(__dirname, 'elm') + (process.platform === 'win32' ? '.exe' : '');
31+
32+// Run the command directly if possible, otherwise download and then run.
33+// This check is important for Windows where this file will be run all the time.
34+//
35+if (process.platform === 'win32')
36+{
37+ fs.existsSync(binaryPath)
38+ ? runCommand()
39+ : require('../download.js')(runCommand);
40+}
41+else
42+{
43+ require('../download.js')(runCommand);
44+}
18
45
19−// Make sure we get the right path even if we're executing from the symlinked
20−// node_modules/.bin/ executable
21−var pathToThisFile = fs.realpathSync(process.argv[1]);
22
46
23−download(pathToThisFile, function() {
47+function runCommand()
48+{
24− // Need double quotes and { shell: true } when there are spaces in the path on windows:
49+ // Need double quotes and { shell: true } when there are spaces in the path on windows:
25− // https://github.com/nodejs/node/issues/7367#issuecomment-229721296
50+ // https://github.com/nodejs/node/issues/7367#issuecomment-229721296
26− child_process
51+ child_process
27− .spawn('"' + pathToThisFile + '"', process.argv.slice(2), { stdio: 'inherit', shell: true })
52+ .spawn('"' + binaryPath + '"', process.argv.slice(2), { stdio: 'inherit', shell: true })
28− .on('exit', process.exit);
53+ .on('exit', process.exit);
29−});
54+}
installers/npm/download.js+68−68
@@ -1,7 +1,7 @@
1var fs = require('fs');
1var fs = require('fs');
2var package = require('./package.json');
2var package = require('./package.json');
3−var URL = require('url').URL;
3+var path = require('path');
4−var https = require('https');
4+var request = require('request');
5var zlib = require('zlib');
5var zlib = require('zlib');
6
6
7
7
@@ -12,88 +12,72 @@ var zlib = require('zlib');
12// called when --ignore-scripts is enabled. That's why install.js is so weird.
12// called when --ignore-scripts is enabled. That's why install.js is so weird.
13
13
14
14
15−module.exports = function(destinationPath, callback)
15+module.exports = function(callback)
16{
16{
17+ // figure out URL of binary
17 var version = package.version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); // turn '1.2.3-alpha' into '1.2.3'
18 var version = package.version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); // turn '1.2.3-alpha' into '1.2.3'
18− var os = { 'darwin': 'mac', 'win32': 'windows', 'linux': 'linux' }[process.platform];
19− var arch = { 'x64': '64-bit', 'ia32': '32-bit' }[process.arch];
20− var path = process.platform === 'win32' ? destinationPath + '.exe' : destinationPath;
21− var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + os + '-' + arch + '.gz';
22
19
23− // check if exists for bin/elm running for the Nth time on Windows
20+ var platform = {
24− fs.existsSync(path)
21+ darwin_x64: 'mac-64-bit',
25− ? callback()
22+ darwin_arm64: 'mac-64-bit',
26− : download(path, url, callback);
23+ win32_x64: 'windows-64-bit',
27−};
24+ linux_x64: 'linux-64-bit'
25+ }[process.platform + '_' + process.arch];
28
26
27+ verifyPlatform(version, platform);
29
28
29+ var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + platform + '.gz';
30
30
31−// DOWNLOAD
31+ reportDownload(version, url);
32
32
33+ // figure out where to put the binary (calls path.resolve() to get path separators right on Windows)
34+ var binaryPath = path.resolve(__dirname, package.bin.elm) + (process.platform === 'win32' ? '.exe' : '');
33
35
34−function download(destinationPath, url, callback)
36+ // set up handler for request failure
35−{
37+ function reportDownloadFailure(error)
36− requestWithRedirects(url, 10,
37− function(error) {
38− exitFailure(url, 'I ran into trouble while fetching ' + url + '\n\n' + error);
39− },
40− function(response) {
41− if (response.statusCode == 404)
42− {
38+ {
43− exitFailure(url, 'I got a "404 Not Found" trying to download from the following URL:\n'
44− + url
45− + '\n\nThis may mean you are trying to install on an unsupported platform. (e.g. some 32-bit systems?)'
46− );
47− }
48−
49− response.on('error', function() {
50− exitFailure(url, 'Something went wrong while receiving the following URL:\n\n' + url);
39+ exitFailure(url,'Something went wrong while fetching the following URL:\n\n' + url + '\n\nIt is saying:\n\n' + error);
51− });
40+ }
52−
41+
42+ // set up decompression pipe
53− var gunzip = zlib.createGunzip().on('error', function(error) {
43+ var gunzip = zlib.createGunzip().on('error', function(error) {
54− exitFailure(url, 'I ran into trouble decompressing the downloaded binary. It is saying:\n\n' + error);
44+ exitFailure(url, 'I ran into trouble decompressing the downloaded binary. It is saying:\n\n' + error);
55− });
45+ });
46+
47+ // set up file write pipe
56− var write = fs.createWriteStream(destinationPath, {
48+ var write = fs.createWriteStream(binaryPath, {
57− encoding: 'binary',
49+ encoding: 'binary',
58− mode: 0o755
50+ mode: 0o755
59− }).on('finish', callback).on('error', function(error) {
51+ }).on('finish', callback).on('error', function(error) {
60− exitFailure(url, 'I had some trouble writing file to disk. It is saying:\n\n' + error);
52+ exitFailure(url, 'I had some trouble writing file to disk. It is saying:\n\n' + error);
61− });
53+ });
62−
54+
55+ // put it all together
63− response.pipe(gunzip).pipe(write);
56+ request(url).on('error', reportDownloadFailure).pipe(gunzip).pipe(write);
64− }
65− );
66}
57}
67
58
68
59
69
60
70−// HANDLE REDIRECTS
61+// VERIFY PLATFORM
71
62
72
63
73−function requestWithRedirects(url, maxRedirects, failure, success)
64+function verifyPlatform(version, platform)
74{
65{
75− var req = https.request(url);
66+ if (platform) return;
76−
77− req.on('response', function(response) {
78− // Check for redirects
79−
80− var redirectUrl = new URL(response.headers['location'], new URL(url).origin).href;
81−
82− if (typeof redirectUrl === 'string' && response.statusCode >= 300 && response.statusCode < 400)
83− {
84− return (maxRedirects <= 0)
85− ? failure(new Error('followed 10 redirects and gave up'))
86− : requestWithRedirects(redirectUrl, maxRedirects - 1, failure, success);
87− }
88− else
89− {
90− return success(response);
91− }
92− });
93−
94− req.on('error', failure);
95
67
96− req.end();
68+ var situation = process.platform + '_' + process.arch;
69+ console.error(
70+ '-- ERROR -----------------------------------------------------------------------\n\n'
71+ + 'I am detecting that your computer (' + situation + ') may not be compatible with any\n'
72+ + 'of the official pre-built binaries.\n\n'
73+ + 'I recommend against using the npm installer for your situation. Check out the\n'
74+ + 'alternative installers at https://github.com/elm/compiler/releases/tag/' + version + '\n'
75+ + 'to see if there is something that will work better for you.\n\n'
76+ + 'From there I recommend asking for guidance on Slack or Discourse to find someone\n'
77+ + 'who can help with your specific situation.\n\n'
78+ + '--------------------------------------------------------------------------------\n'
79+ );
80+ process.exit(1);
97}
81}
98
82
99
83
@@ -112,3 +96,19 @@ function exitFailure(url, message)
112 );
96 );
113 process.exit(1);
97 process.exit(1);
114}
98}
99+
100+
101+
102+// REPORT DOWNLOAD
103+
104+
105+function reportDownload(version, url)
106+{
107+ console.log(
108+ '--------------------------------------------------------------------------------\n\n'
109+ + 'Downloading Elm ' + version + ' from GitHub.'
110+ + '\n\nNOTE: You can avoid npm entirely by downloading directly from:\n'
111+ + url + '\nAll this package does is download that file and put it somewhere.\n\n'
112+ + '--------------------------------------------------------------------------------\n'
113+ );
114+}
installers/npm/install.js+1−7
@@ -1,10 +1,4 @@
1
1
2var download = require('./download.js');
2var download = require('./download.js');
3−var package = require('./package.json');
4−var path = require('path');
5
3
6−
7−// get slashes right for Windows
8−var targetPath = path.resolve(__dirname, Object.values(package.bin)[0]);
9−
10−download(targetPath, function() {});
4+download(function() {});
installers/npm/package.json+6−7
@@ -1,6 +1,6 @@
1{
1{
2 "name": "elm",
2 "name": "elm",
3− "version": "0.19.0-no-deps",
3+ "version": "0.19.1-5",
4 "description": "Installer for Elm: just downloads the binary into node_modules",
4 "description": "Installer for Elm: just downloads the binary into node_modules",
5 "preferGlobal": true,
5 "preferGlobal": true,
6 "license": "BSD-3-Clause",
6 "license": "BSD-3-Clause",
@@ -11,9 +11,9 @@
11 "homepage": "https://github.com/elm/compiler/tree/master/installers/npm",
11 "homepage": "https://github.com/elm/compiler/tree/master/installers/npm",
12 "bugs": "https://github.com/elm/compiler/issues",
12 "bugs": "https://github.com/elm/compiler/issues",
13 "author": {
13 "author": {
14− "name": "Richard Feldman",
14+ "name": "Evan Czaplicki",
15− "email": "richard.t.feldman@gmail.com",
15+ "email": "evan@elm-lang.org",
16− "url": "https://github.com/rtfeldman"
16+ "url": "https://github.com/evancz"
17 },
17 },
18 "engines": {
18 "engines": {
19 "node": ">=7.0.0"
19 "node": ">=7.0.0"
@@ -35,9 +35,8 @@
35 "install",
35 "install",
36 "installer"
36 "installer"
37 ],
37 ],
38− "bin": {
39− "elm": "bin/elm"
38+ "bin": { "elm": "bin/elm" },
40− },
41 "dependencies": {
39 "dependencies": {
40+ "request": "^2.88.0"
42 }
41 }
43}
42}
installers/npm/troubleshooting.mdnew file+76
@@ -0,0 +1,76 @@
1+# Troubleshooting
2+
3+I very highly recommend asking for help on [the Elm slack](https://elmlang.herokuapp.com).
4+
5+There are a lot of things that can go wrong when installing software, and it can really help to have a second pair of eyes on your situation!
6+
7+This document goes through a couple options that may help you out.
8+
9+<br/>
10+
11+
12+## Can you skip npm entirely?
13+
14+The most reliable way to get Elm installed using the official installers for Mac and Windows [here][download].
15+
16+You can also download the binaries directly. On Linux, you could do it in the terminal like this:
17+
18+```bash
19+cd ~/Desktop/
20+curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
21+gunzip elm.gz # unzip the file
22+chmod +x elm # make the file executable
23+sudo mv elm /usr/local/bin/ # put the executable in a directory likely to be listed in your PATH variable
24+```
25+
26+If these exact commands do not work for you, you can try to do the same thing by hand.
27+
28+Read the section below on `PATH` variables if you are not sure what that is!
29+
30+[download]: https://github.com/elm/compiler/releases/tag/0.19.1
31+
32+<br/>
33+
34+
35+## Do you need to use npm for some reason?
36+
37+The company running npm has a list of common troubleshooting situations [here](https://npm.community/c/support/troubleshooting), but it may be better to just try to find your specific case on Stack Overflow. Often there are permissions issues where you may need to use `sudo` with some command.
38+
39+### Firewalls
40+
41+Some companies have a firewall.
42+
43+These companies usually have set the `HTTP_PROXY` or `HTTPS_PROXY` environment variable on your computer. This is more common with Windows computers.
44+
45+The result is that the request for `https://github.com/elm/compiler/releases/download/0.19.1/binary-for-windows-64-bit.gz` is being sent to a "proxy server" where they monitor traffic. Maybe they rule out certain domains, maybe they check data when it comes back from the actual URL, etc.
46+
47+It is probably best to ask someone about the situation on this, but you can test things out by temporarily using an alternate `HTTPS_PROXY` value with something like this:
48+
49+```
50+# Mac and Linux
51+HTTPS_PROXY=http://proxy.example.com npm install -g elm
52+
53+# Windows
54+set HTTPS_PROXY=http://proxy.example.com
55+npm install -g elm
56+```
57+
58+Check out [this document](https://www.npmjs.com/package/request#controlling-proxy-behaviour-using-environment-variables) for more information on how environment variables like `NO_PROXY`, `HTTP_PROXY`, and `HTTPS_PROXY` are handled by the npm.
59+
60+<br/>
61+
62+
63+## Do you know what a `PATH` variable is?
64+
65+When you run a command like `elm make src/Main.elm`, your computer starts by trying to find a file called `elm`.
66+
67+The `PATH` is a list of directories to search within. On Mac and Linux, you can see these directories by running:
68+
69+```
70+$ echo $PATH
71+/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin
72+```
73+
74+The are separated by `:` for some reason. So running `elm make src/Main.elm` starts by searching the `PATH` for files named `elm`. On my computer, it finds `/usr/local/bin/elm` and then can actually run the command.
75+
76+Is `elm` in one of the directories listed in your `PATH` variable? I recommend asking for help if you are in this scenario and unsure how to proceed.
installers/win/Nsisfile.nsi+15−15
@@ -75,7 +75,7 @@ Function un.onInit
75FunctionEnd
75FunctionEnd
76
76
77Function LaunchLink
77Function LaunchLink
78− ExecShell "open" "https://elm-lang.org/get-started"
78+ ExecShell "open" "https://guide.elm-lang.org"
79FunctionEnd
79FunctionEnd
80
80
81;--------------------------------
81;--------------------------------
@@ -135,20 +135,20 @@ SectionEnd
135
135
136SectionGroup "Update system settings" SecGr
136SectionGroup "Update system settings" SecGr
137
137
138−Section "Associate with .elm files" SecAssoc
138+;Section "Associate with .elm files" SecAssoc
139−
139+;
140− SectionIn 1
140+; SectionIn 1
141−
141+;
142− ; File associations
142+; ; File associations
143− WriteRegStr HKCR ".elm" "" "elm"
143+; WriteRegStr HKCR ".elm" "" "elm"
144− WriteRegStr HKCR "elm" "" "Elm Source File"
144+; WriteRegStr HKCR "elm" "" "Elm Source File"
145− WriteRegStr HKCR "elm\DefaultIcon" "" "$INSTDIR\file.ico"
145+; WriteRegStr HKCR "elm\DefaultIcon" "" "$INSTDIR\file.ico"
146− ;WriteRegStr HKCR "elm\shell\open\command" "" '"$INSTDIR\bin\elm.exe" "%1"'
146+; WriteRegStr HKCR "elm\shell\open\command" "" '"$INSTDIR\bin\elm.exe" "%1"'
147−
147+;
148− ;Remember that we registered associations
148+; ;Remember that we registered associations
149− WriteRegDWORD HKLM "${PRODUCT_DIR_REG_KEY}" Assocs 0x1
149+; WriteRegDWORD HKLM "${PRODUCT_DIR_REG_KEY}" Assocs 0x1
150−
150+;
151−SectionEnd
151+;SectionEnd
152
152
153Section "Update the PATH environment variable" SecPath
153Section "Update the PATH environment variable" SecPath
154
154
installers/win/README.md+18−3
@@ -1,9 +1,24 @@
1+# Installing on Windows
2+
3+The installer for Windows is available [here](https://guide.elm-lang.org/install.html).
4+
5+
6+<br/>
7+
8+## Uninstall
9+
10+First run the `C:\Program Files (x86)\Elm\0.19\uninstall.exe` file. This will remove Elm stuff from your `PATH`.
11+
12+Then remove the whole `C:\Users\<username>\AppData\Roaming\elm` directory. Elm caches some packages and build artifacts to reduce compile times and to help you work offline. Getting rid of this directory will clear that information out!
13+
14+<br/>
15+
1−# Building Windows installer
16+## Building the Windows installer
2
17
3You will need the [NSIS installer](http://nsis.sourceforge.net/Download) to be installed.
18You will need the [NSIS installer](http://nsis.sourceforge.net/Download) to be installed.
4
19
5Once everything is installed, run something like this command:
20Once everything is installed, run something like this command:
6
21
7− make_installer.cmd 0.19
22+ make_installer.cmd 0.19.0
8
23
9−It will build an installer called `Elm-0.19-setup.exe`.
24+It will build an installer called `Elm-0.19.0-setup.exe`.
installers/win/file.icodeleted

Binary file not shown.

installers/win/inst.dat+1−2
@@ -2,6 +2,5 @@ SetOutPath "$INSTDIR\bin"
2File "${FILES_SOURCE_PATH}\bin\elm.exe"
2File "${FILES_SOURCE_PATH}\bin\elm.exe"
3
3
4SetOutPath "$INSTDIR"
4SetOutPath "$INSTDIR"
5−File "file.ico"
6File "updatepath.vbs"
5File "updatepath.vbs"
7−File "removefrompath.vbs"
6+File "removefrompath.vbs"
installers/win/logo.ico

Binary file not shown.

installers/win/uninst.dat+1−2
@@ -1,7 +1,6 @@
1Delete "$INSTDIR\bin\elm.exe"
1Delete "$INSTDIR\bin\elm.exe"
2RmDir "$INSTDIR\bin"
2RmDir "$INSTDIR\bin"
3
3
4−Delete "$INSTDIR\file.ico"
5Delete "$INSTDIR\updatepath.vbs"
4Delete "$INSTDIR\updatepath.vbs"
6Delete "$INSTDIR\removefrompath.vbs"
5Delete "$INSTDIR\removefrompath.vbs"
7−RmDir "$INSTDIR"
6+RmDir "$INSTDIR"
installers/win/welcome.bmp

Binary file not shown.

roadmap.mdnew file+29
@@ -0,0 +1,29 @@
1+# Roadmap
2+
3+If you like what you see now, that's pretty much what Elm is going to be for a while.
4+
5+I'm currently doing some exploratory work with compiler techniques and targets, but it is still too early to tell which parts of that might work out. I know many readers take "exploring X" as a promise that "X will definitely happen", so I want to be careful in setting expectations low since there is still so much uncertainty in the work. So while there is no real news to share at this point, I can give some expectations about future stability of Elm:
6+
7+**If this exploratory work goes well**, even in the wildest version of success, I wouldn't expect the language or core packages to change very much. Maybe two or three years down the line it could reveal something that'd be good to fix up, but I don't really foresee notable changes right now.
8+
9+**If this exploratory work does not work out**, I have some more conservative projects that are good ideas that I want to circle back to at some point. Things like:
10+
11+- add a constrained type variable `eq` to get rid of the runtime error for `(==)` on functions
12+- try to integrate `elm test` so it can run only tests that changed
13+- try to get `elm format` using the latest parsing infrastructure so it's not a perf bottleneck during development anymore
14+- do another round on perf because I have one last idea that can squeeze out a bit more speed
15+
16+These are all nice quality of life things, but with 0.19.0 and 0.19.1 taking so long, I got pretty burnt out on "incremental improvements that are good ideas, but take a very long time and aren't very exciting to non-Elm users." Without getting too into the details, I really needed to change things up before returning to these particular ideas.
17+
18+If someone has a security issue from the compiler or core libraries, please DM me about it on the Elm Slack. Outside of security issues, I think capacity for more discretionary changes will increase once the lessons from the compiler explorations become more clear. Hopefully the discussion [here](https://discourse.elm-lang.org/t/costs-funding-in-open-source-languages/5722) clarifies the thinking on these capacity questions a bit.
19+
20+<br>
21+<br>
22+
23+**Taking a step back**, I have found that working in this looser style has produced a high baseline of quality, and I think that is an important part of Elm. For example, all the error message work in Elm began as a project to implement the `--report=json` flag. That work happened to reveal some cool ideas on improving error messages, and if I had been using a rigid roadmap, I might have skipped those ideas to meet the publicly-stated arbitrary deadline. We'd have a clearer roadmap, but error messages no different than other type-inferred languages.
24+
25+So I think having more flexibility in planning is a competitive advantage for Elm in certain ways, but it is obviously a trade off that does not work for everyone. If someone needs more certainty, I generally recommend looking into other languages to see if they have a balance that works better for their needs. For example, languages made by big corporations are generally "less risky" on things like this, but I think you see the fruits of that kind of process in the design decisions as well. Trade offs!
26+
27+Anyway, like I said at the beginning, if you like what you see now, that's what it's going to be for a while. Even in the best case scenario with my current explorations!
28+
29+I hope this is helpful information, and I hope you have a good experience with Elm, even if you ultimately find a different language that works better for you!
terminal/src/Terminal/Args.hs → terminal/impl/Terminal.hsrenamed+30−27
@@ -1,8 +1,7 @@
1−module Terminal.Args
1+module Terminal
2− ( simple
2+ ( app
3− , Interface(..)
3+ , Command(..)
4 , Summary(..)
4 , Summary(..)
5− , complex
6 , Flags, noFlags, flags, (|--)
5 , Flags, noFlags, flags, (|--)
7 , Flag, flag, onOff
6 , Flag, flag, onOff
8 , Parser(..)
7 , Parser(..)
@@ -26,22 +25,22 @@ import qualified Text.PrettyPrint.ANSI.Leijen as P
26import qualified Text.Read as Read
25import qualified Text.Read as Read
27
26
28import qualified Elm.Version as V
27import qualified Elm.Version as V
29−import Terminal.Args.Internal
28+import Terminal.Internal
30−import qualified Terminal.Args.Chomp as Chomp
29+import qualified Terminal.Chomp as Chomp
31−import qualified Terminal.Args.Error as Error
30+import qualified Terminal.Error as Error
32
31
33
32
34
33
35−-- GET
34+-- COMMAND
36
35
37
36
38−simple :: String -> P.Doc -> Args args -> Flags flags -> (args -> flags -> IO ()) -> IO ()
37+_command :: String -> P.Doc -> Args args -> Flags flags -> (args -> flags -> IO ()) -> IO ()
39−simple details example args_ flags_ callback =
38+_command details example args_ flags_ callback =
40 do setLocaleEncoding utf8
39 do setLocaleEncoding utf8
41 argStrings <- Env.getArgs
40 argStrings <- Env.getArgs
42 case argStrings of
41 case argStrings of
43 ["--version"] ->
42 ["--version"] ->
44− do hPutStrLn stdout (V.toChars V.compiler ++ "-beta-1")
43+ do hPutStrLn stdout (V.toChars V.compiler)
45 Exit.exitSuccess
44 Exit.exitSuccess
46
45
47 chunks ->
46 chunks ->
@@ -57,34 +56,38 @@ simple details example args_ flags_ callback =
57 Error.exitWithError err
56 Error.exitWithError err
58
57
59
58
59+
60+-- APP
61+
62+
60−complex :: P.Doc -> P.Doc -> [Interface] -> IO ()
63+app :: P.Doc -> P.Doc -> [Command] -> IO ()
61−complex intro outro interfaces =
64+app intro outro commands =
62 do setLocaleEncoding utf8
65 do setLocaleEncoding utf8
63 argStrings <- Env.getArgs
66 argStrings <- Env.getArgs
64 case argStrings of
67 case argStrings of
65 [] ->
68 [] ->
66− Error.exitWithOverview intro outro interfaces
69+ Error.exitWithOverview intro outro commands
67
70
68 ["--help"] ->
71 ["--help"] ->
69− Error.exitWithOverview intro outro interfaces
72+ Error.exitWithOverview intro outro commands
70
73
71 ["--version"] ->
74 ["--version"] ->
72− do hPutStrLn stdout (V.toChars V.compiler ++ "-beta-1")
75+ do hPutStrLn stdout (V.toChars V.compiler)
73 Exit.exitSuccess
76 Exit.exitSuccess
74
77
75 command : chunks ->
78 command : chunks ->
76− do case List.find (\iface -> toName iface == command) interfaces of
79+ do case List.find (\cmd -> toName cmd == command) commands of
77 Nothing ->
80 Nothing ->
78− Error.exitWithUnknown command (map toName interfaces)
81+ Error.exitWithUnknown command (map toName commands)
79
82
80− Just (Interface _ _ details example args_ flags_ callback) ->
83+ Just (Command _ _ details example args_ flags_ callback) ->
81 if elem "--help" chunks then
84 if elem "--help" chunks then
82 Error.exitWithHelp (Just command) details example args_ flags_
85 Error.exitWithHelp (Just command) details example args_ flags_
83
86
84 else
87 else
85 case snd $ Chomp.chomp Nothing chunks args_ flags_ of
88 case snd $ Chomp.chomp Nothing chunks args_ flags_ of
86− Right (argsValue, flagValue) ->
89+ Right (argsValue, flagsValue) ->
87− callback argsValue flagValue
90+ callback argsValue flagsValue
88
91
89 Left err ->
92 Left err ->
90 Error.exitWithError err
93 Error.exitWithError err
@@ -159,21 +162,21 @@ findIndex index point chunks =
159 findIndex (index + 1) point cs
162 findIndex (index + 1) point cs
160
163
161
164
162−_complexSuggest :: [Interface] -> Int -> [String] -> IO [String]
165+_complexSuggest :: [Command] -> Int -> [String] -> IO [String]
163−_complexSuggest interfaces index strings =
166+_complexSuggest commands index strings =
164 case strings of
167 case strings of
165 [] ->
168 [] ->
166− return (map toName interfaces)
169+ return (map toName commands)
167
170
168 command : chunks ->
171 command : chunks ->
169 if index == 1 then
172 if index == 1 then
170− return (filter (List.isPrefixOf command) (map toName interfaces))
173+ return (filter (List.isPrefixOf command) (map toName commands))
171 else
174 else
172− case List.find (\iface -> toName iface == command) interfaces of
175+ case List.find (\cmd -> toName cmd == command) commands of
173 Nothing ->
176 Nothing ->
174 return []
177 return []
175
178
176− Just (Interface _ _ _ _ args_ flags_ _) ->
179+ Just (Command _ _ _ _ args_ flags_ _) ->
177 fst $ Chomp.chomp (Just (index-1)) chunks args_ flags_
180 fst $ Chomp.chomp (Just (index-1)) chunks args_ flags_
178
181
179
182
terminal/src/Terminal/Args/Chomp.hs → terminal/impl/Terminal/Chomp.hsrenamed+4−5
@@ -1,6 +1,5 @@
1−{-# LANGUAGE GADTs #-}
1+{-# LANGUAGE GADTs, Rank2Types #-}
2−{-# LANGUAGE Rank2Types #-}
3−module Terminal.Args.Chomp
2+module Terminal.Chomp
4 ( chomp
3 ( chomp
5 )
4 )
6 where
5 where
@@ -8,8 +7,8 @@ module Terminal.Args.Chomp
8
7
9import qualified Data.List as List
8import qualified Data.List as List
10
9
11−import Terminal.Args.Error
10+import Terminal.Error
12−import Terminal.Args.Internal
11+import Terminal.Internal
13
12
14
13
15
14
terminal/src/Terminal/Args/Error.hs → terminal/impl/Terminal/Error.hsrenamed+12−13
@@ -1,6 +1,5 @@
1−{-# LANGUAGE GADTs #-}
2−{-# LANGUAGE OverloadedStrings #-}
1+{-# LANGUAGE GADTs, OverloadedStrings #-}
3−module Terminal.Args.Error
2+module Terminal.Error
4 ( Error(..)
3 ( Error(..)
5 , ArgError(..)
4 , ArgError(..)
6 , FlagError(..)
5 , FlagError(..)
@@ -24,7 +23,7 @@ import System.IO (hPutStrLn, stderr)
24import qualified Text.PrettyPrint.ANSI.Leijen as P
23import qualified Text.PrettyPrint.ANSI.Leijen as P
25
24
26import Reporting.Suggest as Suggest
25import Reporting.Suggest as Suggest
27−import Terminal.Args.Internal
26+import Terminal.Internal
28
27
29
28
30
29
@@ -187,22 +186,22 @@ flagsToDocs flags docs =
187-- OVERVIEW
186-- OVERVIEW
188
187
189
188
190−exitWithOverview :: P.Doc -> P.Doc -> [Interface] -> IO a
189+exitWithOverview :: P.Doc -> P.Doc -> [Command] -> IO a
191−exitWithOverview intro outro interfaces =
190+exitWithOverview intro outro commands =
192 do exeName <- getExeName
191 do exeName <- getExeName
193 exitSuccess
192 exitSuccess
194 [ intro
193 [ intro
195 , "The most common commands are:"
194 , "The most common commands are:"
196− , P.indent 4 $ stack $ Maybe.mapMaybe (toSummary exeName) interfaces
195+ , P.indent 4 $ stack $ Maybe.mapMaybe (toSummary exeName) commands
197 , "There are a bunch of other commands as well though. Here is a full list:"
196 , "There are a bunch of other commands as well though. Here is a full list:"
198− , P.indent 4 $ P.dullcyan $ toCommandList exeName interfaces
197+ , P.indent 4 $ P.dullcyan $ toCommandList exeName commands
199 , "Adding the --help flag gives a bunch of additional details about each one."
198 , "Adding the --help flag gives a bunch of additional details about each one."
200 , outro
199 , outro
201 ]
200 ]
202
201
203
202
204−toSummary :: String -> Interface -> Maybe P.Doc
203+toSummary :: String -> Command -> Maybe P.Doc
205−toSummary exeName (Interface name summary _ _ (Args args) _ _) =
204+toSummary exeName (Command name summary _ _ (Args args) _ _) =
206 case summary of
205 case summary of
207 Uncommon ->
206 Uncommon ->
208 Nothing
207 Nothing
@@ -215,10 +214,10 @@ toSummary exeName (Interface name summary _ _ (Args args) _ _) =
215 ]
214 ]
216
215
217
216
218−toCommandList :: String -> [Interface] -> P.Doc
217+toCommandList :: String -> [Command] -> P.Doc
219−toCommandList exeName interfaces =
218+toCommandList exeName commands =
220 let
219 let
221− names = map toName interfaces
220+ names = map toName commands
222 width = maximum (map length names)
221 width = maximum (map length names)
223
222
224 toExample name =
223 toExample name =
terminal/src/Terminal/Args/Helpers.hs → terminal/impl/Terminal/Helpers.hsrenamed+2−2
@@ -1,5 +1,5 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2−module Terminal.Args.Helpers
2+module Terminal.Helpers
3 ( version
3 ( version
4 , elmFile
4 , elmFile
5 , package
5 , package
@@ -14,7 +14,7 @@ import qualified Data.Map as Map
14import qualified Data.Utf8 as Utf8
14import qualified Data.Utf8 as Utf8
15import qualified System.FilePath as FP
15import qualified System.FilePath as FP
16
16
17−import Terminal.Args (Parser(..))
17+import Terminal (Parser(..))
18import qualified Deps.Registry as Registry
18import qualified Deps.Registry as Registry
19import qualified Elm.Package as Pkg
19import qualified Elm.Package as Pkg
20import qualified Elm.Version as V
20import qualified Elm.Version as V
terminal/src/Terminal/Args/Internal.hs → terminal/impl/Terminal/Internal.hsrenamed+8−8
@@ -1,6 +1,6 @@
1{-# LANGUAGE GADTs #-}
1{-# LANGUAGE GADTs #-}
2−module Terminal.Args.Internal
2+module Terminal.Internal
3− ( Interface(..)
3+ ( Command(..)
4 , toName
4 , toName
5 , Summary(..)
5 , Summary(..)
6 , Flags(..)
6 , Flags(..)
@@ -17,11 +17,11 @@ import Text.PrettyPrint.ANSI.Leijen (Doc)
17
17
18
18
19
19
20−-- INTERFACE
20+-- COMMAND
21
21
22
22
23−data Interface where
23+data Command where
24− Interface
24+ Command
25 :: String
25 :: String
26 -> Summary
26 -> Summary
27 -> String
27 -> String
@@ -29,11 +29,11 @@ data Interface where
29 -> Args args
29 -> Args args
30 -> Flags flags
30 -> Flags flags
31 -> (args -> flags -> IO ())
31 -> (args -> flags -> IO ())
32− -> Interface
32+ -> Command
33
33
34
34
35−toName :: Interface -> String
35+toName :: Command -> String
36−toName (Interface name _ _ _ _ _ _) =
36+toName (Command name _ _ _ _ _ _) =
37 name
37 name
38
38
39
39
terminal/src/Develop.hs+2−2
@@ -159,9 +159,9 @@ compile path =
159 Just root ->
159 Just root ->
160 BW.withScope $ \scope -> Stuff.withRootLock root $ Task.run $
160 BW.withScope $ \scope -> Stuff.withRootLock root $ Task.run $
161 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
161 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
162− artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromMains Reporting.silent root details (NE.List path [])
162+ artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromPaths Reporting.silent root details (NE.List path [])
163 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.dev root details artifacts
163 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.dev root details artifacts
164− let (NE.List name _) = Build.getMainNames artifacts
164+ let (NE.List name _) = Build.getRootNames artifacts
165 return $ Html.sandwich name javascript
165 return $ Html.sandwich name javascript
166
166
167
167
terminal/src/Develop/StaticFiles/Build.hs+3−3
@@ -42,13 +42,13 @@ buildReactorFrontEnd =
42 do root <- Dir.getCurrentDirectory
42 do root <- Dir.getCurrentDirectory
43 runTaskUnsafe $
43 runTaskUnsafe $
44 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
44 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
45− artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromMains Reporting.silent root details mains
45+ artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromPaths Reporting.silent root details paths
46 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.prod root details artifacts
46 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.prod root details artifacts
47 return (LBS.toStrict (B.toLazyByteString javascript))
47 return (LBS.toStrict (B.toLazyByteString javascript))
48
48
49
49
50−mains :: NE.List FilePath
50+paths :: NE.List FilePath
51−mains =
51+paths =
52 NE.List
52 NE.List
53 ("src" </> "NotFound.elm")
53 ("src" </> "NotFound.elm")
54 [ "src" </> "Errors.elm"
54 [ "src" </> "Errors.elm"
terminal/src/Main.hs+19−19
@@ -12,8 +12,8 @@ import Text.PrettyPrint.ANSI.Leijen ((<>))
12import Text.Read (readMaybe)
12import Text.Read (readMaybe)
13
13
14import qualified Elm.Version as V
14import qualified Elm.Version as V
15−import Terminal.Args
15+import Terminal
16−import Terminal.Args.Helpers
16+import Terminal.Helpers
17
17
18import qualified Bump
18import qualified Bump
19import qualified Develop
19import qualified Develop
@@ -31,7 +31,7 @@ import qualified Repl
31
31
32main :: IO ()
32main :: IO ()
33main =
33main =
34− complex intro outro
34+ Terminal.app intro outro
35 [ repl
35 [ repl
36 , init
36 , init
37 , reactor
37 , reactor
@@ -72,7 +72,7 @@ outro =
72-- INIT
72-- INIT
73
73
74
74
75−init :: Interface
75+init :: Terminal.Command
76init =
76init =
77 let
77 let
78 summary =
78 summary =
@@ -87,14 +87,14 @@ init =
87 "It will ask permission to create an elm.json file, the one thing common\
87 "It will ask permission to create an elm.json file, the one thing common\
88 \ to all Elm projects. It also provides a link explaining what to do from there."
88 \ to all Elm projects. It also provides a link explaining what to do from there."
89 in
89 in
90− Interface "init" (Common summary) details example noArgs noFlags Init.run
90+ Terminal.Command "init" (Common summary) details example noArgs noFlags Init.run
91
91
92
92
93
93
94-- REPL
94-- REPL
95
95
96
96
97−repl :: Interface
97+repl :: Terminal.Command
98repl =
98repl =
99 let
99 let
100 summary =
100 summary =
@@ -115,7 +115,7 @@ repl =
115 |-- flag "interpreter" interpreter "Path to a alternate JS interpreter, like node or nodejs."
115 |-- flag "interpreter" interpreter "Path to a alternate JS interpreter, like node or nodejs."
116 |-- onOff "no-colors" "Turn off the colors in the REPL. This can help if you are having trouble reading the values. Some terminals use a custom color scheme that diverges significantly from the standard ANSI colors, so another path may be to pick a more standard color scheme."
116 |-- onOff "no-colors" "Turn off the colors in the REPL. This can help if you are having trouble reading the values. Some terminals use a custom color scheme that diverges significantly from the standard ANSI colors, so another path may be to pick a more standard color scheme."
117 in
117 in
118− Interface "repl" (Common summary) details example noArgs replFlags Repl.run
118+ Terminal.Command "repl" (Common summary) details example noArgs replFlags Repl.run
119
119
120
120
121interpreter :: Parser String
121interpreter :: Parser String
@@ -133,7 +133,7 @@ interpreter =
133-- REACTOR
133-- REACTOR
134
134
135
135
136−reactor :: Interface
136+reactor :: Terminal.Command
137reactor =
137reactor =
138 let
138 let
139 summary =
139 summary =
@@ -154,7 +154,7 @@ reactor =
154 flags Develop.Flags
154 flags Develop.Flags
155 |-- flag "port" port_ "The port of the server (default: 8000)"
155 |-- flag "port" port_ "The port of the server (default: 8000)"
156 in
156 in
157− Interface "reactor" (Common summary) details example noArgs reactorFlags Develop.run
157+ Terminal.Command "reactor" (Common summary) details example noArgs reactorFlags Develop.run
158
158
159
159
160port_ :: Parser Int
160port_ :: Parser Int
@@ -172,7 +172,7 @@ port_ =
172-- MAKE
172-- MAKE
173
173
174
174
175−make :: Interface
175+make :: Terminal.Command
176make =
176make =
177 let
177 let
178 details =
178 details =
@@ -196,14 +196,14 @@ make =
196 |-- flag "report" Make.reportType "You can say --report=json to get error messages as JSON. This is only really useful if you are an editor plugin. Humans should avoid it!"
196 |-- flag "report" Make.reportType "You can say --report=json to get error messages as JSON. This is only really useful if you are an editor plugin. Humans should avoid it!"
197 |-- flag "docs" Make.docsFile "Generate a JSON file of documentation for a package. Eventually it will be possible to preview docs with `reactor` because it is quite hard to deal with these JSON files directly."
197 |-- flag "docs" Make.docsFile "Generate a JSON file of documentation for a package. Eventually it will be possible to preview docs with `reactor` because it is quite hard to deal with these JSON files directly."
198 in
198 in
199− Interface "make" Uncommon details example (zeroOrMore elmFile) makeFlags Make.run
199+ Terminal.Command "make" Uncommon details example (zeroOrMore elmFile) makeFlags Make.run
200
200
201
201
202
202
203-- INSTALL
203-- INSTALL
204
204
205
205
206−install :: Interface
206+install :: Terminal.Command
207install =
207install =
208 let
208 let
209 details =
209 details =
@@ -232,14 +232,14 @@ install =
232 , require1 Install.Install package
232 , require1 Install.Install package
233 ]
233 ]
234 in
234 in
235− Interface "install" Uncommon details example installArgs noFlags Install.run
235+ Terminal.Command "install" Uncommon details example installArgs noFlags Install.run
236
236
237
237
238
238
239-- PUBLISH
239-- PUBLISH
240
240
241
241
242−publish :: Interface
242+publish :: Terminal.Command
243publish =
243publish =
244 let
244 let
245 details =
245 details =
@@ -269,14 +269,14 @@ publish =
269 "Check out <https://package.elm-lang.org/help/design-guidelines> for guidance on how to create great packages!"
269 "Check out <https://package.elm-lang.org/help/design-guidelines> for guidance on how to create great packages!"
270 ]
270 ]
271 in
271 in
272− Interface "publish" Uncommon details example noArgs noFlags Publish.run
272+ Terminal.Command "publish" Uncommon details example noArgs noFlags Publish.run
273
273
274
274
275
275
276-- BUMP
276-- BUMP
277
277
278
278
279−bump :: Interface
279+bump :: Terminal.Command
280bump =
280bump =
281 let
281 let
282 details =
282 details =
@@ -289,14 +289,14 @@ bump =
289 \ it is a MAJOR change, and bump your version number to 2.0.0. I do this with\
289 \ it is a MAJOR change, and bump your version number to 2.0.0. I do this with\
290 \ all packages, so there cannot be MAJOR changes hiding in PATCH releases in Elm!"
290 \ all packages, so there cannot be MAJOR changes hiding in PATCH releases in Elm!"
291 in
291 in
292− Interface "bump" Uncommon details example noArgs noFlags Bump.run
292+ Terminal.Command "bump" Uncommon details example noArgs noFlags Bump.run
293
293
294
294
295
295
296-- DIFF
296-- DIFF
297
297
298
298
299−diff :: Interface
299+diff :: Terminal.Command
300diff =
300diff =
301 let
301 let
302 details =
302 details =
@@ -321,7 +321,7 @@ diff =
321 , require3 Diff.GlobalInquiry package version version
321 , require3 Diff.GlobalInquiry package version version
322 ]
322 ]
323 in
323 in
324− Interface "diff" Uncommon details example diffArgs noFlags Diff.run
324+ Terminal.Command "diff" Uncommon details example diffArgs noFlags Diff.run
325
325
326
326
327
327
terminal/src/Make.hs+16−16
@@ -29,7 +29,7 @@ import qualified Reporting
29import qualified Reporting.Exit as Exit
29import qualified Reporting.Exit as Exit
30import qualified Reporting.Task as Task
30import qualified Reporting.Task as Task
31import qualified Stuff
31import qualified Stuff
32−import Terminal.Args (Parser(..))
32+import Terminal (Parser(..))
33
33
34
34
35
35
@@ -107,7 +107,7 @@ runHelp root paths style (Flags debug optimize maybeOutput _ maybeDocs) =
107 case getNoMains artifacts of
107 case getNoMains artifacts of
108 [] ->
108 [] ->
109 do builder <- toBuilder root details desiredMode artifacts
109 do builder <- toBuilder root details desiredMode artifacts
110− generate style target builder (Build.getMainNames artifacts)
110+ generate style target builder (Build.getRootNames artifacts)
111
111
112 name:names ->
112 name:names ->
113 Task.throw (Exit.MakeNonMainFilesIntoJavaScript name names)
113 Task.throw (Exit.MakeNonMainFilesIntoJavaScript name names)
@@ -166,7 +166,7 @@ buildExposed style root details maybeDocs exposed =
166buildPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> Task Build.Artifacts
166buildPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> Task Build.Artifacts
167buildPaths style root details paths =
167buildPaths style root details paths =
168 Task.eio Exit.MakeCannotBuild $
168 Task.eio Exit.MakeCannotBuild $
169− Build.fromMains style root details paths
169+ Build.fromPaths style root details paths
170
170
171
171
172
172
@@ -174,13 +174,13 @@ buildPaths style root details paths =
174
174
175
175
176getMains :: Build.Artifacts -> [ModuleName.Raw]
176getMains :: Build.Artifacts -> [ModuleName.Raw]
177−getMains (Build.Artifacts _ _ mains modules) =
177+getMains (Build.Artifacts _ _ roots modules) =
178− Maybe.mapMaybe (getMain modules) (NE.toList mains)
178+ Maybe.mapMaybe (getMain modules) (NE.toList roots)
179
179
180
180
181−getMain :: [Build.Module] -> Build.Main -> Maybe ModuleName.Raw
181+getMain :: [Build.Module] -> Build.Root -> Maybe ModuleName.Raw
182−getMain modules main =
182+getMain modules root =
183− case main of
183+ case root of
184 Build.Inside name ->
184 Build.Inside name ->
185 if any (isMain name) modules
185 if any (isMain name) modules
186 then Just name
186 then Just name
@@ -207,9 +207,9 @@ isMain targetName modul =
207
207
208
208
209hasOneMain :: Build.Artifacts -> Task ModuleName.Raw
209hasOneMain :: Build.Artifacts -> Task ModuleName.Raw
210−hasOneMain (Build.Artifacts _ _ mains modules) =
210+hasOneMain (Build.Artifacts _ _ roots modules) =
211− case mains of
211+ case roots of
212− NE.List main [] -> Task.mio Exit.MakeNoMain (return $ getMain modules main)
212+ NE.List root [] -> Task.mio Exit.MakeNoMain (return $ getMain modules root)
213 NE.List _ (_:_) -> Task.throw Exit.MakeMultipleFilesIntoHtml
213 NE.List _ (_:_) -> Task.throw Exit.MakeMultipleFilesIntoHtml
214
214
215
215
@@ -218,13 +218,13 @@ hasOneMain (Build.Artifacts _ _ mains modules) =
218
218
219
219
220getNoMains :: Build.Artifacts -> [ModuleName.Raw]
220getNoMains :: Build.Artifacts -> [ModuleName.Raw]
221−getNoMains (Build.Artifacts _ _ mains modules) =
221+getNoMains (Build.Artifacts _ _ roots modules) =
222− Maybe.mapMaybe (getNoMain modules) (NE.toList mains)
222+ Maybe.mapMaybe (getNoMain modules) (NE.toList roots)
223
223
224
224
225−getNoMain :: [Build.Module] -> Build.Main -> Maybe ModuleName.Raw
225+getNoMain :: [Build.Module] -> Build.Root -> Maybe ModuleName.Raw
226−getNoMain modules main =
226+getNoMain modules root =
227− case main of
227+ case root of
228 Build.Inside name ->
228 Build.Inside name ->
229 if any (isMain name) modules
229 if any (isMain name) modules
230 then Nothing
230 then Nothing
terminal/src/Publish.hs−5
@@ -380,11 +380,6 @@ verifyBump (Env _ cache manager _ _) pkg vsn newDocs knownVersions@(Registry.Kno
380
380
381register :: Http.Manager -> Pkg.Name -> V.Version -> Docs.Documentation -> String -> Http.Sha -> Task.Task Exit.Publish ()
381register :: Http.Manager -> Pkg.Name -> V.Version -> Docs.Documentation -> String -> Http.Sha -> Task.Task Exit.Publish ()
382register manager pkg vsn docs commitHash sha =
382register manager pkg vsn docs commitHash sha =
383− if True then
384− Task.io $ putStrLn $
385− "Publishing is disabled in the 0.19.1-beta-1 release.\n\
386− \Publish with 0.19.0 for now.\n"
387− else
388 let
383 let
389 url =
384 url =
390 Website.route "/register"
385 Website.route "/register"
terminal/src/Repl.hs+30−3
@@ -3,6 +3,16 @@
3module Repl
3module Repl
4 ( Flags(..)
4 ( Flags(..)
5 , run
5 , run
6+ --
7+ , Lines(..)
8+ , Input(..)
9+ , Prefill(..)
10+ , CategorizedInput(..)
11+ , categorize
12+ --
13+ , State(..)
14+ , Output(..)
15+ , toByteString
6 )
16 )
7 where
17 where
8
18
@@ -169,9 +179,9 @@ read =
169 Nothing ->
179 Nothing ->
170 return Exit
180 return Exit
171
181
172− Just line ->
182+ Just chars ->
173 let
183 let
174− lines = Lines line []
184+ lines = Lines (stripLegacyBackslash chars) []
175 in
185 in
176 case categorize lines of
186 case categorize lines of
177 Done input -> return input
187 Done input -> return input
@@ -187,13 +197,30 @@ readMore previousLines prefill =
187
197
188 Just chars ->
198 Just chars ->
189 let
199 let
190− lines = addLine chars previousLines
200+ lines = addLine (stripLegacyBackslash chars) previousLines
191 in
201 in
192 case categorize lines of
202 case categorize lines of
193 Done input -> return input
203 Done input -> return input
194 Continue p -> readMore lines p
204 Continue p -> readMore lines p
195
205
196
206
207+-- For compatibility with 0.19.0 such that readers of "Programming Elm" by @jfairbank
208+-- can get through the REPL section successfully.
209+--
210+-- TODO: remove stripLegacyBackslash in next MAJOR release
211+--
212+stripLegacyBackslash :: [Char] -> [Char]
213+stripLegacyBackslash chars =
214+ case chars of
215+ [] ->
216+ []
217+
218+ _:_ ->
219+ if last chars == '\\'
220+ then init chars
221+ else chars
222+
223+
197data Prefill
224data Prefill
198 = Indent
225 = Indent
199 | DefStart N.Name
226 | DefStart N.Name
worker/elm.cabal+13
@@ -43,11 +43,18 @@ Executable worker
43 src
43 src
44 ../compiler/src
44 ../compiler/src
45 ../builder/src
45 ../builder/src
46+ ../terminal/src
46
47
47 Main-Is:
48 Main-Is:
48 Main.hs
49 Main.hs
49
50
50 other-modules:
51 other-modules:
52+ Artifacts
53+ Cors
54+ Endpoint.Compile
55+ Endpoint.Quotes
56+ Endpoint.Repl
57+
51 AST.Canonical
58 AST.Canonical
52 AST.Optimized
59 AST.Optimized
53 AST.Source
60 AST.Source
@@ -127,6 +134,7 @@ Executable worker
127 Parse.Type
134 Parse.Type
128 Parse.Variable
135 Parse.Variable
129 Paths_elm
136 Paths_elm
137+ Repl
130 Reporting
138 Reporting
131 Reporting.Annotation
139 Reporting.Annotation
132 Reporting.Doc
140 Reporting.Doc
@@ -162,9 +170,11 @@ Executable worker
162 Type.UnionFind
170 Type.UnionFind
163
171
164 Build-depends:
172 Build-depends:
173+ aeson,
165 ansi-terminal >= 0.8 && < 0.9,
174 ansi-terminal >= 0.8 && < 0.9,
166 ansi-wl-pprint >= 0.6.8 && < 0.7,
175 ansi-wl-pprint >= 0.6.8 && < 0.7,
167 base >=4.11 && <5,
176 base >=4.11 && <5,
177+ base64-bytestring,
168 binary >= 0.8 && < 0.9,
178 binary >= 0.8 && < 0.9,
169 bytestring >= 0.9 && < 0.11,
179 bytestring >= 0.9 && < 0.11,
170 containers >= 0.5.8.2 && < 0.6,
180 containers >= 0.5.8.2 && < 0.6,
@@ -173,6 +183,7 @@ Executable worker
173 filelock,
183 filelock,
174 filepath >= 1 && < 2.0,
184 filepath >= 1 && < 2.0,
175 ghc-prim >= 0.5.2,
185 ghc-prim >= 0.5.2,
186+ haskeline,
176 HTTP >= 4000.2.5 && < 4000.4,
187 HTTP >= 4000.2.5 && < 4000.4,
177 http-client >= 0.6 && < 0.7,
188 http-client >= 0.6 && < 0.7,
178 http-client-tls >= 0.3 && < 0.4,
189 http-client-tls >= 0.3 && < 0.4,
@@ -183,6 +194,8 @@ Executable worker
183 network >= 2.4 && < 2.7,
194 network >= 2.4 && < 2.7,
184 network-uri,
195 network-uri,
185 parsec,
196 parsec,
197+ process,
198+ random,
186 raw-strings-qq,
199 raw-strings-qq,
187 scientific,
200 scientific,
188 SHA,
201 SHA,
worker/elm.json+3−8
@@ -8,18 +8,13 @@
8 "direct": {
8 "direct": {
9 "elm/browser": "1.0.1",
9 "elm/browser": "1.0.1",
10 "elm/core": "1.0.2",
10 "elm/core": "1.0.2",
11− "elm/file": "1.0.5",
12 "elm/html": "1.0.0",
11 "elm/html": "1.0.0",
13− "elm/http": "2.0.0",
14 "elm/json": "1.1.3",
12 "elm/json": "1.1.3",
15− "elm/random": "1.0.0",
13+ "elm/project-metadata-utils": "1.0.0"
16− "elm/svg": "1.0.1",
17− "elm/time": "1.0.0",
18− "elm-explorations/linear-algebra": "1.0.3",
19− "elm-explorations/webgl": "1.1.0"
20 },
14 },
21 "indirect": {
15 "indirect": {
22− "elm/bytes": "1.0.8",
16+ "elm/parser": "1.1.0",
17+ "elm/time": "1.0.0",
23 "elm/url": "1.0.0",
18 "elm/url": "1.0.0",
24 "elm/virtual-dom": "1.0.2"
19 "elm/virtual-dom": "1.0.2"
25 }
20 }
worker/outlines/compile/elm.jsonnew file+32
@@ -0,0 +1,32 @@
1+{
2+ "type": "application",
3+ "source-directories": [
4+ "../../src"
5+ ],
6+ "elm-version": "0.19.1",
7+ "dependencies": {
8+ "direct": {
9+ "elm/browser": "1.0.1",
10+ "elm/core": "1.0.2",
11+ "elm/file": "1.0.5",
12+ "elm/html": "1.0.0",
13+ "elm/http": "2.0.0",
14+ "elm/json": "1.1.3",
15+ "elm/random": "1.0.0",
16+ "elm/svg": "1.0.1",
17+ "elm/time": "1.0.0",
18+ "elm-explorations/linear-algebra": "1.0.3",
19+ "elm-explorations/webgl": "1.1.0",
20+ "evancz/elm-playground": "1.0.2"
21+ },
22+ "indirect": {
23+ "elm/bytes": "1.0.8",
24+ "elm/url": "1.0.0",
25+ "elm/virtual-dom": "1.0.2"
26+ }
27+ },
28+ "test-dependencies": {
29+ "direct": {},
30+ "indirect": {}
31+ }
32+}
worker/outlines/repl/elm.jsonnew file+19
@@ -0,0 +1,19 @@
1+{
2+ "type": "application",
3+ "source-directories": [
4+ "../../src"
5+ ],
6+ "elm-version": "0.19.1",
7+ "dependencies": {
8+ "direct": {
9+ "elm/core": "1.0.2"
10+ },
11+ "indirect": {
12+ "elm/json": "1.1.3"
13+ }
14+ },
15+ "test-dependencies": {
16+ "direct": {},
17+ "indirect": {}
18+ }
19+}
worker/src/Artifacts.hsnew file+155
@@ -0,0 +1,155 @@
1+{-# OPTIONS_GHC -Wall #-}
2+module Artifacts
3+ ( Artifacts(..)
4+ , loadCompile
5+ , loadRepl
6+ , toDepsInfo
7+ )
8+ where
9+
10+
11+import Control.Concurrent (readMVar)
12+import Control.Monad (liftM2)
13+import qualified Data.ByteString as BS
14+import qualified Data.ByteString.Builder as B
15+import qualified Data.ByteString.Lazy as LBS
16+import qualified Data.Map as Map
17+import qualified Data.Name as N
18+import qualified Data.OneOrMore as OneOrMore
19+import qualified System.Directory as Dir
20+import System.FilePath ((</>))
21+
22+import qualified AST.Canonical as Can
23+import qualified AST.Optimized as Opt
24+import qualified BackgroundWriter as BW
25+import qualified Elm.Details as Details
26+import qualified Elm.Interface as I
27+import qualified Elm.ModuleName as ModuleName
28+import qualified Elm.Package as Pkg
29+import Json.Encode ((==>))
30+import qualified Json.Encode as E
31+import qualified Json.String as Json
32+import qualified Reporting
33+
34+
35+
36+-- ARTIFACTS
37+
38+
39+data Artifacts =
40+ Artifacts
41+ { _ifaces :: Map.Map ModuleName.Raw I.Interface
42+ , _graph :: Opt.GlobalGraph
43+ }
44+
45+
46+loadCompile :: IO Artifacts
47+loadCompile =
48+ load ("outlines" </> "compile")
49+
50+
51+loadRepl :: IO Artifacts
52+loadRepl =
53+ load ("outlines" </> "repl")
54+
55+
56+
57+-- LOAD
58+
59+
60+load :: FilePath -> IO Artifacts
61+load dir =
62+ BW.withScope $ \scope ->
63+ do putStrLn $ "Loading " ++ dir </> "elm.json"
64+ style <- Reporting.terminal
65+ root <- fmap (</> dir) Dir.getCurrentDirectory
66+ result <- Details.load style scope root
67+ case result of
68+ Left _ ->
69+ error $ "Ran into some problem loading elm.json\nTry running `elm make` in: " ++ dir
70+
71+ Right details ->
72+ do omvar <- Details.loadObjects root details
73+ imvar <- Details.loadInterfaces root details
74+ mdeps <- readMVar imvar
75+ mobjs <- readMVar omvar
76+ case liftM2 (,) mdeps mobjs of
77+ Nothing ->
78+ error $ "Ran into some weird problem loading elm.json\nTry running `elm make` in: " ++ dir
79+
80+ Just (deps, objs) ->
81+ return $ Artifacts (toInterfaces deps) objs
82+
83+
84+toInterfaces :: Map.Map ModuleName.Canonical I.DependencyInterface -> Map.Map ModuleName.Raw I.Interface
85+toInterfaces deps =
86+ Map.mapMaybe toUnique $ Map.fromListWith OneOrMore.more $
87+ Map.elems (Map.mapMaybeWithKey getPublic deps)
88+
89+
90+getPublic :: ModuleName.Canonical -> I.DependencyInterface -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore I.Interface)
91+getPublic (ModuleName.Canonical _ name) dep =
92+ case dep of
93+ I.Public iface -> Just (name, OneOrMore.one iface)
94+ I.Private _ _ _ -> Nothing
95+
96+
97+toUnique :: OneOrMore.OneOrMore a -> Maybe a
98+toUnique oneOrMore =
99+ case oneOrMore of
100+ OneOrMore.One value -> Just value
101+ OneOrMore.More _ _ -> Nothing
102+
103+
104+
105+-- TO DEPS INFO
106+
107+
108+toDepsInfo :: Artifacts -> BS.ByteString
109+toDepsInfo (Artifacts ifaces _) =
110+ LBS.toStrict $ B.toLazyByteString $ E.encodeUgly $ encode ifaces
111+
112+
113+
114+-- ENCODE
115+
116+
117+encode :: Map.Map ModuleName.Raw I.Interface -> E.Value
118+encode ifaces =
119+ E.dict Json.fromName encodeInterface ifaces
120+
121+
122+encodeInterface :: I.Interface -> E.Value
123+encodeInterface (I.Interface pkg values unions aliases binops) =
124+ E.object
125+ [ "pkg" ==> E.chars (Pkg.toChars pkg)
126+ , "ops" ==> E.list E.name (Map.keys binops)
127+ , "values" ==> E.list E.name (Map.keys values)
128+ , "aliases" ==> E.list E.name (Map.keys (Map.filter isPublicAlias aliases))
129+ , "types" ==> E.dict Json.fromName (E.list E.name) (Map.mapMaybe toPublicUnion unions)
130+ ]
131+
132+
133+isPublicAlias :: I.Alias -> Bool
134+isPublicAlias alias =
135+ case alias of
136+ I.PublicAlias _ -> True
137+ I.PrivateAlias _ -> False
138+
139+
140+toPublicUnion :: I.Union -> Maybe [N.Name]
141+toPublicUnion union =
142+ case union of
143+ I.OpenUnion (Can.Union _ variants _ _) ->
144+ Just (map getVariantName variants)
145+
146+ I.ClosedUnion _ ->
147+ Just []
148+
149+ I.PrivateUnion _ ->
150+ Nothing
151+
152+
153+getVariantName :: Can.Ctor -> N.Name
154+getVariantName (Can.Ctor name _ _ _) =
155+ name
worker/src/Cors.hsnew file+48
@@ -0,0 +1,48 @@
1+{-# OPTIONS_GHC -Wall #-}
2+module Cors
3+ ( allow
4+ )
5+ where
6+
7+
8+import qualified Data.HashSet as HashSet
9+import Network.URI (parseURI)
10+import Snap.Core (Snap, Method, method)
11+import Snap.Util.CORS (CORSOptions(..), HashableMethod(..), OriginList(Origins), applyCORS, mkOriginSet)
12+
13+
14+
15+-- ALLOW
16+
17+
18+allow :: Method -> [String] -> Snap () -> Snap ()
19+allow method_ origins snap =
20+ applyCORS (toOptions method_ origins) $ method method_ $
21+ snap
22+
23+
24+
25+-- TO OPTIONS
26+
27+
28+toOptions :: (Monad m) => Method -> [String] -> CORSOptions m
29+toOptions method_ origins =
30+ let
31+ allowedOrigins = toOriginList origins
32+ allowedMethods = HashSet.singleton (HashableMethod method_)
33+ in
34+ CORSOptions
35+ { corsAllowOrigin = return allowedOrigins
36+ , corsAllowCredentials = return True
37+ , corsExposeHeaders = return HashSet.empty
38+ , corsAllowedMethods = return allowedMethods
39+ , corsAllowedHeaders = return
40+ }
41+
42+
43+toOriginList :: [String] -> OriginList
44+toOriginList origins =
45+ Origins $ mkOriginSet $
46+ case traverse parseURI origins of
47+ Just uris -> uris
48+ Nothing -> error "invalid entry given to toOriginList list"
worker/src/Endpoint/Compile.hsnew file+323
@@ -0,0 +1,323 @@
1+{-# OPTIONS_GHC -Wall #-}
2+{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
3+module Endpoint.Compile
4+ ( endpoint_V1
5+ , endpoint_V2
6+ , loadErrorJS
7+ )
8+ where
9+
10+
11+import qualified Data.ByteString as B
12+import qualified Data.ByteString.Builder as B
13+import qualified Data.ByteString.Lazy as LBS
14+import qualified Data.Map as Map
15+import qualified Data.Map.Utils as Map
16+import qualified Data.Name as N
17+import qualified Data.NonEmptyList as NE
18+import Snap.Core
19+import Snap.Util.FileUploads
20+import qualified System.Directory as Dir
21+import qualified System.IO.Streams as Stream
22+import Text.RawString.QQ (r)
23+
24+import qualified Artifacts as A
25+import qualified Cors
26+
27+import qualified AST.Source as Src
28+import qualified AST.Canonical as Can
29+import qualified AST.Optimized as Opt
30+import qualified BackgroundWriter as BW
31+import qualified Build
32+import qualified Compile
33+import qualified Elm.Details as Details
34+import qualified Elm.Interface as I
35+import qualified Elm.ModuleName as ModuleName
36+import qualified Elm.Package as Pkg
37+import qualified File
38+import qualified Generate
39+import qualified Generate.Html as Html
40+import qualified Generate.JavaScript as JS
41+import qualified Generate.Mode as Mode
42+import qualified Json.Encode as Encode
43+import qualified Parse.Module as Parse
44+import qualified Reporting
45+import qualified Reporting.Annotation as A
46+import Reporting.Doc ((<>))
47+import qualified Reporting.Doc as D
48+import qualified Reporting.Error as Error
49+import qualified Reporting.Error.Import as Import
50+import qualified Reporting.Exit as Exit
51+import qualified Reporting.Exit.Help as Help
52+import qualified Reporting.Task as Task
53+
54+
55+
56+-- ALLOWED ORIGINS
57+
58+
59+allowedOrigins :: [String]
60+allowedOrigins =
61+ [ "https://elm-lang.org"
62+ , "https://package.elm-lang.org"
63+ ]
64+
65+
66+
67+-- ENDPOINT (V1)
68+
69+
70+endpoint_V1 :: A.Artifacts -> Snap ()
71+endpoint_V1 artifacts =
72+ endpoint artifacts $ \result ->
73+ case result of
74+ Ok name js -> writeBuilder $ Html.sandwich name js
75+ Err report -> writeBuilder $ renderProblem_V1 report
76+
77+
78+
79+-- ENDPOINT (V2)
80+
81+
82+endpoint_V2 :: A.Artifacts -> Snap ()
83+endpoint_V2 artifacts =
84+ endpoint artifacts $ \result ->
85+ case result of
86+ Ok name js -> writeBuilder $ renderSuccess_V2 name js
87+ Err report -> writeBuilder $ renderProblem_V2 report
88+
89+
90+
91+-- ENDPOINT
92+
93+
94+data Result
95+ = Ok N.Name B.Builder
96+ | Err Help.Report
97+
98+
99+endpoint :: A.Artifacts -> (Result -> Snap ()) -> Snap ()
100+endpoint artifacts callback =
101+ Cors.allow POST allowedOrigins $
102+ do result <- foldMultipart defaultUploadPolicy ignoreFile 0
103+ case result of
104+ ([("code",source)], 0) ->
105+ do modifyResponse $ setContentType "text/html; charset=utf-8"
106+ callback $
107+ case compile artifacts source of
108+ Success name js -> Ok name js
109+ NoMain -> Err noMain
110+ BadInput name err -> Err $ Help.compilerReport "/" (Error.Module name "/try" File.zeroTime source err) []
111+
112+ _ ->
113+ do modifyResponse $ setResponseStatus 400 "Bad Request"
114+ modifyResponse $ setContentType "text/html; charset=utf-8"
115+ writeBS
116+ "<p>Unexpected request format. This should not be possible!</p>\
117+ \<p>Please report this\
118+ \ <a href=\"https://github.com/elm/compiler/issues\">here</a>\
119+ \ along with the URL and your browser version.</p>"
120+
121+
122+ignoreFile :: PartInfo -> Stream.InputStream B.ByteString -> Int -> IO Int
123+ignoreFile _ _ count =
124+ return (count + 1)
125+
126+
127+
128+-- COMPILE
129+
130+
131+data Outcome
132+ = Success N.Name B.Builder
133+ | NoMain
134+ | BadInput ModuleName.Raw Error.Error
135+
136+
137+compile :: A.Artifacts -> B.ByteString -> Outcome
138+compile (A.Artifacts interfaces objects) source =
139+ case Parse.fromByteString Parse.Application source of
140+ Left err ->
141+ BadInput N._Main (Error.BadSyntax err)
142+
143+ Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
144+ case checkImports interfaces imports of
145+ Left err ->
146+ BadInput (Src.getName modul) (Error.BadImports err)
147+
148+ Right ifaces ->
149+ case Compile.compile Pkg.dummyName ifaces modul of
150+ Left err ->
151+ BadInput (Src.getName modul) err
152+
153+ Right (Compile.Artifacts canModule _ locals) ->
154+ case locals of
155+ Opt.LocalGraph Nothing _ _ ->
156+ NoMain
157+
158+ Opt.LocalGraph (Just main_) _ _ ->
159+ let
160+ mode = Mode.Dev Nothing
161+ home = Can._name canModule
162+ name = ModuleName._module home
163+ mains = Map.singleton home main_
164+ graph = Opt.addLocalGraph locals objects
165+ in
166+ Success name $ JS.generate mode graph mains
167+
168+
169+checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
170+checkImports interfaces imports =
171+ let
172+ importDict = Map.fromValues Src.getImportName imports
173+ missing = Map.difference importDict interfaces
174+ in
175+ case Map.elems missing of
176+ [] ->
177+ Right (Map.intersection interfaces importDict)
178+
179+ i:is ->
180+ let
181+ unimported =
182+ Map.keysSet (Map.difference interfaces importDict)
183+
184+ toError (Src.Import (A.At region name) _ _) =
185+ Import.Error region name unimported Import.NotFound
186+ in
187+ Left (fmap toError (NE.List i is))
188+
189+
190+
191+-- RENDER PROBLEM (V1)
192+
193+
194+renderProblem_V1 :: Help.Report -> B.Builder
195+renderProblem_V1 report =
196+ [r|<!DOCTYPE HTML>
197+<html>
198+<head>
199+ <meta charset="UTF-8">
200+ <style>body { padding: 0; margin: 0; background-color: black; }</style>
201+ <script src="https://worker.elm-lang.org/compile/errors.js"></script>
202+</head>
203+<body>
204+ <script>
205+ var app = Elm.Errors.init({flags:|] <> Encode.encodeUgly (Exit.toJson report) <> [r|});
206+ app.ports.jumpTo.subscribe(function(region) {
207+ window.parent.postMessage(JSON.stringify(region), "*");
208+ });
209+ </script>
210+</body>
211+</html>|]
212+
213+
214+
215+-- RENDER SUCCESS (V2)
216+
217+
218+renderSuccess_V2 :: N.Name -> B.Builder -> B.Builder
219+renderSuccess_V2 moduleName javascript =
220+ let name = N.toBuilder moduleName in
221+ [r|<!DOCTYPE HTML>
222+<html>
223+<head>
224+ <meta charset="UTF-8">
225+ <title>|] <> name <> [r|</title>
226+ <style>body { padding: 0; margin: 0; }</style>
227+</head>
228+
229+<body>
230+
231+<pre id="elm"></pre>
232+
233+<script>
234+window.parent.postMessage("SUCCESS", "*");
235+
236+try {
237+|] <> javascript <> [r|
238+
239+ var app = Elm.|] <> name <> [r|.init({ node: document.getElementById("elm") });
240+}
241+catch (e)
242+{
243+ // display initialization errors (e.g. bad flags, infinite recursion)
244+ var header = document.createElement("h1");
245+ header.style.fontFamily = "monospace";
246+ header.innerText = "Initialization Error";
247+ var pre = document.getElementById("elm");
248+ document.body.insertBefore(header, pre);
249+ pre.innerText = e;
250+ throw e;
251+}
252+</script>
253+
254+</body>
255+</html>|]
256+
257+
258+
259+-- RENDER PROBLEM (V2)
260+
261+
262+renderProblem_V2 :: Help.Report -> B.Builder
263+renderProblem_V2 report =
264+ [r|<!DOCTYPE HTML>
265+<html>
266+<head>
267+ <meta charset="UTF-8">
268+ <style>body { padding: 0; margin: 0; display: none; }</style>
269+</head>
270+<body>
271+ <script>
272+ var errors = |] <> Encode.encodeUgly (Exit.toJson report) <> [r|;
273+ window.parent.postMessage(JSON.stringify(errors), "*");
274+ </script>
275+</body>
276+</html>|]
277+
278+
279+
280+-- NO MAIN
281+
282+
283+noMain :: Help.Report
284+noMain =
285+ Help.report "NO MAIN" Nothing
286+ (
287+ "Without a `main` value, I do not know what to show on screen!"
288+ )
289+ [ D.reflow $
290+ "Adding a `main` value can be as brief as:"
291+ , D.vcat
292+ [ D.fillSep [D.cyan "import","Html"]
293+ , ""
294+ , D.fillSep [D.green "main","="]
295+ , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
296+ ]
297+ , D.reflow $
298+ "Try adding something like that!"
299+ , D.toSimpleNote $
300+ "I recommend looking through https://guide.elm-lang.org for more advice on\
301+ \ how to fill in `main` values."
302+ ]
303+
304+
305+
306+-- LOAD ERROR JS
307+
308+
309+loadErrorJS :: IO B.ByteString
310+loadErrorJS =
311+ let
312+ run work =
313+ do result <- work
314+ case result of
315+ Right a -> return a
316+ Left _ -> error "problem building src/Errors.elm"
317+ in
318+ BW.withScope $ \scope ->
319+ do root <- Dir.getCurrentDirectory
320+ details <- run $ Details.load Reporting.silent scope root
321+ artifacts <- run $ Build.fromPaths Reporting.silent root details (NE.List "src/Errors.elm" [])
322+ javascript <- run $ Task.run $ Generate.prod root details artifacts
323+ return $ LBS.toStrict $ B.toLazyByteString javascript
worker/src/Endpoint/Quotes.hsnew file+114
@@ -0,0 +1,114 @@
1+{-# LANGUAGE BangPatterns, MagicHash, OverloadedStrings, UnboxedTuples #-}
2+module Endpoint.Quotes
3+ ( endpoint
4+ )
5+ where
6+
7+
8+import Control.Monad.IO.Class (liftIO)
9+import qualified Data.ByteString as BS
10+import GHC.Int (Int(I#))
11+import GHC.Prim
12+import GHC.ST (ST(ST), runST)
13+import qualified System.Random as Random
14+
15+import Snap.Core
16+
17+
18+
19+-- ENDPOINT
20+
21+
22+endpoint :: Snap ()
23+endpoint =
24+ do modifyResponse
25+ $ setContentType "application/json"
26+ . setHeader "Access-Control-Allow-Origin" "*"
27+ writeBS =<< liftIO getQuote
28+
29+
30+getQuote :: IO BS.ByteString
31+getQuote =
32+ let
33+ (Quotes sa#) = quotes
34+ in
35+ do (I# i#) <- Random.randomRIO (0, I# (sizeofSmallArray# sa# -# 1#))
36+ case indexSmallArray# sa# i# of
37+ (# json #) ->
38+ return json
39+
40+
41+
42+-- QUOTES
43+
44+
45+data Quotes =
46+ Quotes (SmallArray# BS.ByteString)
47+
48+
49+quotes :: Quotes
50+quotes =
51+ let
52+ !(I# len#) = length quoteList
53+ in
54+ runST $ ST $ \s ->
55+ case newSmallArray# len# "" s of
56+ (# s, sma# #) ->
57+ case quotesHelp# sma# quoteList s of
58+ s ->
59+ case unsafeFreezeSmallArray# sma# s of
60+ (# s, sa# #) ->
61+ (# s, Quotes sa# #)
62+
63+
64+quotesHelp# :: SmallMutableArray# s a -> [a] -> State# s -> State# s
65+quotesHelp# sma# =
66+ go 0#
67+ where
68+ go i# list s =
69+ case list of
70+ [] ->
71+ s
72+
73+ x:xs ->
74+ case writeSmallArray# sma# i# x s of
75+ s ->
76+ go (i# +# 1#) xs s
77+
78+
79+quoteList :: [BS.ByteString]
80+quoteList =
81+ [ "{\"source\":\"Civilization and its Discontents\",\"author\":\"Sigmund Freud\",\"year\":1902,\"quote\":\"The enormous expansion of communications, due to the world-wide telegraph and telephone networks, has entirely transformed the conditions of trade and commerce. Everything is done in haste, at fever pitch. The night is used for travel, the day for business; even \\u201Choliday trips\\u201D put a strain on the nervous system. Great political, industrial and financial crises carry this excitement into far wider areas of the population than ever before. Interest in political life has become universal: tempers are inflamed by political, religious and social struggles, party politics, electioneering and the immense growth of trade-unionism; people are forced to engage in constant mental activity and robbed of the time the need for relaxation, sleep and rest.\"}"
82+ , "{\"source\":\"A Preface to Politics\",\"author\":\"Walter Lippmann\",\"year\":1913,\"quote\":\"The Economic Man\\u2014that lazy abstraction\\u2014is still paraded in the lecture room.\"}"
83+ , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"You ask me to say what you should consider it particularly important to avoid. My answer is this: a mass crowd. It is something to which you cannot entrust yourself yet without risk. I at any rate am ready to confess my own frailty in this respect. I never come back home with quite the same moral character as I went out with.\"}"
84+ , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"December used to be a month but it is now a year\"}"
85+ , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"But nothing is as ruinous to the character as sitting away one\\u2019s time at a show - for it is then, through the medium of entertainment, that vices creep into one with more than usual ease.\"}"
86+ , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"All this hurrying from place to place won\\u2019t bring you any relief, for you\\u2019re travelling in the company of your own emotions, followed by your troubles all the way. If only they were really following you! They\\u2019d be farther away from you: as it is they\\u2019re not at your back, but on it! That\\u2019s why they weigh you down with just the same uncomfortable chafing wherever you are. It\\u2019s medicine, not a particular part of the world, that a person needs if he\\u2019s ill. Suppose someone has broken his leg or dislocated a joint; he doesn\\u2019t get into a carriage or board a ship: he calls in a doctor to have the fracture set or the dislocation reduced. Well then, when a person\\u2019s spirit is wrenched or broken at so many points, do you imagine that it can be put right by a change of scenery, that that sort of trouble isn\\u2019t so serious that it can\\u2019t be cured by an outing?\"}"
87+ , "{\"source\":\"Progress and Poverty\",\"author\":\"Henry George\",\"year\":1879,\"quote\":\"The present century has been marked by a prodigious increase in wealth-producing power. The utilization of steam and electricity, the introduction of improved processes and laborsaving machinery, the greater subdivision and grander scale of production, the wonderful facilitation of exchanges, have multiplied enormously the effectiveness of labor. At the beginning of this marvelous era it was natural to expect, and it was expected, that laborsaving inventions would lighten the toil and improve the condition of the laborer; that the enormous increase in the power of producing wealth would make real poverty a thing of the past.\"}"
88+ , "{\"source\":\"Imperialism\",\"author\":\"John Hobson\",\"year\":1902,\"quote\":\"Although the new Imperialism has been bad business for the nation, it has been good business for certain classes and certain trades within the nation. The vast expenditure on armaments, the costly wars, the grave risks and embarrassments of foreign policy, the stoppage of political and social reforms within Great Britain, though fraught with great injury to the nation, have served well the present business interests of certain industries and professions.\"}"
89+ , "{\"source\":\"Neo-Colonialism\",\"author\":\"Kwame Nkrumah\",\"year\":1965,\"quote\":\"The essence of neo-colonialism is that the State which is subject to it is, in theory, independent and has all the outward trappings of international sovereignty. In reality its economic system and thus its political policy is directed from the outside. The methods and form of this direction can take various shapes. For example, in an extreme case the troops of the imperial power may garrison the territory of the neo-colonial State and control the government of it. More often, however, neo-colonialist control is exercised through economic or monetary means. The neo-colonial State may be obliged to take the manufactured products of the imperialist power to the exclusion of competing products from elsewhere. Control over government policy in the neo-colonial State may be secured by payments towards the cost of running the State, by the provision of civil servants in positions where they can dictate policy, and by monetary control over foreign exchange through the imposition of a banking system controlled by the imperial power.\"}"
90+ , "{\"source\":\"Neo-Colonialism\",\"author\":\"Kwame Nkrumah\",\"year\":1965,\"quote\":\"In the end the situation arises that the only type of aid which the neo-colonialist masters consider as safe is \\u2018military aid\\u2019. Once a neo-colonialist territory is brought to such a state of economic chaos and misery that revolt actually breaks out then, and only then, is there no limit to the generosity of the neo-colonial overlord, provided, of course, that the funds supplied are utilised exclusively for military purposes. Military aid in fact marks the last stage of neo-colonialism and its effect is self-destructive. Sooner or later the weapons supplied pass into the hands of the opponents of the neo-colonialist regime and the war itself increases the social misery which originally provoked it.\"}"
91+ , "{\"source\":\"Barnyard in your Backyard\",\"author\":\"Gail Damerow\",\"year\":2002,\"quote\":\"Wild jungle fowl, the ancestors of modern chickens, met their nutritional needs by consuming a variety of plants and insects. Given enough room to roam, some of today\\u2019s breeds remain active foragers.\"}"
92+ , "{\"source\":\"Barnyard in your Backyard\",\"author\":\"Gail Damerow\",\"year\":2002,\"quote\":\"Another way to reduce the cost of feed is to let your chickens roam on a lawn or in a pasture for part of the day. By eating plants, seeds, and insects, they will balance their diet and eat less of the expensive commercial stuff. Take care not to put your chickens on grass or around buildings that have been sprayed with toxins.\"}"
93+ , "{\"source\":\"Co-operation in Danish Agriculture\",\"author\":\"Harald Faber\",\"year\":1918,\"quote\":\"A plan for improving the butter made from the milk from peasant farms by collecting the milk to be worked at one place was submitted to the Royal Agricultural Society of Denmark as early as 1852, and it pointed out that this could be done on co-operative lines, the peasants being the owners of the factory and sharing the proceeds.\"}"
94+ , "{\"source\":\"Co-operation in Danish Agriculture\",\"author\":\"Harald Faber\",\"year\":1918,\"quote\":\"It was the Danish peasants themselves who found a practical way of developing the dairy industry, and they found this by applying the co-operative principles introduced by the Rochdale weavers. They received no support and only lukewarm sympathy from large farmers and estate owners, until later on when the co-operative dairies were doing so well that even owners of estates with two to three hundred cows found it to their advantage to close their private dairies and to join co-operative dairies.\"}"
95+ , "{\"source\":\"Beekeeping: A Practical Guide\",\"author\":\"Richard Bonney\",\"year\":1993,\"quote\":\"How many of you have been in a classroom or a training program where the instructor says at the outset, \\u201CLook at the person on your right; now look at the person on your left. One of you won\\u2019t be here next year.\\u201D Beekeeping is like that. Furthermore, not all beekeepers are truly beekeepers. Some are beehavers.\"}"
96+ , "{\"source\":\"The Rodale Book of Composting\",\"author\":\"Deborah Martin and Grace Gershuny\",\"year\":1992,\"quote\":\"Earthworms. If bacteria are the champion microscopic decomposers, then the heavyweight champion is doubtless the earthworm. Pages of praise have been written to the earthworm, ever since it became known that this creature spends most of its time tilling and enriching the soil.\"}"
97+ , "{\"source\":\"War is a Racket\",\"author\":\"General Smedley Butler\",\"year\":1935,\"quote\":\"There are 40,000,000 men under arms in the world today, and our statesmen and diplomats have the temerity to say that war is not in the making. Hell\\u2019s bells! Are these 40,000,000 men being trained to be dancers?\"}"
98+ , "{\"source\":\"Root Cellaring\",\"author\":\"Mike and Nancy Bubel\",\"year\":1991,\"quote\":\"What is not so widely acknowledged is that the soil in which your plants grow can influence the keeping quality of the vegetables you harvest. According to studies reported in E. P. Shirakov\\u2019s \\u201CPractical Course in Storage and Processing of Fruits and Vegetables\\u201D, abundant potash in the soil promotes long storage life of fruits and vegetables grown on that soil.\"}"
99+ , "{\"source\":\"Angora Goats the Northern Way\",\"author\":\"Susan Black Drummond\",\"year\":1985,\"quote\":\"Because of its long wearing qualities and resistance to soil, mohair was once a major upholstery fabric in this country, and was the seat cover material in many cars and in British Railroad seats. The synthetic fiber craze put an end to mohair use as upholstery fabric here.\"}"
100+ , "{\"source\":\"Making a Newspaper\",\"author\":\"John Given\",\"year\":1912,\"quote\":\"Yellow journalism originated through a desire to gain readers and advertisers, and it produced results. Its original disciples have readers by the hundred thousand and they have about all the advertising that they can well handle.\"}"
101+ , "{\"source\":\"Making a Newspaper\",\"author\":\"John Given\",\"year\":1912,\"quote\":\"With the adding of every new train and the improvement of every new time-table, the building of every new trolley road, and the establishment of every new mail route, the big city papers are enabled to reach out further, and, wherever they reach, the local papers suffer [...] There is not a paper published in any city between New York and Boston that has not in the last ten years been hurt by the papers of these two cities.\"}"
102+ , "{\"source\":\"Muscles: Testing and Function (4th Edition)\",\"author\":\"Florence Kendall, Elizabeth McCreary, Patricia Provance\",\"year\":1993,\"quote\":\"The mechanics of the low back is inseparable from that of the overall posture but especially that of the pelvis and the lower extremities. Pain manifested in the leg may be due to an underlying problem in the back. Conversely, the symptoms appearing in the low back may be due to underlying faulty mechanics of the feet, legs, or pelvis.\"}"
103+ , "{\"source\":\"Farmers of Forty Centuries\",\"author\":\"F. H. King\",\"year\":1911,\"quote\":\"The Sikiang is one of the great rivers of China and indeed of the world. Its width at Wuchow at low water was nearly a mile and our steamer anchored in twenty-four feet of water to a floating dock made fast by huge iron chains reaching three hundred feet up the slop to the city proper, thus providing for a rise of twenty-six feet in the river at its flood stage during the rainy season.\"}"
104+ , "{\"source\":\"How to Grow More Vegetables\",\"author\":\"John Jeavons\",\"year\":1974,\"quote\":\"If you are having trouble with birds eating the berries in your berry patch, you could erect a wren house in the middle of it. Wrens are insectivores, and they will not bother the berries. But they will attack any bird, however large, that comes near their nest.\"}"
105+ , "{\"source\":\"Confidence Men and Painted Women\",\"author\":\"Karen Halttunen\",\"year\":1982,\"quote\":\"Even one\\u2019s neighbor next door, as a visitor to Pittsburgh commented in 1818, might be a stranger: \\u201CA next door neighbor is, with them, frequently unknown, and months and years pass, without their exchanging with each other the ordinary compliments of friendship and goodwill.\\u201D\"}"
106+ , "{\"source\":\"Secondhand Time\",\"author\":\"Svetlana Alexievich\",\"year\":2016,\"quote\":\"I couldn\\u2019t understand what was going on. I remember seeing Gaidar on TV saying, \\u201Clearn how to sell... The market will save us...\\u201D You buy a bottle of mineral water on one corner and sell it on another\\u2014that\\u2019s business. The people listened, bewildered. I would come home, lock the door, and weep.\"}"
107+ , "{\"source\":\"Hiroshima\",\"author\":\"John Hersey\",\"year\":1985,\"quote\":\"At exactly fifteen minutes past eight in the morning, on August 6, 1945, Japanese time, at the moment when the atomic bomb flashed above Hiroshima, Miss Toshiko Sasaki, a clerk in the personnel department of the East Asia Tin Works, had just sat down at her place in the plant office and was turning her head to speak to the girl at the next desk.\"}"
108+ , "{\"source\":\"The Orphan\",\"author\":\"Maxim Gorky\",\"year\":1899,\"quote\":\"On a foggy and rainy day, by the cemetery gate, a small group of people standing in a muddy puddle were bargaining with the cabman. \\u201CFifteen kopeks!\\u201D The tall and heavy-set priest exclaimed in a deep bass, in response to the cabman\\u2019s shouts asking for twenty-five kopecks.\"}"
109+ , "{\"source\":\"Shah of Shahs\",\"author\":\"Ryszard Kapuściński\",\"year\":1982,\"quote\":\"This plane flies out of Teheran every day and lands at Munich at noon. Waiting limousines carry the passengers to elegant restaurants for lunch. After lunch they all fly back to Teheran in the same airplane and eat their suppers at home. Hardly an expensive entertainment, the jaunt costs only two thousand dollars a head. For people in the Shah\\u2019s favor, such a sum is nothing.\"}"
110+ , "{\"source\":\"Introduction to Fortran IV\",\"author\":\"Paul Chirlian\",\"year\":1973,\"quote\":\"There are many programming languages that can be used. We shall discuss a language that is almost universally used, and which is particularly applicable to mathematical and scientific computations. This language is FORTRAN IV.\"}"
111+ ]
112+
113+
114+
worker/src/Endpoint/Repl.hsnew file+244
@@ -0,0 +1,244 @@
1+{-# OPTIONS_GHC -Wall #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+module Endpoint.Repl
4+ ( endpoint
5+ )
6+ where
7+
8+
9+import Data.Aeson ((.:))
10+import qualified Data.Aeson as Aeson
11+import qualified Data.Aeson.Types as Aeson
12+import qualified Data.ByteString as BS
13+import qualified Data.ByteString.Builder as B
14+import qualified Data.ByteString.Lazy as LBS
15+import Data.Map ((!))
16+import qualified Data.Map as Map
17+import qualified Data.Map.Utils as Map
18+import qualified Data.Name as N
19+import qualified Data.NonEmptyList as NE
20+import Snap.Core
21+
22+import qualified Artifacts as A
23+import qualified Cors
24+
25+import qualified AST.Source as Src
26+import qualified AST.Canonical as Can
27+import qualified AST.Optimized as Opt
28+import qualified Compile
29+import qualified Elm.Interface as I
30+import qualified Elm.ModuleName as ModuleName
31+import qualified Elm.Package as Pkg
32+import qualified File
33+import qualified Generate.JavaScript as JS
34+import qualified Json.Encode as Encode
35+import qualified Parse.Module as Parse
36+import qualified Repl
37+import qualified Reporting.Annotation as A
38+import qualified Reporting.Error as Error
39+import qualified Reporting.Error.Import as Import
40+import qualified Reporting.Exit as Exit
41+import qualified Reporting.Exit.Help as Help
42+import qualified Reporting.Render.Type.Localizer as L
43+
44+
45+
46+-- ALLOWED ORIGINS
47+
48+
49+allowedOrigins :: [String]
50+allowedOrigins =
51+ [ "https://guide.elm-lang.org"
52+ , "https://guide.elm-lang.jp"
53+ , "http://localhost:8007"
54+ ]
55+
56+
57+
58+-- ENDPOINT
59+
60+
61+endpoint :: A.Artifacts -> Snap ()
62+endpoint artifacts =
63+ Cors.allow POST allowedOrigins $
64+ do body <- readRequestBody (64 * 1024)
65+ case decodeBody body of
66+ Just (state, entry) ->
67+ serveOutcome (toOutcome artifacts state entry)
68+
69+ Nothing ->
70+ do modifyResponse $ setResponseStatus 400 "Bad Request"
71+ modifyResponse $ setContentType "text/html; charset=utf-8"
72+ writeBS "Received unexpected JSON body."
73+
74+
75+
76+-- TO OUTCOME
77+
78+
79+data Outcome
80+ = NewImport N.Name
81+ | NewType N.Name
82+ | NewWork B.Builder
83+ --
84+ | Skip
85+ | Indent
86+ | DefStart N.Name
87+ --
88+ | NoPorts
89+ | InvalidCommand
90+ | Failure BS.ByteString Error.Error
91+
92+
93+toOutcome :: A.Artifacts -> Repl.State -> String -> Outcome
94+toOutcome artifacts state entry =
95+ case reverse (lines entry) of
96+ [] ->
97+ Skip
98+
99+ prev : rev ->
100+ case Repl.categorize (Repl.Lines prev rev) of
101+ Repl.Done input ->
102+ case input of
103+ Repl.Import name src -> compile artifacts state (ImportEntry name src)
104+ Repl.Type name src -> compile artifacts state (TypeEntry name src)
105+ Repl.Decl name src -> compile artifacts state (DeclEntry name src)
106+ Repl.Expr src -> compile artifacts state (ExprEntry src)
107+ Repl.Port -> NoPorts
108+ Repl.Skip -> Skip
109+ Repl.Reset -> InvalidCommand
110+ Repl.Exit -> InvalidCommand
111+ Repl.Help _ -> InvalidCommand
112+
113+ Repl.Continue prefill ->
114+ case prefill of
115+ Repl.Indent -> Indent
116+ Repl.DefStart name -> DefStart name
117+
118+
119+
120+-- SERVE OUTCOME
121+
122+
123+serveOutcome :: Outcome -> Snap ()
124+serveOutcome outcome =
125+ let
126+ serveString = serveBuilder "text/plain"
127+ in
128+ case outcome of
129+ NewImport name -> serveString $ "add-import:" <> N.toBuilder name
130+ NewType name -> serveString $ "add-type:" <> N.toBuilder name
131+ NewWork js -> serveBuilder "application/javascript" js
132+ Skip -> serveString $ "skip"
133+ Indent -> serveString $ "indent"
134+ DefStart name -> serveString $ "def-start:" <> N.toBuilder name
135+ NoPorts -> serveString $ "no-ports"
136+ InvalidCommand -> serveString $ "invalid-command"
137+ Failure source err ->
138+ serveBuilder "application/json" $ Encode.encodeUgly $ Exit.toJson $
139+ Help.compilerReport "/" (Error.Module N.replModule "/repl" File.zeroTime source err) []
140+
141+
142+serveBuilder :: BS.ByteString -> B.Builder -> Snap ()
143+serveBuilder mime builder =
144+ do modifyResponse (setContentType mime)
145+ writeBuilder builder
146+
147+
148+
149+-- COMPILE
150+
151+
152+data EntryType
153+ = ImportEntry N.Name BS.ByteString
154+ | TypeEntry N.Name BS.ByteString
155+ | DeclEntry N.Name BS.ByteString
156+ | ExprEntry BS.ByteString
157+
158+
159+compile :: A.Artifacts -> Repl.State -> EntryType -> Outcome
160+compile (A.Artifacts interfaces objects) state@(Repl.State imports types decls) entryType =
161+ let
162+ source =
163+ case entryType of
164+ ImportEntry name src -> Repl.toByteString (state { Repl._imports = Map.insert name (B.byteString src) imports }) Repl.OutputNothing
165+ TypeEntry name src -> Repl.toByteString (state { Repl._types = Map.insert name (B.byteString src) types }) Repl.OutputNothing
166+ DeclEntry name src -> Repl.toByteString (state { Repl._decls = Map.insert name (B.byteString src) decls }) (Repl.OutputDecl name)
167+ ExprEntry src -> Repl.toByteString state (Repl.OutputExpr src)
168+ in
169+ case
170+ do modul <- mapLeft Error.BadSyntax $ Parse.fromByteString Parse.Application source
171+ ifaces <- mapLeft Error.BadImports $ checkImports interfaces (Src._imports modul)
172+ artifacts <- Compile.compile Pkg.dummyName ifaces modul
173+ return ( modul, artifacts, objects )
174+ of
175+ Left err ->
176+ Failure source err
177+
178+ Right info ->
179+ case entryType of
180+ ImportEntry name _ -> NewImport name
181+ TypeEntry name _ -> NewType name
182+ DeclEntry name _ -> NewWork (toJavaScript info (Just name))
183+ ExprEntry _ -> NewWork (toJavaScript info Nothing)
184+
185+
186+toJavaScript :: (Src.Module, Compile.Artifacts, Opt.GlobalGraph) -> Maybe N.Name -> B.Builder
187+toJavaScript (modul, Compile.Artifacts canModule types locals, objects) maybeName =
188+ let
189+ localizer = L.fromModule modul
190+ graph = Opt.addLocalGraph locals objects
191+ home = Can._name canModule
192+ tipe = types ! maybe N.replValueToPrint id maybeName
193+ in
194+ JS.generateForReplEndpoint localizer graph home maybeName tipe
195+
196+
197+mapLeft :: (x -> y) -> Either x a -> Either y a
198+mapLeft func result =
199+ either (Left . func) Right result
200+
201+
202+checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
203+checkImports interfaces imports =
204+ let
205+ importDict = Map.fromValues Src.getImportName imports
206+ missing = Map.difference importDict interfaces
207+ in
208+ case Map.elems missing of
209+ [] ->
210+ Right (Map.intersection interfaces importDict)
211+
212+ i:is ->
213+ let
214+ unimported =
215+ Map.keysSet (Map.difference interfaces importDict)
216+
217+ toError (Src.Import (A.At region name) _ _) =
218+ Import.Error region name unimported Import.NotFound
219+ in
220+ Left (fmap toError (NE.List i is))
221+
222+
223+
224+-- DECODE BODY
225+
226+
227+decodeBody :: LBS.ByteString -> Maybe ( Repl.State, String )
228+decodeBody body =
229+ Aeson.parseMaybe decodeBodyHelp =<< Aeson.decode' body
230+
231+
232+decodeBodyHelp :: Aeson.Object -> Aeson.Parser ( Repl.State, String )
233+decodeBodyHelp obj =
234+ let
235+ get key =
236+ do dict <- obj .: key
237+ let f (k,v) = (N.fromChars k, B.stringUtf8 v)
238+ return $ Map.fromList $ map f $ Map.toList dict
239+ in
240+ do imports <- get "imports"
241+ types <- get "types"
242+ decls <- get "decls"
243+ entry <- obj .: "entry"
244+ return ( Repl.State imports types decls, entry )
worker/src/Errors.elmnew file+217
@@ -0,0 +1,217 @@
1+port module Errors exposing (main)
2+
3+
4+import Browser
5+import Char
6+import Html exposing (..)
7+import Html.Attributes exposing (..)
8+import Html.Events exposing (onClick)
9+import String
10+import Json.Decode as D
11+import Elm.Error as Error
12+
13+
14+
15+-- PORTS
16+
17+
18+port jumpTo : Error.Region -> Cmd msg
19+
20+
21+
22+-- MAIN
23+
24+
25+main =
26+ Browser.document
27+ { init = \flags -> (D.decodeValue Error.decoder flags, Cmd.none)
28+ , update = \region result -> (result, jumpTo region)
29+ , view = view
30+ , subscriptions = \_ -> Sub.none
31+ }
32+
33+
34+type alias Msg = Error.Region
35+
36+
37+
38+-- VIEW
39+
40+
41+view : Result D.Error Error.Error -> Browser.Document Msg
42+view result =
43+ { title = "Problem!"
44+ , body =
45+ case result of
46+ Err err ->
47+ [ text (D.errorToString err) ]
48+
49+ Ok error ->
50+ [ viewError error ]
51+ }
52+
53+
54+viewError : Error.Error -> Html Msg
55+viewError error =
56+ div
57+ [ style "width" "calc(100% - 4em)"
58+ , style "min-height" "calc(100% - 4em)"
59+ , style "font-family" "monospace"
60+ , style "white-space" "pre-wrap"
61+ , style "background-color" "black"
62+ , style "color" "rgb(233,235,235)"
63+ , style "padding" "2em"
64+ ]
65+ (viewErrorHelp error)
66+
67+
68+viewErrorHelp : Error.Error -> List (Html Msg)
69+viewErrorHelp error =
70+ case error of
71+ Error.GeneralProblem { title, message } ->
72+ viewHeader title Nothing :: viewMessage message
73+
74+ Error.ModuleProblems badModules ->
75+ viewBadModules badModules
76+
77+
78+
79+-- VIEW HEADER
80+
81+
82+viewHeader : String -> Maybe Error.Region -> Html Msg
83+viewHeader title maybeRegion =
84+ case maybeRegion of
85+ Nothing ->
86+ span [ style "color" "rgb(51,187,200)" ]
87+ [ text <| "-- " ++ title ++ " "
88+ , text <| String.repeat (76 - String.length title) "-"
89+ , text <| "\n\n"
90+ ]
91+
92+ Just region ->
93+ span [ style "color" "rgb(51,187,200)" ]
94+ [ text <| "-- " ++ title ++ " "
95+ , text <| String.repeat (60 - String.length title) "-"
96+ , text " "
97+ , span
98+ [ style "cursor" "pointer"
99+ , style "text-decoration" "underline"
100+ , onClick region
101+ ]
102+ [ text "Jump To Problem"
103+ ]
104+ , text <| "\n\n"
105+ ]
106+
107+
108+
109+-- VIEW BAD MODULES
110+
111+
112+viewBadModules : List Error.BadModule -> List (Html Msg)
113+viewBadModules badModules =
114+ case badModules of
115+ [] ->
116+ []
117+
118+ [badModule] ->
119+ [viewBadModule badModule]
120+
121+ a :: b :: cs ->
122+ viewBadModule a :: viewSeparator a.name b.name :: viewBadModules (b :: cs)
123+
124+
125+viewBadModule : Error.BadModule -> Html Msg
126+viewBadModule { problems } =
127+ span [] (List.map viewProblem problems)
128+
129+
130+viewProblem : Error.Problem -> Html Msg
131+viewProblem problem =
132+ span [] (viewHeader problem.title (Just problem.region) :: viewMessage problem.message)
133+
134+
135+viewSeparator : String -> String -> Html msg
136+viewSeparator before after =
137+ span [ style "color" "rgb(211,56,211)" ]
138+ [ text <|
139+ String.padLeft 80 ' ' (before ++ " ↑ ") ++ "\n" ++
140+ "====o======================================================================o====\n" ++
141+ " ↓ " ++ after ++ "\n\n\n"
142+ ]
143+
144+
145+
146+-- VIEW MESSAGE
147+
148+
149+viewMessage : List Error.Chunk -> List (Html msg)
150+viewMessage chunks =
151+ case chunks of
152+ [] ->
153+ [ text "\n\n\n" ]
154+
155+ chunk :: others ->
156+ let
157+ htmlChunk =
158+ case chunk of
159+ Error.Unstyled string ->
160+ text string
161+
162+ Error.Styled style string ->
163+ span (styleToAttrs style) [ text string ]
164+ in
165+ htmlChunk :: viewMessage others
166+
167+
168+styleToAttrs : Error.Style -> List (Attribute msg)
169+styleToAttrs { bold, underline, color } =
170+ addBold bold <| addUnderline underline <| addColor color []
171+
172+
173+addBold : Bool -> List (Attribute msg) -> List (Attribute msg)
174+addBold bool attrs =
175+ if bool then
176+ style "font-weight" "bold" :: attrs
177+ else
178+ attrs
179+
180+
181+addUnderline : Bool -> List (Attribute msg) -> List (Attribute msg)
182+addUnderline bool attrs =
183+ if bool then
184+ style "text-decoration" "underline" :: attrs
185+ else
186+ attrs
187+
188+
189+addColor : Maybe Error.Color -> List (Attribute msg) -> List (Attribute msg)
190+addColor maybeColor attrs =
191+ case maybeColor of
192+ Nothing ->
193+ attrs
194+
195+ Just color ->
196+ style "color" (colorToCss color) :: attrs
197+
198+
199+colorToCss : Error.Color -> String
200+colorToCss color =
201+ case color of
202+ Error.Red -> "rgb(194,54,33)"
203+ Error.RED -> "rgb(252,57,31)"
204+ Error.Magenta -> "rgb(211,56,211)"
205+ Error.MAGENTA -> "rgb(249,53,248)"
206+ Error.Yellow -> "rgb(173,173,39)"
207+ Error.YELLOW -> "rgb(234,236,35)"
208+ Error.Green -> "rgb(37,188,36)"
209+ Error.GREEN -> "rgb(49,231,34)"
210+ Error.Cyan -> "rgb(51,187,200)"
211+ Error.CYAN -> "rgb(20,240,240)"
212+ Error.Blue -> "rgb(73,46,225)"
213+ Error.BLUE -> "rgb(88,51,255)"
214+ Error.White -> "rgb(203,204,205)"
215+ Error.WHITE -> "rgb(233,235,235)"
216+ Error.Black -> "rgb(0,0,0)"
217+ Error.BLACK -> "rgb(129,131,131)"
worker/src/Main.hs+35−264
@@ -1,54 +1,21 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2−{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
2+{-# LANGUAGE OverloadedStrings #-}
3module Main
3module Main
4 ( main
4 ( main
5 )
5 )
6 where
6 where
7
7
8
8
9−import Control.Concurrent (readMVar)
9+import Control.Monad (msum)
10−import Control.Monad (liftM2, msum)
11−import qualified Data.ByteString as B
10+import qualified Data.ByteString as BS
12−import qualified Data.ByteString.Builder as B
13−import qualified Data.ByteString.Lazy as LBS
14−import qualified Data.HashSet as HashSet
15−import qualified Data.Map as Map
16−import qualified Data.Map.Utils as Map
17−import qualified Data.Name as N
18−import qualified Data.NonEmptyList as NE
19−import qualified Data.OneOrMore as OneOrMore
20−import Network.URI (parseURI)
21import Snap.Core
11import Snap.Core
22import Snap.Http.Server
12import Snap.Http.Server
23−import Snap.Util.CORS (CORSOptions(..), HashableMethod(..), OriginList(Origins), applyCORS, mkOriginSet)
24−import Snap.Util.FileUploads
25−import qualified System.Directory as Dir
26−import qualified System.IO.Streams as Stream
27−import Text.RawString.QQ (r)
28
13
29−import qualified AST.Source as Src
14+import qualified Artifacts
30−import qualified AST.Canonical as Can
15+import qualified Cors
31−import qualified AST.Optimized as Opt
16+import qualified Endpoint.Compile as Compile
32−import qualified BackgroundWriter as BW
33−import qualified Build
34−import qualified Compile
35−import qualified Elm.Details as Details
36−import qualified Elm.Interface as I
37−import qualified Elm.ModuleName as ModuleName
17+import qualified Endpoint.Quotes as Quotes
38−import qualified Elm.Package as Pkg
18+import qualified Endpoint.Repl as Repl
39−import qualified File
40−import qualified Generate
41−import qualified Generate.Html as Html
42−import qualified Generate.JavaScript as Generate
43−import qualified Generate.Mode as Mode
44−import qualified Json.Encode as Encode
45−import qualified Parse.Module as Parse
46−import qualified Reporting
47−import qualified Reporting.Annotation as A
48−import qualified Reporting.Error as Error
49−import qualified Reporting.Error.Import as Import
50−import qualified Reporting.Exit as Exit
51−import qualified Reporting.Task as Task
52
19
53
20
54
21
@@ -57,246 +24,50 @@ import qualified Reporting.Task as Task
57
24
58main :: IO ()
25main :: IO ()
59main =
26main =
60− do artifacts <- loadArtifacts
27+ do rArtifacts <- Artifacts.loadRepl
61− errorJS <- compileErrorViewer
28+ cArtifacts <- Artifacts.loadCompile
29+ errorJS <- Compile.loadErrorJS
30+ let depsInfo = Artifacts.toDepsInfo cArtifacts
31+
62 httpServe config $ msum $
32 httpServe config $ msum $
63− [ path "compile" $ compile artifacts
33+ [ ifTop $ status
34+ , path "repl" $ Repl.endpoint rArtifacts
35+ , path "compile" $ Compile.endpoint_V1 cArtifacts
36+ , path "compile/v2" $ Compile.endpoint_V2 cArtifacts
64− , path "compile/errors.js" $ writeBS errorJS
37+ , path "compile/errors.js" $ serveJavaScript errorJS
38+ , path "compile/deps-info.json" $ serveDepsInfo depsInfo
39+ , path "quotes" $ Quotes.endpoint
65 , notFound
40 , notFound
66 ]
41 ]
67
42
68
43
69config :: Config Snap a
44config :: Config Snap a
70config =
45config =
71− defaultConfig
72− |> setPort 8000
73− |> setAccessLog ConfigNoLog
46+ setPort 8000 $ setAccessLog ConfigNoLog $ setErrorLog ConfigNoLog $ defaultConfig
74− |> setErrorLog ConfigNoLog
75−
76−
77−(|>) :: a -> (a -> b) -> b
78−(|>) value func =
79− func value
80−
81
47
82
48
83−-- NOT FOUND
49+status :: Snap ()
50+status =
51+ do modifyResponse $ setContentType "text/plain"
52+ writeBuilder "Status: OK"
84
53
85
54
86notFound :: Snap ()
55notFound :: Snap ()
87notFound =
56notFound =
88 do modifyResponse $ setResponseStatus 404 "Not Found"
57 do modifyResponse $ setResponseStatus 404 "Not Found"
89 modifyResponse $ setContentType "text/html; charset=utf-8"
58 modifyResponse $ setContentType "text/html; charset=utf-8"
90− writeBS "Not Found"
59+ writeBuilder "Not Found"
91−
92−
93−
94−-- COMPILE ENDPOINT
95−
96−
97−compile :: Artifacts -> Snap ()
98−compile artifacts =
99− applyCORS corsOptions $ method POST $
100− do result <- foldMultipart defaultUploadPolicy ignoreFile 0
101− case result of
102− ([("code",source)], 0) ->
103− do modifyResponse $ setContentType "text/html; charset=utf-8"
104− case compileToBuilder artifacts source of
105− Right builder -> writeBuilder builder
106− Left exit -> writeBuilder (exitToHtmlBuilder exit)
107−
108− _ ->
109− do modifyResponse $ setResponseStatus 400 "Bad Request"
110− modifyResponse $ setContentType "text/html; charset=utf-8"
111− writeBS
112− "<p>Unexpected request format. This should not be possible!</p>\
113− \<p>Please report this\
114− \ <a href=\"https://github.com/elm/compiler/issues\">here</a>\
115− \ along with the URL and your browser version.</p>"
116−
117−
118−ignoreFile :: PartInfo -> Stream.InputStream B.ByteString -> Int -> IO Int
119−ignoreFile _ _ count =
120− return (count + 1)
121−
122−
123−exitToHtmlBuilder :: Exit.Worker -> B.Builder
124−exitToHtmlBuilder exit =
125− let
126− json =
127− Encode.encodeUgly $ Exit.toJson $ Exit.workerToReport exit
128− in
129− [r|<!DOCTYPE HTML>
130−<html>
131−<head>
132− <meta charset="UTF-8">
133− <style>body { padding: 0; margin: 0; background-color: black; }</style>
134− <script src="https://worker.elm-lang.org/compile/errors.js"></script>
135−</head>
136−<body>
137− <script>Elm.Errors.init({flags:|] <> json <> [r|});</script>
138−</body>
139−</html>|]
140−
141−
142−
143−-- COMPILE TO BUILDER
144−
145−
146−compileToBuilder :: Artifacts -> B.ByteString -> Either Exit.Worker B.Builder
147−compileToBuilder (Artifacts interfaces objects) source =
148− case Parse.fromByteString Pkg.dummyName source of
149− Left err ->
150− Left $ toInputError N._Main source (Error.BadSyntax err)
151−
152− Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
153− case checkImports interfaces imports of
154− Left err ->
155− Left $ toInputError (Src.getName modul) source (Error.BadImports err)
156−
157− Right ifaces ->
158− case Compile.compile Pkg.dummyName ifaces modul of
159− Left err ->
160− Left $ toInputError (Src.getName modul) source err
161−
162− Right (Compile.Artifacts canModule _ locals) ->
163− case locals of
164− Opt.LocalGraph Nothing _ _ ->
165− Left Exit.WorkerNoMain
166−
167− Opt.LocalGraph (Just main_) _ _ ->
168− let
169− mode = Mode.Dev Nothing
170− home = Can._name canModule
171− name = ModuleName._module home
172− mains = Map.singleton home main_
173− graph = Opt.addLocalGraph locals objects
174− in
175− Right $ Html.sandwich name $ Generate.generate mode graph mains
176−
177−
178−checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
179−checkImports interfaces imports =
180− let
181− importDict = Map.fromValues Src.getImportName imports
182− missing = Map.difference importDict interfaces
183− in
184− case Map.elems missing of
185− [] ->
186− Right (Map.intersection interfaces importDict)
187−
188− i:is ->
189− let
190− unimported = Map.keysSet (Map.difference interfaces importDict)
191− toError (Src.Import (A.At region name) _ _) =
192− Import.Error region name unimported Import.NotFound
193− in
194− Left (fmap toError (NE.List i is))
195−
196−
197−toInputError :: ModuleName.Raw -> B.ByteString -> Error.Error -> Exit.Worker
198−toInputError name source err =
199− Exit.WorkerInputError $
200− Error.Module name "/try" File.zeroTime source err
201−
202−
203−
204−-- COMPILE ERROR VIEWER
205−
206−
207−compileErrorViewer :: IO B.ByteString
208−compileErrorViewer =
209− let
210− run work =
211− do result <- work
212− case result of
213− Right a -> return a
214− Left _ -> error "problem building reactor/src/Errors.elm"
215− in
216− Dir.withCurrentDirectory "../reactor" $ BW.withScope $ \scope ->
217− do let root = "."
218− details <- run $ Details.load Reporting.silent scope root
219− artifacts <- run $ Build.fromMains Reporting.silent root details (NE.List "src/Errors.elm" [])
220− javascript <- run $ Task.run $ Generate.prod root details artifacts
221− return $ LBS.toStrict $ B.toLazyByteString javascript
222−
223−
224−
225−-- CORS OPTIONS
226−
227−
228−corsOptions :: (Monad m) => CORSOptions m
229−corsOptions =
230− let
231− allowedOrigins = toOriginList [ "https://elm-lang.org", "https://package.elm-lang.org" ]
232− allowedMethods = HashSet.singleton (HashableMethod POST)
233− in
234− CORSOptions
235− { corsAllowOrigin = return allowedOrigins
236− , corsAllowCredentials = return True
237− , corsExposeHeaders = return HashSet.empty
238− , corsAllowedMethods = return allowedMethods
239− , corsAllowedHeaders = return
240− }
241−
242−
243−toOriginList :: [String] -> OriginList
244−toOriginList origins =
245− Origins $ mkOriginSet $
246− case traverse parseURI origins of
247− Just uris -> uris
248− Nothing -> error "invalid entry given to toOriginList list"
249−
250−
251−
252−-- ARTIFACTS
253−
254−
255−data Artifacts =
256− Artifacts
257− { _ifaces :: Map.Map ModuleName.Raw I.Interface
258− , _graph :: Opt.GlobalGraph
259− }
260−
261−
262−loadArtifacts :: IO Artifacts
263−loadArtifacts =
264− BW.withScope $ \scope ->
265− do style <- Reporting.terminal
266− root <- Dir.getCurrentDirectory
267− result <- Details.load style scope root
268− case result of
269− Left _ ->
270− error "Ran into some problem loading elm.json details"
271−
272− Right details ->
273− do omvar <- Details.loadObjects root details
274− imvar <- Details.loadInterfaces root details
275− mdeps <- readMVar imvar
276− mobjs <- readMVar omvar
277− case liftM2 (,) mdeps mobjs of
278− Nothing ->
279− error "Ran into some weird problem loading elm.json details"
280−
281− Just (deps, objs) ->
282− return $ Artifacts (toInterfaces deps) objs
283−
284
60
285−toInterfaces :: Map.Map ModuleName.Canonical I.DependencyInterface -> Map.Map ModuleName.Raw I.Interface
286−toInterfaces deps =
287− Map.mapMaybe toUnique $ Map.fromListWith OneOrMore.more $
288− Map.elems (Map.mapMaybeWithKey getPublic deps)
289
61
62+serveJavaScript :: BS.ByteString -> Snap ()
63+serveJavaScript javascript =
64+ do modifyResponse $ setContentType "application/javascript"
65+ writeBS javascript
290
66
291−getPublic :: ModuleName.Canonical -> I.DependencyInterface -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore I.Interface)
292−getPublic (ModuleName.Canonical _ name) dep =
293− case dep of
294− I.Public iface -> Just (name, OneOrMore.one iface)
295− I.Private _ _ _ -> Nothing
296
67
68+serveDepsInfo :: BS.ByteString -> Snap ()
69+serveDepsInfo json =
70+ Cors.allow GET ["https://elm-lang.org"] $
71+ do modifyResponse $ setContentType "application/json"
72+ writeBS json
297
73
298−toUnique :: OneOrMore.OneOrMore a -> Maybe a
299−toUnique oneOrMore =
300− case oneOrMore of
301− OneOrMore.One value -> Just value
302− OneOrMore.More _ _ -> Nothing