Update migration script for compiler changes

Author: evancz

migration/MoveDocs.hs

@@ -53,7 +53,7 @@ move pkg version =
 updateDocs :: OldDocs -> Docs.Module
 updateDocs (OldDocs (Txt moduleName) (Txt comment) aliases types values) =
   Docs.Module
-    { Docs._name = moduleName
+    { Docs._name = N.fromText moduleName
     , Docs._comment = comment
     , Docs._unions = Map.fromList (map toUnionPair types)
     , Docs._aliases = Map.fromList (map toAliasPair aliases)
@@ -64,27 +64,27 @@ updateDocs (OldDocs (Txt moduleName) (Txt comment) aliases types values) =
 
 toUnionPair :: Union -> (N.Name, Docs.Union)
 toUnionPair (Union (Txt name) (Txt comment) args cases) =
-  ( name, Docs.Union comment args cases )
+  ( N.fromText name, Docs.Union comment args cases )
 
 
 toAliasPair :: Alias -> (N.Name, Docs.Alias)
 toAliasPair (Alias (Txt name) (Txt comment) args tipe) =
-  ( name, Docs.Alias comment args tipe )
+  ( N.fromText name, Docs.Alias comment args tipe )
 
 
 toValuePair :: Value -> Maybe (N.Name, Docs.Value)
 toValuePair (Value (Txt name) (Txt comment) tipe _) =
   if Text.any isSymbol name then
     Nothing
   else
-    Just (name, Docs.Value comment tipe)
+    Just (N.fromText name, Docs.Value comment tipe)
 
 
 toBinopPair :: Value -> Maybe (N.Name, Docs.Binop)
 toBinopPair (Value (Txt name) (Txt comment) tipe fix) =
   if Text.any isSymbol name then
     Just
-      ( name
+      ( N.fromText name
       , case fix of
           Nothing ->
             Docs.Binop comment tipe Docs.Left (Docs.Precedence 9)
@@ -227,6 +227,14 @@ instance Json.FromJSON Txt where
     fail "Need a STRING here."
 
 
+instance Json.FromJSON N.Name where
+  parseJSON (Json.String txt) =
+    return $ N.fromText txt
+
+  parseJSON _ =
+    fail "Need a STRING here."
+
+
 
 -- JSON for TYPES
 
@@ -274,7 +282,7 @@ fromObject obj =
                 case func of
                   Type.Type name [] ->
                     case args of
-                      (a:b:cs) | Text.isPrefixOf "_Tuple" name ->
+                      (a:b:cs) | N.startsWith "_Tuple" name ->
                         return $ Type.Tuple a b cs
 
                       _ ->

migration/MoveElmJson.hs

@@ -16,6 +16,7 @@ import qualified Data.Text as Text
 import System.FilePath ((</>))
 
 import qualified Crawl
+import qualified Elm.Name as N
 import qualified Elm.Package as Pkg
 import qualified Elm.Project.Constraint as Con
 import qualified Elm.Project.Json as Project
@@ -87,6 +88,18 @@ instance Json.FromJSON Txt where
 
 
 
+-- NAME
+
+
+instance Json.FromJSON N.Name where
+  parseJSON (Json.String txt) =
+    return $ N.fromText txt
+
+  parseJSON _ =
+    fail "Need a STRING here."
+
+
+
 -- VERSION and CONSTRAINT
 
 
@@ -140,7 +153,7 @@ textToPkgName rawName =
     Right pkg ->
       pkg
 
-    Left err ->
+    Left (err, _) ->
       case Text.splitOn "/" rawName of
         [user, project] ->
           Pkg.Name user (Text.toLower project)
@@ -182,6 +195,7 @@ conversions =
     -- BSD
     [ "BSD" ==> "BSD-3-Clause"
     , "BSD3" ==> "BSD-3-Clause"
+    , "BSD-3" ==> "BSD-3-Clause"
     , "BSD3-Clause" ==> "BSD-3-Clause"
     , "BSD 3-Clause" ==> "BSD-3-Clause"
     , "BSD-3-Clause" ==> "BSD-3-Clause"
@@ -195,6 +209,7 @@ conversions =
     , "GPL3" ==> "GPL-3.0"
 
     -- APACHE
+    , "APACHE2" ==> "Apache-2.0"
     , "Apache2.0" ==> "Apache-2.0"
     , "Apache 2.0" ==> "Apache-2.0"
     , "Apache-2.0" ==> "Apache-2.0"

migration/Task.hs

@@ -108,7 +108,7 @@ fetchGithub decoder path =
           throwError msg
 
         Right bytestring ->
-          case Decode.parse decoder (LBS.toStrict bytestring) of
+          case Decode.parse "github" (\_ -> []) decoder (LBS.toStrict bytestring) of
             Left _ ->
               throwError ("Bad JSON from GitHub for " ++ path)
 

migration/migrate.cabal

@@ -7,7 +7,7 @@ Synopsis:
 Description:
   Turn elm-package.json into elm.json, fix licenses, get publication dates, etc.
 
-Homepage: http://library.elm-lang.org
+Homepage: http://package.elm-lang.org
 
 License: BSD3
 License-file: LICENSE
@@ -23,13 +23,15 @@ Cabal-version: >=1.9
 
 source-repository head
   type:     git
-  location: git://github.com/elm-lang/package.elm-lang.org.git
+  location: git://github.com/elm/package.elm-lang.org.git
 
 
 Executable migrate
   hs-source-dirs:
-    ../src/backend
     ../migration
+    ../src/backend
+    ../../../compiler/compiler/src
+    ../../../compiler/builder/src
 
   Main-is:
     Migrate.hs
@@ -39,20 +41,27 @@ Executable migrate
 
   Build-depends:
     aeson,
+    ansi-terminal,
+    ansi-wl-pprint,
     base >=4.2 && <5,
-    builder,
+    binary,
     bytestring,
     cmdargs,
     containers,
     directory,
-    elm-compiler == 0.19.0,
+    edit-distance,
     filepath,
     http-client,
     http-client-tls,
     http-types,
     iso8601-time,
+    language-glsl,
     mtl,
     network,
+    parsec,
+    scientific,
     text,
     time,
-    unordered-containers
+    unordered-containers,
+    utf8-string,
+    vector