Make sure entity declaration is not used in the Wasp file

waspc/src/Wasp/Analyzer.hs

@@ -127,6 +127,7 @@ import Wasp.Analyzer.AnalyzeError
   )
 import Wasp.Analyzer.Evaluator (Decl, evaluate, takeDecls)
 import Wasp.Analyzer.Parser (parseStatements)
+import Wasp.Analyzer.Parser.Valid (validateAst)
 import Wasp.Analyzer.Prisma (injectEntitiesFromPrismaSchema)
 import Wasp.Analyzer.StdTypeDefinitions (stdTypes)
 import Wasp.Analyzer.TypeChecker (typeCheck)
@@ -138,6 +139,7 @@ import qualified Wasp.Psl.Ast.Schema as Psl.Schema
 analyze :: Psl.Schema.Schema -> String -> Either [AnalyzeError] [Decl]
 analyze prismaSchemaAst =
   (left (map ParseError) . parseStatements)
+    >=> (left ((: []) . ValidationError) . validateAst)
     >=> injectEntitiesFromPrismaSchema prismaSchemaAst
     >=> (left ((: []) . TypeError) . typeCheck stdTypes)
     >=> (left ((: []) . EvaluationError) . evaluate stdTypes)

waspc/src/Wasp/Analyzer/AnalyzeError.hs

@@ -16,10 +16,12 @@ data AnalyzeError
   = ParseError PE.ParseError
   | TypeError TE.TypeError
   | EvaluationError EE.EvaluationError
+  | ValidationError (String, Ctx)
   deriving (Show, Eq)
 
 getErrorMessageAndCtx :: AnalyzeError -> (String, Ctx)
 getErrorMessageAndCtx = \case
   ParseError e -> first (("Parse error:\n" ++) . indent 2) $ PE.getErrorMessageAndCtx e
+  ValidationError (msg, ctx) -> ("Validation error:\n" ++ indent 2 msg, ctx)
   TypeError e -> first (("Type error:\n" ++) . indent 2) $ TE.getErrorMessageAndCtx e
   EvaluationError e -> first (("Evaluation error:\n" ++) . indent 2) $ EE.getErrorMessageAndCtx e

waspc/src/Wasp/Analyzer/Parser/Valid.hs

@@ -0,0 +1,27 @@
+module Wasp.Analyzer.Parser.Valid
+  ( validateAst,
+  )
+where
+
+import Data.List (find)
+import qualified Wasp.Analyzer.Parser as P
+
+validateAst :: P.AST -> Either (String, P.Ctx) P.AST
+validateAst = validateNoEntityDeclInWaspFile
+
+validateNoEntityDeclInWaspFile :: P.AST -> Either (String, P.Ctx) P.AST
+validateNoEntityDeclInWaspFile ast@(P.AST stmts) = case findEntityDecl stmts of
+  Just (P.WithCtx ctx _) -> Left (entitiesNoLongerSupportedError, ctx)
+  Nothing -> Right ast
+  where
+    findEntityDecl :: [P.WithCtx P.Stmt] -> Maybe (P.WithCtx P.Stmt)
+    findEntityDecl = find isEntityDecl
+
+    isEntityDecl :: P.WithCtx P.Stmt -> Bool
+    isEntityDecl = \case
+      P.WithCtx _ (P.Decl "entity" _ _) -> True
+      _ -> False
+
+    entitiesNoLongerSupportedError :: String
+    entitiesNoLongerSupportedError =
+      "Entities can no longer be defined in the .wasp file. You should migrate your entities to the schema.prisma file. Read more: https://wasp-lang.dev/docs/migrate-from-0-13-to-0-14#migrate-to-the-new-schemaprisma-file"

waspc/src/Wasp/Analyzer/TypeChecker/TypeError.hs

@@ -27,15 +27,15 @@ data TypeError'
   -- We use "unify" in the TypeChecker when trying to infer the common type for
   -- typed expressions that we know should be of the same type (e.g. for
   -- elements in the list).
-  = UnificationError    TypeCoercionError
+  = UnificationError       TypeCoercionError
   -- | Type coercion error that occurs when trying to use the typed expression
   -- of type T1 where T2 is expected.  If T2 is a super type of T1 and T1 can be
   -- safely coerced to T2, no problem, but if not, we get this error.
