Merge branch 'master'

Author: thomashoneyman

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# nixfmt v0.6.0
+c428bcf158275637597b37d683f82248833664c0

.gitignore

@@ -17,3 +17,4 @@ result
 
 # Keep it secret, keep it safe.
 .env
+.envrc

SPEC.md

@@ -427,7 +427,8 @@ These files are always included in the tarball, if present:
 
 These files are always excluded from the tarball, regardless of what is specified in the `files` key:
 
-- `.psci`, `.psci_modules`, `.spago`, `node_modules`, `bower_components`, `.git`, `CVS`, `.svn`, and `.hg` directories.
+- `.psci`, `.psci_modules`, `.spago`, `node_modules`, and `bower_components` directories.
+- `.git`, `CVS`, `.svn`, `.hg`, `_darcs`, `.fossil`, `.jj`, and `.pijul` <abbr title="version control system">VCS</abbr> directories.
 - `package-lock.json`, `yarn.lock`, and `pnpm-lock.yaml` files.
 - `.swp`, `._*`, and `.DS_Store` files.
 

app/default.nix

@@ -20,15 +20,19 @@
   # from the registry at the top level
   spago-lock,
   package-lock,
-}: let
+}:
+let
   # Since both the importer and the server share the same build process, we
   # don't need to build them twice separately and can share an optimized output
   # directory.
   shared = stdenv.mkDerivation {
     name = "registry-app-shared";
     src = ./.;
-    phases = ["buildPhase" "installPhase"];
-    nativeBuildInputs = [purs-backend-es];
+    phases = [
+      "buildPhase"
+      "installPhase"
+    ];
+    nativeBuildInputs = [ purs-backend-es ];
     buildPhase = ''
       ln -s ${package-lock}/js/node_modules .
       cp -r ${spago-lock.registry-app}/output .
@@ -40,13 +44,17 @@
       mv output-es $out/output
     '';
   };
