Merge branch 'main' into miho-prisma-5

mage/README.md

@@ -1,6 +1,6 @@
 # Mage
 
-This directory contains the source code of Mage (aka "GPT Web App Generator" aka "Wasp AI"): a Wasp app (so a full-stack web app) that allows you to create a new Wasp app (inception :)!) from just a short description. It uses ChatGPT in a smart way to accomplish this (so it would be clasified as an AI code agent).
+This directory contains the source code of Mage (aka "GPT Web App Generator" aka "Wasp AI"): a Wasp app (so a full-stack web app) that allows you to create a new Wasp app (inception :)!) from just a short description. It uses ChatGPT in a smart way to accomplish this (so it would be classified as an AI code agent).
 
 Mage is hosted at https://usemage.ai and you can use it there for free.
 

mage/src/client/components/Faq.jsx

@@ -42,7 +42,7 @@ const faqs = [
     answer: <p>
       Due to GPT being non-deterministic, it sometimes introduces (small) mistakes, especially for more complex apps, but altogether it works better than we expected!
       The code it generates is often very reasonable, and for very simple apps, it can even produce a working app out of the box, while for a bit more complex apps
-      it currently serves more like a super-intelligent starter that needs a couple of tweeks to get it going.
+      it currently serves more like a super-intelligent starter that needs a couple of tweaks to get it going.
 
       <br/><br/>
 
@@ -76,7 +76,7 @@ const faqs = [
       <br/><br/>
 
       We use GPT4 during the planning phase, since that is the most critical step, and then use GPT3.5 for the rest of the steps.
-      Although using GPT4 exclusively does give better results, we use a mix to keep the costs, generation time, and bandwith acceptable (due to pricing and rate limits of GPT4).
+      Although using GPT4 exclusively does give better results, we use a mix to keep the costs, generation time, and bandwidth acceptable (due to pricing and rate limits of GPT4).
 
       <br/><br/>
 

waspc/src/Wasp/Psl/Parser/Argument.hs

@@ -18,7 +18,6 @@ import Wasp.Psl.Parser.Common
   ( brackets,
     colon,
     commaSep,
-    commaSep1,
     float,
     identifier,
     integer,
@@ -69,7 +68,7 @@ funcCallExpr =
 arrayExpr :: Parser Psl.Argument.Expression
 arrayExpr =
   Psl.Argument.ArrayExpr
-    <$> brackets (commaSep1 expression)
+    <$> brackets (commaSep expression)
 
 -- NOTE: For now we are not supporting negative numbers.
 --   I couldn't figure out from Prisma docs if there could be the case

waspc/test/Psl/Common/ModelTest.hs

@@ -15,6 +15,7 @@ sampleBodySchema =
     posts Post[] @relation("UserPosts", references: [id]) @customattr
     weirdType Unsupported("weird")
     anotherId String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+    someField   String[] @default([])
 
     @@someattr([id, username], [posts])
   |]
@@ -114,6 +115,20 @@ sampleBodyAst =
                 ]
             }
         ),
+      Psl.Model.ElementField
+        ( Psl.Model.Field
+            { Psl.Model._name = "someField",
+              Psl.Model._type = Psl.Model.String,
+              Psl.Model._typeModifiers = [Psl.Model.List],
+              Psl.Model._attrs =
+                [ Psl.Attribute.Attribute
+                    { Psl.Attribute._attrName = "default",
+                      Psl.Attribute._attrArgs =
+                        [Psl.Argument.ArgUnnamed (Psl.Argument.ArrayExpr [])]
+                    }
+                ]
+            }
+        ),
       Psl.Model.ElementBlockAttribute
         ( Psl.Attribute.Attribute
             { Psl.Attribute._attrName = "someattr",

waspc/test/Psl/Parser/ArgumentTest.hs

@@ -36,6 +36,9 @@ spec_parseArgumentPslPart = do
                     Psl.Argument.IdentifierExpr "pg_trgm",
                     Psl.Argument.FuncExpr "postgis" [Psl.Argument.ArgNamed "version" (Psl.Argument.StringExpr "2.1")]
                   ]
+            ),
+            ( "[]",
+              Psl.Argument.ArgUnnamed (Psl.Argument.ArrayExpr [])
             )
           ]
     let runTest (psl, expected) =

waspc/test/Psl/Parser/AttributeTest.hs

@@ -53,6 +53,12 @@ spec_parseAttributePslPart = do
                         ]
                     )
                 ]
+            ),
+            ( "@default([])",
+              Psl.Attribute.Attribute
+                "default"
+                [ Psl.Argument.ArgUnnamed $ Psl.Argument.ArrayExpr []
+                ]
             )
           ]
     runTestsFor attribute tests

waspc/test/Psl/Parser/SchemaTest.hs

@@ -63,6 +63,7 @@ spec_parsePslSchema = do
             user        User       @relation(fields: [userId], references: [id])
             userId      Int
             votes       TaskVote[]
+            someField   String[] @default([])
           }
 
           model TaskVote {
@@ -230,7 +231,16 @@ spec_parsePslSchema = do
                             "votes"
                             (Psl.Model.UserType "TaskVote")
                             [Psl.Model.List]
-                            []
+                            [],
+                        Psl.Model.ElementField $
+                          Psl.Model.Field
+                            "someField"
+                            Psl.Model.String
+                            [Psl.Model.List]
+                            [ Psl.Attribute.Attribute
+                                "default"
+                                [Psl.Argument.ArgUnnamed $ Psl.Argument.ArrayExpr []]
+                            ]
                       ]
                   ),
               Psl.Schema.ModelBlock $

web/README.md

@@ -75,7 +75,7 @@ Since we don't want our users to read `docs/next` ("current" docs), we don't pub
 When releasing new version of Wasp, what we do is run `npm run docusaurus docs:version {version}` to create new versioned docs from the current docs. We do this on every new Wasp release.
 
 This command does everything for us, and since we use Docusaurus' default settings for versions,
-there is nothing else we need to do, it will be picked up as the lastest version by default.
+there is nothing else we need to do, it will be picked up as the latest version by default.
 
 #### Which version of docs should I be editing?