Add invertRelDir to StrongPath utilities by FranjoMindek · Pull Request #3923 · wasp-lang/wasp

FranjoMindek · 2026-03-16T14:47:47Z

Summary

Main change:

Adds invertRelDir to Wasp.Util.StrongPath. Given a relative directory path from a to b, returns the inverse path from b back to a. The limitation is that the reverse path can't have any ../ segments.

Side stuff:

Refactors various parts of code to use invertRelDir instead of a hardcoded [reldir|../../|] variations
Moves resolving "libs path from SDK/server" from WaspLibs.Common to SDK/Server.Common to avoid cyclic dependencies.
Removes FilePath.Extra which just existed doing nothing.
Removes serverRootDirFromDbRootDir and webAppRootDirFromDbRootDir. Wanted to make them use invertRelDir but found they were unused.

pkg-pr-new · 2026-03-16T15:31:02Z

Open in StackBlitz

@wasp.sh/wasp-cli

npx https://pkg.pr.new/@wasp.sh/wasp-cli@3923

@wasp.sh/wasp-cli-darwin-arm64-unknown

npx https://pkg.pr.new/@wasp.sh/wasp-cli-darwin-arm64-unknown@3923

@wasp.sh/wasp-cli-darwin-x64-unknown

npx https://pkg.pr.new/@wasp.sh/wasp-cli-darwin-x64-unknown@3923

@wasp.sh/wasp-cli-linux-x64-glibc

npx https://pkg.pr.new/@wasp.sh/wasp-cli-linux-x64-glibc@3923

@wasp.sh/wasp-cli-linux-x64-musl

npx https://pkg.pr.new/@wasp.sh/wasp-cli-linux-x64-musl@3923

commit: d463af3

FranjoMindek · 2026-03-16T17:11:03Z

waspc/src/Wasp/Project/Common.hs

-- If any of those change significantly (their depth), this path should be adjusted.
-waspProjectDirFromProjectRootDir :: Path' (Rel G.Common.ProjectRootDir) (Dir WaspProjectDir)
-waspProjectDirFromProjectRootDir = [reldir|../../|]
+waspProjectDirFromAppComponentDir = [reldir|../|] </> waspProjectDirFromGeneratedCodeDir


We don't have anything to invert for AppComponentRootDir since it is "abstract" path.

FranjoMindek · 2026-03-16T17:12:27Z

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

-serverRootDirFromDbRootDir :: Path' (Rel DbRootDir) (Dir ServerRootDir)
-serverRootDirFromDbRootDir = [reldir|../server|]
-
-webAppRootDirFromDbRootDir :: Path' (Rel DbRootDir) (Dir ServerRootDir)
-webAppRootDirFromDbRootDir = [reldir|../web-app|]


FranjoMindek · 2026-03-16T20:47:54Z

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

 libsSrcDirPathInDataDir = [reldir|Generator/libs|]

-libsRootDirFromSdkDir :: Path' Rel' (Dir LibsRootDir)
-libsRootDirFromSdkDir = [reldir|../../|] </> libsRootDirInGeneratedCodeDir


Moved to respective SDK and Server common files.

cprecioso

Lgtm, couple of minor suggestions.

cprecioso · 2026-03-17T09:10:26Z

waspc/src/Wasp/Util/StrongPath.hs

+-- >>> invertRelDir [reldir|.|]         -- "./"
+-- >>> invertRelDir [reldir|types|]     -- "../"
+-- >>> invertRelDir [reldir|.wasp/out|] -- "../../"
+invertRelDir :: SP.Path' (SP.Rel a) (SP.Dir b) -> SP.Path' (SP.Rel b) (SP.Dir a)


Should we have a version of this function that returns an Either String Path or Maybe Path in case we want to handle errors? And then a wrapper that errors out on Left so we keep the simple API for internal stuff.

I would keep it simple for now, since we only use this helper for strong-path paths we have defined, and we know are valid.

waspc/cli/src/Wasp/Cli/Command/Build.hs

cprecioso · 2026-03-17T10:20:26Z

waspc/src/Wasp/Util/StrongPath.hs

+  | ".." `elem` pathSegments = error $ "invertRelDir: path contains '..' segment: " ++ SP.fromRelDir relDir
+  | otherwise = fromJust . SP.parseRelDir $ FP.joinPath $ replicate (length pathSegments) ".."
+  where
+    pathSegments = filter (/= ".") $ FP.splitDirectories $ SP.fromRelDir relDir


instead of filter (/= ".") is there a normalize path fn or something?

Good idea:

invertRelDir :: SP.Path' (SP.Rel a) (SP.Dir b) -> SP.Path' (SP.Rel b) (SP.Dir a) invertRelDir relDir | ".." `elem` pathSegments = error $ "invertRelDir: path contains '..' segment: " ++ SP.fromRelDir relDir | otherwise = case pathSegments of ["."] -> [SP.reldir|.|] _ -> fromJust . SP.parseRelDir $ FP.joinPath $ replicate (length pathSegments) ".." where pathSegments = FP.splitDirectories . FP.normalise $ SP.fromRelDir relDir

