Enable aliases in the SDK

waspc/data/Generator/templates/sdk/wasp/package.json

@@ -45,7 +45,7 @@
       {=!  expose it here (which leaks it to our users). We could avoid this by =}
       {=!  using relative imports inside SDK code (instead of library imports), =}
       {=!  but I didn't have time to implement it. =}
-      "./ext-src/*": "./dist/ext-src/*.js",
+      "./src/*": "./dist/src/*.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
       "./operations/*": "./dist/operations/*",
       {=!  Used by our code, uncodumented (but accessible) for users. =}

waspc/data/Generator/templates/sdk/wasp/tsconfig.json

@@ -43,6 +43,12 @@
     // While this is great, we still want to dig deeper at some point to understand
     // better why Vite HMR misbehaves when the SDK is recompiled: https://github.com/wasp-lang/wasp/issues/1934 
     "incremental": true,
+    "baseUrl": "{= baseUrl =}",
+    "paths": {
+      {=# paths =}
+        "{= key =}": [{=# value =}"{= . =}"{=/ value =}],
+      {=/ paths =}
+    }
     // todo(filip): Only works with common js, see https://www.typescriptlang.org/tsconfig#paths and daily-article.
     // "paths": {
     //   "@wasp/*": [

waspc/src/Wasp/AppSpec.hs

@@ -48,6 +48,7 @@ import Wasp.AppSpec.Query (Query)
 import Wasp.AppSpec.Route (Route)
 import Wasp.Env (EnvVar)
 import Wasp.ExternalConfig.PackageJson (PackageJson)
+import Wasp.ExternalConfig.TsConfig (TsConfig)
 import Wasp.Node.Version (oldestWaspSupportedNodeVersion)
 import Wasp.Project.Common (WaspProjectDir)
 import Wasp.Project.Db.Migrations (DbMigrationsDir)
@@ -69,6 +70,7 @@ data AppSpec = AppSpec
     prismaSchema :: Psl.Schema.Schema,
     -- | The contents of the package.json file found in the root directory of the wasp project.
     packageJson :: PackageJson,
+    tsConfig :: TsConfig,
     -- | Absolute path to the directory containing the wasp project.
     waspProjectDir :: Path' Abs (Dir WaspProjectDir),
     -- | List of external code files (they are referenced/used in the declarations).

waspc/src/Wasp/ExternalConfig/TsConfig.hs

@@ -14,6 +14,7 @@ import Data.Aeson
     parseJSON,
   )
 import qualified Data.Aeson as Aeson
+import Data.Map (Map)
 import GHC.Generics (Generic)
 
 data TsConfig = TsConfig
@@ -31,7 +32,9 @@ data CompilerOptions = CompilerOptions
     lib :: !(Maybe [String]),
     allowJs :: !(Maybe Bool),
     typeRoots :: !(Maybe [String]),
-    outDir :: !(Maybe String)
+    outDir :: !(Maybe String),
+    baseUrl :: !(Maybe String),
+    paths :: !(Maybe (Map String [String]))
   }
   deriving (Show, Generic)
 

waspc/src/Wasp/Generator/SdkGenerator.hs

@@ -13,7 +13,9 @@ import Control.Concurrent (newChan)
 import Control.Concurrent.Async (concurrently)
 import Data.Aeson (object)
 import Data.Aeson.Types ((.=))
+import qualified Data.Map as M
 import Data.Maybe (isJust, mapMaybe)
+import qualified Data.Text as T
 import StrongPath
 import qualified StrongPath as SP
 import System.Exit (ExitCode (..))
@@ -26,6 +28,7 @@ import qualified Wasp.AppSpec.App.Dependency as AS.Dependency
 import qualified Wasp.AppSpec.ExternalFiles as EC
 import Wasp.AppSpec.Valid (getLowestNodeVersionUserAllows, isAuthEnabled)
 import qualified Wasp.AppSpec.Valid as AS.Valid
+import qualified Wasp.ExternalConfig.TsConfig as TC
 import Wasp.Generator.Common
   ( ProjectRootDir,
     makeJsonWithEntityData,
@@ -101,7 +104,7 @@ genSdk spec =
       genFileCopy [relfile|dev/index.ts|],
       genClientConfigFile,
       genServerConfigFile spec,
-      genTsConfigJson,
+      genTsConfigJson spec,
       genServerUtils spec,
       genPackageJson spec,
       genDbClient spec
@@ -260,17 +263,27 @@ genClientConfigFile = return $ C.mkTmplFdWithData relConfigFilePath tmplData
 
 -- todo(filip): remove this duplication, we have almost the same thing in the
 -- ServerGenerator.
-genTsConfigJson :: Generator FileDraft
-genTsConfigJson = do
+genTsConfigJson :: AppSpec -> Generator FileDraft
+genTsConfigJson spec = do
   return $
     C.mkTmplFdWithDstAndData
       [relfile|tsconfig.json|]
       [relfile|tsconfig.json|]
       ( Just $
           object
-            [ "majorNodeVersion" .= show (SV.major NodeVersion.oldestWaspSupportedNodeVersion)
+            [ "majorNodeVersion" .= show (SV.major NodeVersion.oldestWaspSupportedNodeVersion),
+              "baseUrl" .= baseUrl,
+              "paths" .= paths
             ]
       )
+  where
+    baseUrl = TC.baseUrl $ TC.compilerOptions $ AS.tsConfig spec
+    paths =
+      fmap (map pathEntryToObject . M.toList)
+        . TC.paths
+        . TC.compilerOptions
+        $ AS.tsConfig spec
+    pathEntryToObject (key, value) = object ["key" .= T.pack key, "value" .= value]
 
 depsRequiredForAuth :: AppSpec -> [AS.Dependency.Dependency]
 depsRequiredForAuth spec = maybe [] (const authDeps) maybeAuth

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

@@ -63,7 +63,7 @@ sdkTemplatesDirInTemplatesDir :: Path' (Rel TemplatesDir) (Dir SdkTemplatesDir)
 sdkTemplatesDirInTemplatesDir = [reldir|sdk/wasp|]
 
 extSrcDirInSdkRootDir :: Path' (Rel SdkRootDir) (Dir GeneratedExternalCodeDir)
-extSrcDirInSdkRootDir = [reldir|ext-src|]
+extSrcDirInSdkRootDir = [reldir|src|]
 
 relDirToRelFileP :: Path Posix (Rel d) Dir' -> Path Posix (Rel d) File'
 relDirToRelFileP path = fromJust $ SP.parseRelFileP $ removeTrailingSlash $ SP.fromRelDirP path
@@ -73,9 +73,6 @@ relDirToRelFileP path = fromJust $ SP.parseRelFileP $ removeTrailingSlash $ SP.f
 makeSdkImportPath :: Path Posix (Rel SdkRootDir) File' -> Path Posix (Rel s) File'
 makeSdkImportPath path = [reldirP|wasp|] </> path
 
-extCodeDirInSdkRootDir :: Path' (Rel SdkRootDir) Dir'
-extCodeDirInSdkRootDir = [reldir|ext-src|]
-
 clientTemplatesDirInSdkTemplatesDir :: Path' (Rel SdkTemplatesDir) (Dir ClientTemplatesDir)
 clientTemplatesDirInSdkTemplatesDir = [reldir|client|]
 

waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs

@@ -174,5 +174,5 @@ extImportToJsImport extImport@(EI.ExtImport extImportName extImportPath) =
     }
   where
     importPath = C.makeSdkImportPath $ dropExtensionFromImportPath $ extCodeDirP </> SP.castRel extImportPath
-    extCodeDirP = fromJust $ SP.relDirToPosix C.extCodeDirInSdkRootDir
+    extCodeDirP = fromJust $ SP.relDirToPosix C.extSrcDirInSdkRootDir
     importName = GJI.extImportNameToJsImportName extImportName

waspc/src/Wasp/Generator/SdkGenerator/WebSocketGenerator.hs

@@ -24,11 +24,11 @@ import qualified Wasp.Generator.WebSocket as AS.WS
 genWebSockets :: AppSpec -> Generator [FileDraft]
 genWebSockets spec
   | AS.WS.areWebSocketsUsed spec =
-      sequence
-        [ genWebSocketServerIndex spec,
-          genFileCopy [relfile|client/webSocket/index.ts|],
-          genWebSocketProvider spec
-        ]
+    sequence
+      [ genWebSocketServerIndex spec,
+        genFileCopy [relfile|client/webSocket/index.ts|],
+        genWebSocketProvider spec
+      ]
   | otherwise = return []
   where
     genFileCopy = return . C.mkTmplFd

waspc/src/Wasp/Project/Analyze.hs

@@ -86,12 +86,14 @@ constructAppSpec waspDir options externalConfigs parsedPrismaSchema decls = do
   clientEnvVars <- readDotEnvClient waspDir
 
   let packageJsonContent = EC._packageJson externalConfigs
+  let tsConfigContent = EC._tsConfig externalConfigs
 
   let appSpec =
         AS.AppSpec
           { AS.decls = decls,
             AS.prismaSchema = parsedPrismaSchema,
             AS.packageJson = packageJsonContent,
+            AS.tsConfig = tsConfigContent,
             AS.waspProjectDir = waspDir,
             AS.externalCodeFiles = externalCodeFiles,
             AS.externalPublicFiles = externalPublicFiles,