PR comments

waspc/src/Wasp/ExternalConfig/PackageJson.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 
 module Wasp.ExternalConfig.PackageJson
@@ -22,7 +23,7 @@ data PackageJson = PackageJson
     dependencies :: !DependenciesMap,
     devDependencies :: !DependenciesMap
   }
-  deriving (Show, Generic)
+  deriving (Show, Generic, FromJSON)
 
 getDependencies :: PackageJson -> [Dependency]
 getDependencies packageJson = D.fromList $ M.toList $ dependencies packageJson
@@ -35,5 +36,3 @@ type DependenciesMap = Map PackageName PackageVersion
 type PackageName = String
 
 type PackageVersion = String
-
-instance FromJSON PackageJson

waspc/src/Wasp/Generator/ExternalConfig/PackageJson.hs

@@ -12,19 +12,19 @@ import Wasp.Generator.WebAppGenerator.Common (reactRouterVersion)
 validatePackageJson :: P.PackageJson -> [ErrorMsg]
 validatePackageJson packageJson =
   concat
-    [ validate ("wasp", "file:.wasp/out/sdk/wasp", IsListedWithExactVersion),
-      validate ("prisma", show prismaVersion, IsListedAsDevWithExactVersion),
+    [ validate ("wasp", "file:.wasp/out/sdk/wasp") IsListedWithExactVersion,
+      validate ("prisma", show prismaVersion) IsListedAsDevWithExactVersion,
       -- Installing the wrong version of "react-router-dom" can make users believe that they
       -- can use features that are not available in the version that Wasp supports.
-      validate ("react-router-dom", show reactRouterVersion, HasExactVersionIfListed)
+      validate ("react-router-dom", show reactRouterVersion) HasExactVersionIfListed
     ]
   where
     validate = validateDep packageJson
 
 data PackageValidationType = IsListedWithExactVersion | IsListedAsDevWithExactVersion | HasExactVersionIfListed
 
-validateDep :: P.PackageJson -> (P.PackageName, P.PackageVersion, PackageValidationType) -> [String]
-validateDep packageJson (packageName, expectedPackageVersion, validationType) = case validationType of
+validateDep :: P.PackageJson -> (P.PackageName, P.PackageVersion) -> PackageValidationType -> [String]
+validateDep packageJson (packageName, expectedPackageVersion) = \case
   IsListedWithExactVersion -> checkDeps [P.dependencies packageJson] [requiredPackageMessage "dependencies"]
   IsListedAsDevWithExactVersion -> checkDeps [P.devDependencies packageJson] [requiredPackageMessage "devDependencies"]
   HasExactVersionIfListed -> checkDeps [P.dependencies packageJson, P.devDependencies packageJson] []

waspc/src/Wasp/Generator/ExternalConfig/TsConfig.hs

@@ -8,6 +8,21 @@ where
 import qualified Wasp.ExternalConfig.TsConfig as T
 import Wasp.Generator.ExternalConfig.Common (ErrorMsg)
 
+class IsJavascriptValue a where
+  showAsJsValue :: a -> String
+
+instance IsJavascriptValue String where
+  showAsJsValue = show
+
+instance IsJavascriptValue [String] where
+  showAsJsValue = show
+
+instance IsJavascriptValue Bool where
+  showAsJsValue True = "true"
+  showAsJsValue False = "false"
+
+type FieldName = String
+
 validateTsConfig :: T.TsConfig -> [ErrorMsg]
 validateTsConfig tsConfig =
   concat
@@ -37,31 +52,16 @@ validateTsConfig tsConfig =
 
     compilerOptionsFields = T.compilerOptions tsConfig
 
-class IsJavascriptValue a where
-  showAsJsValue :: a -> String
-
-instance IsJavascriptValue String where
-  showAsJsValue = show
-
-instance IsJavascriptValue [String] where
-  showAsJsValue = show
-
-instance IsJavascriptValue Bool where
-  showAsJsValue True = "true"
-  showAsJsValue False = "false"
-
-type FieldName = String
-
-validateFieldValue :: (Eq value, IsJavascriptValue value) => FieldName -> value -> value -> [String]
-validateFieldValue fieldName expectedValue actualValue =
-  if actualValue == expectedValue
-    then []
-    else [invalidValueErrorMessage]
-  where
-    invalidValueErrorMessage =
-      unwords
-        [ "Invalid value for the",
-          show fieldName,
-          "field in tsconfig.json file, expected value:",
-          showAsJsValue expectedValue ++ "."
-        ]
+    validateFieldValue :: (Eq value, IsJavascriptValue value) => FieldName -> value -> value -> [String]
+    validateFieldValue fieldName expectedValue actualValue =
+      if actualValue == expectedValue
+        then []
+        else [invalidValueErrorMessage]
+      where
+        invalidValueErrorMessage =
+          unwords
+            [ "Invalid value for the",
+              show fieldName,
+              "field in tsconfig.json file, expected value:",
+              showAsJsValue expectedValue ++ "."
+            ]