From edff201232e8ad0af881dde14cc0c02b3c8df628 Mon Sep 17 00:00:00 2001
From: Jordan Martinez <jordanalex.martinez@protonmail.com>
Date: Fri, 24 Nov 2023 08:57:34 -0600
Subject: [PATCH] Convert doc to json immediately; drop types

---
 app/src/App/PackageManagers/Spago.js   |  5 +---
 app/src/App/PackageManagers/Spago.purs | 38 ++++----------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/app/src/App/PackageManagers/Spago.js b/app/src/App/PackageManagers/Spago.js
index 7efc0fb4..6320407a 100644
--- a/app/src/App/PackageManagers/Spago.js
+++ b/app/src/App/PackageManagers/Spago.js
@@ -3,13 +3,10 @@ import Yaml from 'yaml';
 export function yamlDocParserImpl(fail, succ, s) {
   const doc = Yaml.parseDocument(s);
   if (doc.errors.length === 0) {
-    return succ(doc);
+    return succ(doc.toJSON());
   } else {
     // TODO: eh, we should return properly structured errors here
     return fail(JSON.stringify(doc.errors));
   }
 }
 
-export function toJsonImpl(doc) {
-  return doc.toJSON();
-}
diff --git a/app/src/App/PackageManagers/Spago.purs b/app/src/App/PackageManagers/Spago.purs
index 5b3b1cf7..4e7afffb 100644
--- a/app/src/App/PackageManagers/Spago.purs
+++ b/app/src/App/PackageManagers/Spago.purs
@@ -10,7 +10,7 @@ import Data.Array.NonEmpty as NonEmptyArray
 import Data.Codec.Argonaut as CA
 import Data.Codec.Argonaut.Record as CAR
 import Data.Either as Either
-import Data.Function.Uncurried (Fn1, Fn3, runFn1, runFn3)
+import Data.Function.Uncurried (Fn3, runFn3)
 import Data.List as List
 import Data.Map as Map
 import Data.Profunctor as Profunctor
@@ -22,16 +22,13 @@ import Node.FS.Sync as FS
 import Registry.App.Effect.Log (LOG)
 import Registry.App.Effect.Log as Log
 import Registry.Internal.Codec as Internal.Codec
-import Registry.License (License)
 import Registry.License as License
-import Registry.Location (Location)
 import Registry.Location as Location
 import Registry.Manifest (Manifest(..))
 import Registry.PackageName (PackageName)
 import Registry.PackageName as PackageName
 import Registry.Range (Range)
 import Registry.Range as Range
-import Registry.Version (Version)
 import Registry.Version as Version
 import Run (AFF, EFFECT, Run)
 import Run.Except (EXCEPT)
@@ -64,8 +61,8 @@ getSpagoManifest spagoYamlPath = do
         result <- Aff.attempt $ FS.Aff.readTextFile UTF8 path
         pure do
           yamlStr <- lmap Aff.message result
-          doc <- lmap (append "YAML: ") (yamlParser yamlStr)
-          lmap CA.printJsonDecodeError $ CA.decode configCodec (toJson doc)
+          docAsJson <- lmap (append "YAML: ") (yamlParser yamlStr)
+          lmap CA.printJsonDecodeError $ CA.decode configCodec docAsJson
     where
     configCodec = CAR.object "PartialSpagoConfig"
       { package: CAR.optional $ CAR.object "PackageConfig"
@@ -158,35 +155,10 @@ getSpagoManifest spagoYamlPath = do
       , excludeFiles
       }
 
-type PartialSpagoConfig =
-  { package :: Maybe PartialPackageConfig
-  }
-
-type PartialPackageConfig =
-  { name :: PackageName
-  , description :: Maybe String
-  , dependencies :: Map PackageName (Maybe Range)
-  , publish :: Maybe PublishConfig
-  }
-
-type PublishConfig =
-  { version :: Version
-  , license :: License
-  , location :: Maybe Location
-  , include :: Maybe (Array FilePath)
-  , exclude :: Maybe (Array FilePath)
-  }
-
-foreign import data YamlDoc :: Type -> Type
-
 -- | Parse a JSON string, constructing the `Toml` value described by the string.
 -- | To convert a string into a `Toml` string, see `fromString`.
-yamlParser :: forall a. String -> Either String (YamlDoc a)
+yamlParser :: String -> Either String Core.Json
 yamlParser j = runFn3 yamlDocParserImpl Left Right j
 
-foreign import yamlDocParserImpl :: forall a b. Fn3 (String -> a) (YamlDoc b -> a) String a
-
-toJson :: forall a. YamlDoc a -> Core.Json
-toJson = runFn1 toJsonImpl
+foreign import yamlDocParserImpl :: forall a. Fn3 (String -> a) (Core.Json -> a) String a
 
-foreign import toJsonImpl :: forall a. Fn1 (YamlDoc a) Core.Json