Refactor conflict checking fn naming.

Author: infomiho

waspc/src/Wasp/Generator/NpmDependencies.hs

@@ -9,12 +9,12 @@ module Wasp.Generator.NpmDependencies
     getNpmDepsConflicts,
     NpmDepsForPackage (..),
     conflictErrorToMessage,
-    genNpmDepsForPackage,
     NpmDepsForFramework,
     NpmDepsFromWasp (..),
     NpmDepsFromUser (..),
     buildWaspFrameworkNpmDeps,
     getDependencyOverridesPackageJsonEntry,
+    ensureNoConflictWithUserDeps,
   )
 where
 
@@ -67,20 +67,18 @@ data DependencyConflictError = DependencyConflictError
   }
   deriving (Show, Eq)
 
--- | Generate a NpmDepsForPackage by combining wasp dependencies with user dependencies
---   derived from AppSpec, or if there are conflicts, fail with error messages.
-genNpmDepsForPackage :: AppSpec -> NpmDepsFromWasp -> Generator NpmDepsForPackage
-genNpmDepsForPackage spec npmDepsFromWasp
-  | null conflictErrors = return $ waspDepsToPackageDeps npmDepsFromWasp
+ensureNoConflictWithUserDeps :: NpmDepsFromWasp -> NpmDepsFromUser -> Generator NpmDepsForPackage
+ensureNoConflictWithUserDeps waspDeps userDeps
+  | null conflicts = return $ waspDepsToPackageDeps waspDeps
   | otherwise =
       logAndThrowGeneratorError $
         GenericGeneratorError $
           intercalate "\n " $
             map
               conflictErrorToMessage
-              conflictErrors
+              conflicts
   where
-    conflictErrors = getNpmDepsConflicts npmDepsFromWasp (getUserNpmDepsForPackage spec)
+    conflicts = getNpmDepsConflicts waspDeps userDeps
 
 buildWaspFrameworkNpmDeps :: AppSpec -> NpmDepsFromWasp -> NpmDepsFromWasp -> Either String NpmDepsForFramework
 buildWaspFrameworkNpmDeps spec fromServer fromWebApp

waspc/src/Wasp/Generator/ServerGenerator.hs

@@ -124,16 +124,16 @@ genTsConfigJson spec = do
 
 genPackageJson :: AppSpec -> N.NpmDepsFromWasp -> Generator FileDraft
 genPackageJson spec waspDependencies = do
-  combinedDependencies <- N.genNpmDepsForPackage spec waspDependencies
+  serverPackageDeps <- N.ensureNoConflictWithUserDeps waspDependencies $ N.getUserNpmDepsForPackage spec
   return $
     C.mkTmplFdWithDstAndData
       (C.asTmplFile [relfile|package.json|])
       (C.asServerFile [relfile|package.json|])
       ( Just $
           object
             [ "packageName" .= serverPackageName spec,
-              "depsChunk" .= N.getDependenciesPackageJsonEntry combinedDependencies,
-              "devDepsChunk" .= N.getDevDependenciesPackageJsonEntry combinedDependencies,
+              "depsChunk" .= N.getDependenciesPackageJsonEntry serverPackageDeps,
+              "devDepsChunk" .= N.getDevDependenciesPackageJsonEntry serverPackageDeps,
               "nodeVersionRange" .= (">=" <> show NodeVersion.oldestWaspSupportedNodeVersion),
               "startProductionScript"
                 .= ( (if hasEntities then "npm run db-migrate-prod && " else "")

waspc/src/Wasp/Generator/WebAppGenerator.hs

@@ -103,16 +103,16 @@ dotEnvInWebAppRootDir = [relfile|.env|]
 
 genPackageJson :: AppSpec -> N.NpmDepsFromWasp -> Generator FileDraft
 genPackageJson spec waspDependencies = do
-  combinedDependencies <- N.genNpmDepsForPackage spec waspDependencies
+  webAppDeps <- N.ensureNoConflictWithUserDeps waspDependencies $ N.getUserNpmDepsForPackage spec
   return $
     C.mkTmplFdWithDstAndData
       (C.asTmplFile [relfile|package.json|])
       (C.asWebAppFile [relfile|package.json|])
       ( Just $
           object
             [ "packageName" .= webAppPackageName spec,
-              "depsChunk" .= N.getDependenciesPackageJsonEntry combinedDependencies,
-              "devDepsChunk" .= N.getDevDependenciesPackageJsonEntry combinedDependencies,
+              "depsChunk" .= N.getDependenciesPackageJsonEntry webAppDeps,
+              "devDepsChunk" .= N.getDevDependenciesPackageJsonEntry webAppDeps,
               "overridesChunk" .= N.getDependencyOverridesPackageJsonEntry dependencyOverrides,
               "nodeVersionRange" .= (">=" <> show NodeVersion.oldestWaspSupportedNodeVersion)
             ]