-  | CoercionError       TypeCoercionError
-  | NoDeclarationType   TypeName
-  | UndefinedIdentifier Identifier
-  | QuoterUnknownTag    QuoterTag
-  | DictDuplicateField  DictFieldName
+  | CoercionError          TypeCoercionError
+  | NoDeclarationType      TypeName
+  | UndefinedIdentifier    Identifier
+  | QuoterUnknownTag       QuoterTag
+  | DictDuplicateField     DictFieldName
   deriving (Eq, Show)
 {- ORMOLU_ENABLE -}
 

waspc/test/Analyzer/ValidTest.hs

@@ -0,0 +1,71 @@
+module Analyzer.ValidTest where
+
+import Data.Either (fromRight, isRight)
+import Test.Tasty.Hspec
+import Wasp.Analyzer.Parser hiding (withCtx)
+import qualified Wasp.Analyzer.Parser as P
+import Wasp.Analyzer.Parser.Valid (validateAst)
+import qualified Wasp.Version as WV
+
+spec_ValidateAst :: Spec
+spec_ValidateAst = do
+  it "Returns an error when entities are used" $ do
+    validateAndParseSource (waspSourceLines ++ entityDeclarationLines)
+      `shouldBe` Left
+        ( "Entities can no longer be defined in the .wasp file. You should migrate your entities to the schema.prisma file. Read more: https://wasp-lang.dev/docs/migrate-from-0-13-to-0-14#migrate-to-the-new-schemaprisma-file",
+          P.Ctx
+            ( P.SourceRegion
+                (P.SourcePosition 34 1)
+                (P.SourcePosition 37 5)
+            )
+        )
+
+  it "Returns AST when everything is correct" $ do
+    isRight (validateAndParseSource waspSourceLines) `shouldBe` True
+  where
+    validateAndParseSource = validateAst . parseSource
+
+    parseSource = fromRight (error "Parsing went wrong") . parseStatements . unlines
+
+    waspSourceLines =
+      [ "app Todo {",
+        "  wasp: {",
+        "    version: \"^" ++ show WV.waspVersion ++ "\",",
+        "  },",
+        "  title: \"Todo App\",",
+        "  head: [\"foo\", \"bar\"],",
+        "  auth: {",
+        "    userEntity: User,",
+        "    methods: {",
+        "      usernameAndPassword: {",
+        "        userSignupFields: import { getUserFields } from \"@src/auth/signup.js\",",
+        "      }",
+        "    },",
+        "    onAuthFailedRedirectTo: \"/\",",
+        "  },",
+        "}",
+        "",
+        "page HomePage {",
+        "  component: import Home from \"@src/pages/Main\"",
+        "}",
+        "",
+        "route HomeRoute { path: \"/\", to: HomePage }",
+        "",
+        "query getUsers {",
+        "  fn: import { getAllUsers } from \"@src/foo.js\",",
+        "  entities: [User]",
+        "}",
+        "",
+        "action updateUser {",
+        "  fn: import { updateUser } from \"@src/foo.js\",",
+        "  entities: [User],",
+        "  auth: true",
+        "}"
+      ]
+
+    entityDeclarationLines =
+      [ "entity User {=psl",
+        "  id Int @id @default(autoincrement())",
+        "  email String @unique",
+        "psl=}"
+      ]

waspc/waspc.cabal

@@ -201,6 +201,7 @@ library
     Wasp.Analyzer.Parser.SourceSpan
     Wasp.Analyzer.Parser.Token
     Wasp.Analyzer.Parser.TokenSet
+    Wasp.Analyzer.Parser.Valid
     Wasp.Analyzer.StdTypeDefinitions
     Wasp.Analyzer.StdTypeDefinitions.App.Dependency
     Wasp.Analyzer.StdTypeDefinitions.Entity
@@ -612,6 +613,7 @@ test-suite waspc-test
     Analyzer.TestUtil
     Analyzer.TypeChecker.InternalTest
     Analyzer.TypeCheckerTest
+    Analyzer.ValidTest
     AnalyzerTest
     AppSpec.ValidTest
     AppSpec.EntityTest

waspc/waspls/src/Wasp/LSP/Diagnostic.hs

@@ -108,6 +108,7 @@ waspErrorAsPrettyEditorMessage = Text.pack . fst . W.getErrorMessageAndCtx
 
 waspErrorSource :: W.AnalyzeError -> Text
 waspErrorSource (W.ParseError _) = "parse"
+waspErrorSource (W.ValidationError _) = "validate"
 waspErrorSource (W.TypeError _) = "typecheck"
 waspErrorSource (W.EvaluationError _) = "evaluate"