Encode assumption about where the libs are located

Author: infomiho

waspc/src/Wasp/Generator/WaspLibs.hs

@@ -3,9 +3,9 @@ module Wasp.Generator.WaspLibs
   )
 where
 
-import StrongPath ((</>))
+import StrongPath (Path', Rel, (</>))
 import qualified Wasp.AppSpec as AS
-import qualified Wasp.ExternalConfig.Npm.Tarball as Npm.Tarball
+import Wasp.Generator
 import Wasp.Generator.FileDraft (FileDraft, createCopyFileDraft)
 import Wasp.Generator.Monad (Generator, getWaspLibs)
 import Wasp.Generator.WaspLibs.Common (libsRootDirInGeneratedCodeDir, libsRootDirNextToSdk)
@@ -14,19 +14,20 @@ import qualified Wasp.Generator.WaspLibs.WaspLib as WaspLib
 genWaspLibs :: AS.AppSpec -> Generator [FileDraft]
 genWaspLibs spec = do
   waspLibs <- getWaspLibs
-  return [mkLibCopyDraft destDir waspLib | destDir <- destDirs, waspLib <- waspLibs]
+  return [mkLibCopyDraft libsDestDir waspLib | libsDestDir <- libsDestDirs, waspLib <- waspLibs]
   where
-    mkLibCopyDraft destDir waspLib =
+    mkLibCopyDraft :: Path' (Rel ProjectRootDir) (Dir LibsRootDir) -> WaspLib -> FileDraft
+    mkLibCopyDraft libsDestDir waspLib =
       createCopyFileDraft
-        (destDir </> Npm.Tarball.tarballFilenameAsRelFile (WaspLib.generatedCodeDirTarballFilename waspLib))
+        (libsDestDir </> WaspLib.getTarballPathInLibsRootDir waspLib)
         (WaspLib.waspDataDirTarballAbsPath waspLib)
 
     -- We need to accomodate the SDK hacks with libs, so we copy the libs
     -- differently depending on the context:
     -- 1. When running `wasp start` - copy them only to the `.wasp/out` dir
     -- 2. When running `wasp build` - copy them to the `.wasp/build` AND
     --   `.wasp/out` dir.
-    destDirs =
+    libsDestDirs =
       if AS.isBuild spec
         then [libsRootDirInGeneratedCodeDir, libsRootDirNextToSdk]
         else [libsRootDirInGeneratedCodeDir]

waspc/src/Wasp/Generator/WaspLibs/Common.hs

@@ -17,6 +17,13 @@ import Wasp.Project.Common (generatedCodeDirInDotWaspDir)
 
 data LibsSourceDir
 
+-- | Type representing the destination directory where Wasp lib tarballs
+-- are copied in the generated project (e.g., .wasp/out/libs/).
+--
+-- LibsRootDir has a flat structure with tarball files at the top level:
+--   libs/
+--   ├── wasp.sh-lib-auth-<checksum>.tgz
+--   └── wasp.sh-lib-other-<checksum>.tgz
 data LibsRootDir
 
 -- We are repeating the SDK hack here - becuase the libs needs to be next to

waspc/src/Wasp/Generator/WaspLibs/WaspLib.hs

@@ -2,10 +2,11 @@ module Wasp.Generator.WaspLibs.WaspLib
   ( WaspLib (..),
     makeWaspLib,
     makeLocalNpmDepFromWaspLib,
+    getTarballPathInLibsRootDir,
   )
 where
 
-import StrongPath (Abs, Dir, File', Path', Rel', fromRelFile, (</>))
+import StrongPath (Abs, Dir, File', Path', Rel, Rel', fromRelFile, (</>))
 import qualified Wasp.ExternalConfig.Npm.Dependency as Npm.Dependency
 import Wasp.ExternalConfig.Npm.Tarball (TarballFilename, tarballFilenameAsRelFile)
 import qualified Wasp.ExternalConfig.Npm.Tarball as Npm.Tarball
@@ -54,4 +55,9 @@ computeTarballChecksum tarballPath = take 8 . hexToString <$> checksumFromFilePa
 makeLocalNpmDepFromWaspLib :: Path' Rel' (Dir LibsRootDir) -> WaspLib -> Npm.Dependency.Dependency
 makeLocalNpmDepFromWaspLib tarballSrcDir waspLib = Npm.Dependency.make (packageName waspLib, npmDepFilePath)
   where
-    npmDepFilePath = "file:" <> fromRelFile (tarballSrcDir </> tarballFilenameAsRelFile (generatedCodeDirTarballFilename waspLib))
+    npmDepFilePath = "file:" <> fromRelFile (tarballSrcDir </> getTarballPathInLibsRootDir waspLib)
+
+-- | Gets the relative path to a WaspLib tarball within LibsRootDir.
+-- Tarballs are stored at the top level of LibsRootDir (flat structure, no subdirectories).
+getTarballPathInLibsRootDir :: WaspLib -> Path' (Rel LibsRootDir) File'
+getTarballPathInLibsRootDir = tarballFilenameAsRelFile . generatedCodeDirTarballFilename