git.iko.soy/elk
on master help sign in
Update deps format in elm.json for apps
49e5b46Evan Czaplicki
builder/src/Elm/Project/Json.hs+50−73
compare with master
unifiedsplit
@@ -12,11 +12,10 @@ module Elm.Project.Json
12 , read
12 , read
13 , pkgDecoder
13 , pkgDecoder
14 -- queries
14 -- queries
15− , appSolution
16 , isPlatformPackage
15 , isPlatformPackage
17− , get
18 , getName
16 , getName
19 , getExposed
17 , getExposed
18+ , check
20 )
19 )
21 where
20 where
22
21
@@ -62,9 +61,10 @@ data AppInfo =
62 AppInfo
61 AppInfo
63 { _app_elm_version :: Version
62 { _app_elm_version :: Version
64 , _app_source_dirs :: [FilePath]
63 , _app_source_dirs :: [FilePath]
65− , _app_deps :: Map Name Version
64+ , _app_deps_direct :: Map Name Version
66− , _app_test_deps :: Map Name Version
65+ , _app_deps_trans :: Map Name Version
66+ , _app_test_direct :: Map Name Version
67− , _app_trans_deps :: Map Name Version
67+ , _app_test_trans :: Map Name Version
68 }
68 }
69
69
70
70
@@ -103,15 +103,6 @@ defaultSummary =
103-- QUERIES
103-- QUERIES
104
104
105
105
106−appSolution :: AppInfo -> Map Name Version
107−appSolution info =
108− Map.unions
109− [ _app_deps info
110− , _app_test_deps info
111− , _app_trans_deps info
112− ]
113−
114−
115isPlatformPackage :: Project -> Bool
106isPlatformPackage :: Project -> Bool
116isPlatformPackage project =
107isPlatformPackage project =
117 case project of
108 case project of
@@ -120,25 +111,20 @@ isPlatformPackage project =
120
111
121 Pkg info ->
112 Pkg info ->
122 let
113 let
123− (Pkg.Name user _) =
114+ (Pkg.Name author _) =
124 _pkg_name info
115 _pkg_name info
125 in
116 in
126− user == "elm" || user == "elm-explorations"
117+ author == "elm" || author == "elm-explorations"
127
118
128
119
129−get :: (AppInfo -> a) -> (PkgInfo -> a) -> Project -> a
120+getName :: Project -> Name
130−get appFunc pkgFunc project =
121+getName project =
131 case project of
122 case project of
132− App info ->
123+ App _ ->
133− appFunc info
124+ Pkg.dummyName
134
125
135 Pkg info ->
126 Pkg info ->
136− pkgFunc info
137−
138−
139−getName :: Project -> Name
140−getName project =
141− get (\_ -> Pkg.dummyName) _pkg_name project
127+ _pkg_name info
142
128
143
129
144getExposed :: PkgInfo -> [Module.Raw]
130getExposed :: PkgInfo -> [Module.Raw]
@@ -151,6 +137,25 @@ getExposed info =
151 concatMap snd chunks
137 concatMap snd chunks
152
138
153
139
140+check :: Project -> Task.Task ()
141+check project =
142+ case project of
143+ Pkg (PkgInfo _ _ _ _ _ deps _ _) ->
144+ if Map.member Pkg.core deps
145+ then return ()
146+ else throwBadJson E.NoPkgCore
147+
148+ App (AppInfo _ _ direct indirect _ _) ->
149+ if Map.member Pkg.core direct then
150+
151+ if Map.member Pkg.json direct || Map.member Pkg.json indirect
152+ then return ()
153+ else throwBadJson E.NoAppJson
154+
155+ else
156+ throwBadJson E.NoAppCore
157+
158+
154
159
155-- WRITE
160-- WRITE
156
161
@@ -167,15 +172,21 @@ write root project =
167encode :: Project -> E.Value
172encode :: Project -> E.Value
168encode project =
173encode project =
169 case project of
174 case project of
170− App (AppInfo elm srcDirs deps tests trans) ->
175+ App (AppInfo elm srcDirs depsDirect depsTrans testDirect testTrans) ->
171 E.object
176 E.object
172 [ "type" ==> E.text "application"
177 [ "type" ==> E.text "application"
173 , "source-directories" ==> E.list (E.text . Text.pack) srcDirs
178 , "source-directories" ==> E.list (E.text . Text.pack) srcDirs
174 , "elm-version" ==> encodeVersion elm
179 , "elm-version" ==> encodeVersion elm
180+ , "dependencies" ==>
181+ E.object
182+ [ "direct" ==> encodeDeps encodeVersion depsDirect
175− , "dependencies" ==> encodeDeps encodeVersion deps
183+ , "indirect" ==> encodeDeps encodeVersion depsTrans
184+ ]
185+ , "test-dependencies" ==>
186+ E.object
176− , "test-dependencies" ==> encodeDeps encodeVersion tests
187+ [ "direct" ==> encodeDeps encodeVersion testDirect
177− , "do-not-edit-this-by-hand" ==>
178− E.object [ "transitive-dependencies" ==> encodeDeps encodeVersion trans ]
188+ , "indirect" ==> encodeDeps encodeVersion testTrans
189+ ]
179 ]
190 ]
180
191
181 Pkg (PkgInfo name summary license version exposed deps tests elm) ->
192 Pkg (PkgInfo name summary license version exposed deps tests elm) ->
@@ -238,17 +249,11 @@ read path =
238 Left err ->
249 Left err ->
239 throwBadJson (E.BadJson err)
250 throwBadJson (E.BadJson err)
240
251
241− Right project@(Pkg (PkgInfo name _ _ _ _ deps tests _)) ->
252+ Right project@(Pkg _) ->
242− do checkOverlap "dependencies" "test-dependencies" deps tests
243− pkgHasCore name deps
244− return project
253+ return project
245
254
246− Right project@(App (AppInfo _ srcDirs deps tests trans)) ->
255+ Right project@(App (AppInfo _ srcDirs _ _ _ _)) ->
247− do checkOverlap "dependencies" "test-dependencies" deps tests
248− checkOverlap "dependencies" "transitive-dependencies" deps trans
249− checkOverlap "test-dependencies" "transitive-dependencies" tests trans
250− mapM_ doesDirectoryExist srcDirs
256+ do mapM_ doesDirectoryExist srcDirs
251− appHasCoreAndJson (Map.union deps trans)
252 return project
257 return project
253
258
254
259
@@ -257,16 +262,6 @@ throwBadJson problem =
257 Task.throw (Exit.Assets (E.BadElmJson problem))
262 Task.throw (Exit.Assets (E.BadElmJson problem))
258
263
259
264
260−checkOverlap :: String -> String -> Map Name a -> Map Name a -> Task.Task ()
261−checkOverlap field1 field2 deps1 deps2 =
262− case Map.keys (Map.intersection deps1 deps2) of
263− [] ->
264− return ()
265−
266− dup : dups ->
267− throwBadJson (E.BadDepDup field1 field2 dup dups)
268−
269−
270doesDirectoryExist :: FilePath -> Task.Task ()
265doesDirectoryExist :: FilePath -> Task.Task ()
271doesDirectoryExist dir =
266doesDirectoryExist dir =
272 do exists <- liftIO $ Dir.doesDirectoryExist dir
267 do exists <- liftIO $ Dir.doesDirectoryExist dir
@@ -275,25 +270,6 @@ doesDirectoryExist dir =
275 else throwBadJson (E.BadSrcDir dir)
270 else throwBadJson (E.BadSrcDir dir)
276
271
277
272
278−appHasCoreAndJson :: Map Name a -> Task.Task ()
279−appHasCoreAndJson pkgs =
280− if Map.member Pkg.core pkgs then
281−
282− if Map.member Pkg.json pkgs
283− then return ()
284− else throwBadJson E.NoAppJson
285−
286− else
287− throwBadJson E.NoAppCore
288−
289−
290−pkgHasCore :: Name -> Map Name a -> Task.Task ()
291−pkgHasCore name pkgs =
292− if name == Pkg.core || Map.member Pkg.core pkgs
293− then return ()
294− else throwBadJson E.NoPkgCore
295−
296−
297
273
298-- JSON DECODE
274-- JSON DECODE
299
275
@@ -321,9 +297,10 @@ appDecoder =
321 AppInfo
297 AppInfo
322 <$> D.field "elm-version" versionDecoder
298 <$> D.field "elm-version" versionDecoder
323 <*> D.field "source-directories" (D.list dirDecoder)
299 <*> D.field "source-directories" (D.list dirDecoder)
324− <*> D.field "dependencies" (depsDecoder versionDecoder)
300+ <*> D.field "dependencies" (D.field "direct" (depsDecoder versionDecoder))
301+ <*> D.field "dependencies" (D.field "indirect" (depsDecoder versionDecoder))
325− <*> D.field "test-dependencies" (depsDecoder versionDecoder)
302+ <*> D.field "test-dependencies" (D.field "direct" (depsDecoder versionDecoder))
326− <*> D.at ["do-not-edit-this-by-hand", "transitive-dependencies"] (depsDecoder versionDecoder)
303+ <*> D.field "test-dependencies" (D.field "indirect" (depsDecoder versionDecoder))
327
304
328
305
329pkgDecoder :: Decoder PkgInfo
306pkgDecoder :: Decoder PkgInfo
builder/src/Elm/Project/Summary.hs+1−1
@@ -52,7 +52,7 @@ init root project deps ifaces =
52 exposed =
52 exposed =
53 case project of
53 case project of
54 Project.App info ->
54 Project.App info ->
55− getExposed deps (_app_deps info)
55+ getExposed deps (_app_deps_direct info)
56
56
57 Project.Pkg info ->
57 Project.Pkg info ->
58 getExposed deps (_pkg_deps info)
58 getExposed deps (_pkg_deps info)
builder/src/Reporting/Exit/Assets.hs−29
@@ -34,7 +34,6 @@ data Exit
34
34
35data ElmJsonProblem
35data ElmJsonProblem
36 = BadJson D.Doc
36 = BadJson D.Doc
37− | BadDepDup String String Pkg.Name [Pkg.Name]
38 | BadSrcDir FilePath
37 | BadSrcDir FilePath
39 | NoPkgCore
38 | NoPkgCore
40 | NoAppCore
39 | NoAppCore
@@ -130,34 +129,6 @@ elmJsonProblemToReport problem =
130
129
131
130
132
131
133− BadDepDup field1 field2 dup dups ->
134− let
135− packagesAre =
136− if null dups then "package is" else "packages are"
137−
138− advice =
139− if null dups then
140− "Delete one of the entries."
141− else
142− "Delete duplicates until each package lives in ONE category."
143− in
144− Help.report "BAD JSON" (Just "elm.json")
145− (
146− if null dups then
147− "The following package appears twice in your elm.json file:"
148− else
149− "The following packages appear twice in your elm.json file:"
150− )
151− [ D.dullyellow $ D.indent 4 $ D.vcat $
152− map (D.fromString . Pkg.toString) (dup:dups)
153− , D.reflow $
154− "The " ++ packagesAre ++ " available in \"" ++ field1
155− ++ "\", so it is redundant to list it again in \"" ++ field2
156− ++ "\". It is already available! " ++ advice
157− ]
158−
159−
160−
161-- PROBLEM TO DOCS
132-- PROBLEM TO DOCS
162
133
163
134