Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure users don't create a .wasp file #2418

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+14 −6
Open

Ensure users don't create a .wasp file #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3431269
Ensure users don't create a .wasp file
komyg Dec 14, 2024
6de32d6
Updated changelog
komyg Dec 14, 2024
be6d6be
Removed unecessary import
komyg Dec 14, 2024
9830797
Updated deps
komyg Dec 19, 2024
94046da
Move file check logic to findWaspFile
komyg Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions waspc/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

- Enabled strict null checks for the Wasp SDK which means that some of the return types are more precise now e.g. you'll need to check if some value is `null` before using it.

- Improved the error message when the user has a top level *.wasp* file.

## 0.15.2

### 🐞 Bug fixes
Expand Down
18 changes: 12 additions & 6 deletions waspc/src/Wasp/Project/Analyze.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import StrongPath
fromAbsDir,
fromAbsFile,
fromRelFile,
reldir,
relfile,
(</>),
)
Expand Down Expand Up @@ -247,12 +248,17 @@ constructAppSpec waspDir options externalConfigs parsedPrismaSchema decls = do

findWaspFile :: Path' Abs (Dir WaspProjectDir) -> IO (Either String WaspFilePath)
findWaspFile waspDir = do
files <- fst <$> IOUtil.listDirectory waspDir
return $ case (findWaspTsFile files, findWaspLangFile files) of
(Just _, Just _) -> Left bothFilesFoundMessage
(Nothing, Nothing) -> Left fileNotFoundMessage
(Just waspTsFile, Nothing) -> Right waspTsFile
(Nothing, Just waspLangFile) -> Right waspLangFile
let dotWaspPath = waspDir </> [relfile|.wasp|]
isFile <- IOUtil.doesFileExist dotWaspPath
if isFile
then return $ Left "Invalid file name for the .wasp file. Please rename it to [something].wasp."
else do
files <- fst <$> IOUtil.listDirectory waspDir
return $ case (findWaspTsFile files, findWaspLangFile files) of
(Just _, Just _) -> Left bothFilesFoundMessage
(Nothing, Nothing) -> Left fileNotFoundMessage
(Just waspTsFile, Nothing) -> Right waspTsFile
(Nothing, Just waspLangFile) -> Right waspLangFile
where
findWaspTsFile files = WaspTs <$> findFileThatEndsWith ".wasp.ts" files
findWaspLangFile files = WaspLang <$> findFileThatEndsWith ".wasp" files
Expand Down
Loading