waspc/src/Wasp/Util/StrongPath.hs

FranjoMindek · 2026-03-18T10:13:43Z

waspc/tests/Util/StrongPathTest.hs

+      evaluate (invertRelDir [reldir|../../a|]) `shouldThrow` anyErrorCall
+
+    it "returns current dir for current dir input" $ do
+      invertRelDir [reldir|.|] `shouldBe` [reldir|./|]


We use strong-path on both sides so that tests work on any OS.
Mostly because both work on Path System.

Add invertRelDir and use it to compute waspProjectDirFromProjectRootDir

781bcc9

FranjoMindek temporarily deployed to fly-deploy-test March 16, 2026 14:47 — with GitHub Actions Inactive

FranjoMindek temporarily deployed to railway-deploy-test March 16, 2026 14:47 — with GitHub Actions Inactive

Handle "." segments in invertRelDir

82ddcc0

FranjoMindek temporarily deployed to railway-deploy-test March 16, 2026 15:02 — with GitHub Actions Inactive

FranjoMindek temporarily deployed to fly-deploy-test March 16, 2026 15:02 — with GitHub Actions Inactive

test

51320df

FranjoMindek temporarily deployed to fly-deploy-test March 16, 2026 17:03 — with GitHub Actions Inactive

FranjoMindek temporarily deployed to railway-deploy-test March 16, 2026 17:03 — with GitHub Actions Inactive

FranjoMindek changed the title ~~Claude: Add invertRelDir to StrongPath utilities~~ Add invertRelDir to StrongPath utilities Mar 16, 2026

FranjoMindek commented Mar 16, 2026

View reviewed changes

format

4ef9ef4

FranjoMindek temporarily deployed to fly-deploy-test March 16, 2026 17:14 — with GitHub Actions Inactive

FranjoMindek temporarily deployed to railway-deploy-test March 16, 2026 17:14 — with GitHub Actions Inactive

FranjoMindek commented Mar 16, 2026

View reviewed changes

FranjoMindek marked this pull request as ready for review March 16, 2026 20:51

FranjoMindek requested a review from a team as a code owner March 16, 2026 20:51

FranjoMindek requested review from cprecioso and removed request for a team March 16, 2026 20:51

cprecioso approved these changes Mar 17, 2026

View reviewed changes

cprecioso requested a review from Copilot March 17, 2026 10:22

Copilot started reviewing on behalf of cprecioso March 17, 2026 10:23 View session

This comment was marked as resolved.

Sign in to view

fixes

3319623

FranjoMindek had a problem deploying to fly-deploy-test March 17, 2026 14:17 — with GitHub Actions Failure

FranjoMindek temporarily deployed to railway-deploy-test March 17, 2026 14:17 — with GitHub Actions Inactive

FranjoMindek added 2 commits March 17, 2026 15:20

simplify

b4ea5e8

js import

765e071

FranjoMindek temporarily deployed to railway-deploy-test March 17, 2026 16:50 — with GitHub Actions Inactive

FranjoMindek had a problem deploying to fly-deploy-test March 17, 2026 16:50 — with GitHub Actions Failure

fixes

372b979

FranjoMindek had a problem deploying to fly-deploy-test March 17, 2026 17:16 — with GitHub Actions Failure

FranjoMindek temporarily deployed to railway-deploy-test March 17, 2026 17:16 — with GitHub Actions Inactive

test

f0bc4a6

FranjoMindek had a problem deploying to railway-deploy-test March 18, 2026 09:41 — with GitHub Actions Error

FranjoMindek had a problem deploying to fly-deploy-test March 18, 2026 09:41 — with GitHub Actions Error

import

99b616b

FranjoMindek had a problem deploying to fly-deploy-test March 18, 2026 09:42 — with GitHub Actions Failure

FranjoMindek temporarily deployed to railway-deploy-test March 18, 2026 09:42 — with GitHub Actions Inactive

remove to path part

d463af3

FranjoMindek temporarily deployed to railway-deploy-test March 18, 2026 09:56 — with GitHub Actions Inactive

FranjoMindek had a problem deploying to fly-deploy-test March 18, 2026 09:56 — with GitHub Actions Failure

FranjoMindek commented Mar 18, 2026

View reviewed changes

FranjoMindek merged commit 9e20913 into main Mar 18, 2026
34 of 36 checks passed

FranjoMindek deleted the franjo/extract-invertRelDir branch March 18, 2026 10:31

FranjoMindek self-assigned this Mar 18, 2026

Uh oh!

Conversation

FranjoMindek commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

pkg-pr-new bot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cprecioso left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

FranjoMindek commented Mar 16, 2026 •

edited

Loading

pkg-pr-new bot commented Mar 16, 2026 •

edited

Loading