-in {
+in
+{
   server = stdenv.mkDerivation rec {
     name = "registry-server";
     src = ./.;
     database = ../db;
-    nativeBuildInputs = [esbuild makeWrapper];
-    buildInputs = [nodejs];
+    nativeBuildInputs = [
+      esbuild
+      makeWrapper
+    ];
+    buildInputs = [ nodejs ];
     entrypoint = writeText "entrypoint.js" ''
       import { main } from "./output/Registry.App.Server";
       main();
@@ -74,15 +82,31 @@ in {
     '';
     postFixup = ''
       wrapProgram $out/bin/${name} \
-        --set PATH ${lib.makeBinPath [compilers purs-versions dhall dhall-json licensee git git-lfs coreutils gzip gnutar]} \
+        --set PATH ${
+          lib.makeBinPath [
+            compilers
+            purs-versions
+            dhall
+            dhall-json
+            licensee
+            git
+            git-lfs
+            coreutils
+            gzip
+            gnutar
+          ]
+        } \
     '';
   };
 
   github-importer = stdenv.mkDerivation rec {
     name = "registry-github-importer";
     src = ./.;
-    nativeBuildInputs = [esbuild makeWrapper];
-    buildInputs = [nodejs];
+    nativeBuildInputs = [
+      esbuild
+      makeWrapper
+    ];
+    buildInputs = [ nodejs ];
     entrypoint = writeText "entrypoint.js" ''
       import { main } from "./output/Registry.App.GitHubIssue";
       main();
@@ -107,7 +131,20 @@ in {
     '';
     postFixup = ''
       wrapProgram $out/bin/${name} \
-        --set PATH ${lib.makeBinPath [compilers purs-versions dhall dhall-json licensee git git-lfs coreutils gzip gnutar]} \
+        --set PATH ${
+          lib.makeBinPath [
+            compilers
+            purs-versions
+            dhall
+            dhall-json
+            licensee
+            git
+            git-lfs
+            coreutils
+            gzip
+            gnutar
+          ]
+        } \
     '';
   };
 }

app/spago.yaml

@@ -8,11 +8,11 @@ package:
   dependencies:
     - aff
     - ansi
-    - argonaut-core
     - arrays
     - b64
     - bifunctors
-    - codec-argonaut
+    - codec
+    - codec-json
     - console
     - const
     - control
@@ -23,22 +23,23 @@ package:
     - either
     - exceptions
     - exists
-    - filterable
     - fetch
+    - filterable
     - foldable-traversable
+    - foreign
     - foreign-object
     - formatters
     - http-methods
     - httpurple
     - identity
     - integers
-    - js-fetch
     - js-date
-    - js-uri
+    - js-fetch
     - js-promise-aff
+    - js-uri
+    - json
     - lists
     - maybe
-    - media-types
     - newtype
     - node-buffer
     - node-child-process
@@ -56,7 +57,6 @@ package:
     - partial
     - prelude
     - profunctor
-    - profunctor-lenses
     - record
     - refs
     - registry-foreign

app/src/App/API.purs

@@ -19,12 +19,12 @@ module Registry.App.API
 
 import Registry.App.Prelude
 
-import Data.Argonaut.Parser as Argonaut.Parser
+import Codec.JSON.DecodeError as CJ.DecodeError
 import Data.Array as Array
 import Data.Array.NonEmpty as NonEmptyArray
-import Data.Codec.Argonaut as CA
-import Data.Codec.Argonaut.Common as CA.Common
-import Data.Codec.Argonaut.Record as CA.Record
+import Data.Codec.JSON as CJ
+import Data.Codec.JSON.Common as CJ.Common
+import Data.Codec.JSON.Record as CJ.Record
 import Data.Exists as Exists
 import Data.Foldable (traverse_)
 import Data.FoldableWithIndex (foldMapWithIndex)
@@ -41,6 +41,7 @@ import Data.String.NonEmpty as NonEmptyString
 import Data.String.Regex as Regex
 import Effect.Aff as Aff
 import Effect.Unsafe (unsafePerformEffect)
+import JSON as JSON
 import Node.ChildProcess.Types (Exit(..))
 import Node.FS.Aff as FS.Aff
 import Node.FS.Stats as FS.Stats
@@ -436,7 +437,7 @@ publish maybeLegacyIndex payload = do
             Except.throw $ "Found a valid purs.json file in the package source, but it does not typecheck."
           Right _ -> case parseJson Manifest.codec string of
             Left err -> do
-              Log.error $ "Failed to parse manifest: " <> CA.printJsonDecodeError err
+              Log.error $ "Failed to parse manifest: " <> CJ.DecodeError.print err
               Except.throw $ "Found a purs.json file in the package source, but it could not be decoded."
             Right manifest -> do
               Log.debug $ "Read a valid purs.json manifest from the package source:\n" <> stringifyJson Manifest.codec manifest
@@ -625,10 +626,10 @@ publish maybeLegacyIndex payload = do
             -- unused dependencies. This only affects old packages and we know
             -- they compile, so we've decided it's an acceptable exception.
             pure $ Tuple (Manifest receivedManifest) validatedResolutions
-        Right output -> case Argonaut.Parser.jsonParser output of
+        Right output -> case JSON.parse output of
           Left parseErr -> Except.throw $ "Failed to parse purs graph output as JSON while finding unused dependencies: " <> parseErr
-          Right json -> case CA.decode PursGraph.pursGraphCodec json of
-            Left decodeErr -> Except.throw $ "Failed to decode JSON from purs graph output while finding unused dependencies: " <> CA.printJsonDecodeError decodeErr
+          Right json -> case CJ.decode PursGraph.pursGraphCodec json of
+            Left decodeErr -> Except.throw $ "Failed to decode JSON from purs graph output while finding unused dependencies: " <> CJ.DecodeError.print decodeErr
             Right graph -> do
               Log.debug "Got a valid graph of source and dependencies."
               let
@@ -1031,7 +1032,7 @@ publishToPursuit { source, compiler, resolutions, installedResolutions } = Excep
       let lines = String.split (String.Pattern "\n") publishResult
       case Array.last lines of
         Nothing -> Except.throw "Publishing failed because of an unexpected compiler error. cc @purescript/packaging"
-        Just jsonString -> case Argonaut.Parser.jsonParser jsonString of
+        Just jsonString -> case JSON.parse jsonString of
           Left err -> Except.throw $ String.joinWith "\n"
             [ "Failed to parse output of publishing. cc @purescript/packaging"
             , "```"
@@ -1050,8 +1051,8 @@ publishToPursuit { source, compiler, resolutions, installedResolutions } = Excep
 
 type PursuitResolutions = Map RawPackageName { version :: Version, path :: FilePath }
 
-pursuitResolutionsCodec :: JsonCodec PursuitResolutions
-pursuitResolutionsCodec = rawPackageNameMapCodec $ CA.Record.object "Resolution" { version: Version.codec, path: CA.string }
+pursuitResolutionsCodec :: CJ.Codec PursuitResolutions
+pursuitResolutionsCodec = rawPackageNameMapCodec $ CJ.named "Resolution" $ CJ.Record.object { version: Version.codec, path: CJ.string }
 
 -- Resolutions format: https://github.com/purescript/purescript/pull/3565
 --
@@ -1344,9 +1345,9 @@ instance FsEncodable CompilerCache where
         cacheKey = baseKey <> Sha256.print hashKey
 
       let
-        codec = CA.Record.object "FindAllCompilersResult"
+        codec = CJ.named "FindAllCompilersResult" $ CJ.Record.object
           { target: Version.codec
-          , result: CA.Common.either compilerFailureCodec CA.null
+          , result: CJ.Common.either compilerFailureCodec CJ.null
           }
 
       Exists.mkExists $ Cache.AsJson cacheKey codec next

app/src/App/CLI/Licensee.purs

@@ -2,10 +2,11 @@ module Registry.App.CLI.Licensee where
 
 import Registry.App.Prelude
 
+import Codec.JSON.DecodeError as CJ.DecodeError
 import Control.Parallel as Parallel
 import Data.Array as Array
-import Data.Codec.Argonaut as CA
-import Data.Codec.Argonaut.Record as CA.Record
+import Data.Codec.JSON as CJ
+import Data.Codec.JSON.Record as CJ.Record
 import Node.ChildProcess.Types (Exit(..))
 import Node.FS.Aff as FS
 import Node.Library.Execa as Execa
@@ -32,15 +33,15 @@ detect directory = do
     -- but we consider this valid Licensee output.
     Normally n | n == 0 || n == 1 -> do
       let
-        parse :: String -> Either JsonDecodeError (Array String)
-        parse str = map (map _.spdx_id <<< _.licenses) $ flip parseJson str $ CA.Record.object "Licenses"
-          { licenses: CA.array $ CA.Record.object "SPDXIds"
-              { spdx_id: CA.string }
+        parse :: String -> Either CJ.DecodeError (Array String)
+        parse str = map (map _.spdx_id <<< _.licenses) $ flip parseJson str $ CJ.named "Licenses" $ CJ.Record.object
+          { licenses: CJ.array $ CJ.named "SPDXIds" $ CJ.Record.object
+              { spdx_id: CJ.string }
           }
 
       case parse result.stdout of
         Left error -> do
-          let printedError = CA.printJsonDecodeError error
+          let printedError = CJ.DecodeError.print error
           Left printedError
         Right out -> do
           -- A NOASSERTION result means that a LICENSE file could not be parsed.

app/src/App/CLI/Purs.purs

@@ -2,10 +2,12 @@ module Registry.App.CLI.Purs where
 
 import Registry.App.Prelude
 
+import Codec.JSON.DecodeError as CJ.DecodeError
 import Data.Array as Array
-import Data.Codec.Argonaut as CA
-import Data.Codec.Argonaut.Compat as CA.Compat
-import Data.Codec.Argonaut.Record as CA.Record
+import Data.Codec as Codec
+import Data.Codec.JSON as CJ
+import Data.Codec.JSON.Common as CJ.Common
+import Data.Codec.JSON.Record as CJ.Record
 import Data.Foldable (foldMap)
 import Data.String as String
 import Node.ChildProcess.Types (Exit(..))
@@ -34,20 +36,20 @@ data CompilerFailure
 derive instance Eq CompilerFailure
 derive instance Ord CompilerFailure
 
-compilerFailureCodec :: JsonCodec CompilerFailure
-compilerFailureCodec = CA.codec' decode encode
+compilerFailureCodec :: CJ.Codec CompilerFailure
+compilerFailureCodec = Codec.codec' decode encode
   where
-  decode :: Json -> Either JsonDecodeError CompilerFailure
-  decode json =
-    map CompilationError (CA.decode (CA.array compilerErrorCodec) json)
-      <|> map UnknownError (CA.decode CA.string json)
-      <|> map (const MissingCompiler) (CA.decode CA.null json)
+  decode :: JSON -> Except CJ.DecodeError CompilerFailure
+  decode json = except do
+    map CompilationError (CJ.decode (CJ.array compilerErrorCodec) json)
+      <|> map UnknownError (CJ.decode CJ.string json)
+      <|> map (const MissingCompiler) (CJ.decode CJ.null json)
 
-  encode :: CompilerFailure -> Json
+  encode :: CompilerFailure -> JSON
   encode = case _ of
-    CompilationError errors -> CA.encode (CA.array compilerErrorCodec) errors
-    UnknownError message -> CA.encode CA.string message
-    MissingCompiler -> CA.encode CA.null unit
+    CompilationError errors -> CJ.encode (CJ.array compilerErrorCodec) errors
+    UnknownError message -> CJ.encode CJ.string message
+    MissingCompiler -> CJ.encode CJ.null unit
 
 type CompilerError =
   { position :: SourcePosition
@@ -58,14 +60,14 @@ type CompilerError =
   , moduleName :: Maybe String
   }
 
-compilerErrorCodec :: JsonCodec CompilerError
-compilerErrorCodec = CA.Record.object "CompilerError"
+compilerErrorCodec :: CJ.Codec CompilerError
+compilerErrorCodec = CJ.named "CompilerError" $ CJ.Record.object
   { position: sourcePositionCodec
-  , message: CA.string
-  , errorCode: CA.string
-  , errorLink: CA.string
-  , filename: CA.string
-  , moduleName: CA.Compat.maybe CA.string
+  , message: CJ.string
+  , errorCode: CJ.string
+  , errorLink: CJ.string
+  , filename: CJ.string
+  , moduleName: CJ.Common.nullable CJ.string
   }
 
 type SourcePosition =
@@ -75,12 +77,12 @@ type SourcePosition =
   , endColumn :: Int
   }
 
-sourcePositionCodec :: JsonCodec SourcePosition
-sourcePositionCodec = CA.Record.object "SourcePosition"
-  { startLine: CA.int
-  , startColumn: CA.int
-  , endLine: CA.int
-  , endColumn: CA.int
+sourcePositionCodec :: CJ.Codec SourcePosition
+sourcePositionCodec = CJ.named "SourcePosition" $ CJ.Record.object
+  { startLine: CJ.int
+  , startColumn: CJ.int
+  , endLine: CJ.int
+  , endColumn: CJ.int
   }
 
 -- TODO: This would be better handled with dodo-printer.
@@ -146,8 +148,8 @@ callCompiler compilerArgs = do
             $ String.replaceAll (String.Pattern ".") (String.Replacement "_")
             $ Version.print version
 
-    errorsCodec = CA.Record.object "CompilerErrors"
-      { errors: CA.array compilerErrorCodec
+    errorsCodec = CJ.named "CompilerErrors" $ CJ.Record.object
+      { errors: CJ.array compilerErrorCodec
       }
 
   result <- _.getResult =<< Execa.execa purs (printCommand compilerArgs.command) (_ { cwd = compilerArgs.cwd })
@@ -163,7 +165,7 @@ callCompiler compilerArgs = do
               Just version | Right min <- Version.parse "0.14.0", version < min -> result.stderr
               Just _ -> result.stdout
           case parseJson errorsCodec output of
-            Left err -> UnknownError $ String.joinWith "\n" [ result.stdout, result.stderr, CA.printJsonDecodeError err ]
+            Left err -> UnknownError $ String.joinWith "\n" [ result.stdout, result.stderr, CJ.DecodeError.print err ]
             Right ({ errors } :: { errors :: Array CompilerError })
               | Array.null errors -> UnknownError "Non-normal exit code, but no errors reported."
               | otherwise -> CompilationError errors