Merge branch 'main' into release

Author: infomiho

.github/workflows/ci.yaml renamed to .github/workflows/waspc-ci.yaml

@@ -1,11 +1,15 @@
-name: CI
+name: WASPC-CI
 
 on:
   push:
+    paths:
+      - "waspc/**"
     branches:
       - main
       - release
-  pull_request: { }
+  pull_request:
+    paths:
+      - "waspc/**"
   create: { tags: [v*] }
   schedule:
     # Additionally run once per week (At 00:00 on Sunday) to avoid loosing cache

README.md

@@ -19,13 +19,13 @@
 
 <br>
 
-Wasp (**W**eb **A**pplication **Sp**ecification) is a Rails-like framework for React, Node.js and Prisma.  
+Wasp (**W**eb **A**pplication **Sp**ecification) is a Rails-like framework for React, Node.js, and Prisma.  
 Build your app in a day and deploy it with a single CLI command!
 
 ### Why is Wasp awesome
 - 🚀 **Quick start**: Due to its expressiveness, you can create and deploy a production-ready web app from scratch with very few lines of concise, consistent, declarative code.
 - 😌 **No boilerplate**: By abstracting away complex full-stack features, there is less boilerplate code. That means less code to maintain and understand! It also means easier upgrades.
-- 🔓 **No lock-in**: You can deploy Wasp app anywhere you like. There is no lock-in into specific providers, you have full control over the code (and can actually check it out in .wasp/ dir if you are interested ).
+- 🔓 **No lock-in**: You can deploy the Wasp app anywhere you like. There is no lock-in into specific providers; you have full control over the code (and can actually check it out in .wasp/ dir if you are interested ).
 
 ### Features
  🔒 Full-stack Auth, 🖇️ RPC (Client <-> Server), 🚀 Simple Deployment, ⚙ ️Jobs, ✉️ Email Sending, 🛟 Full-stack Type Safety, ...
@@ -46,7 +46,7 @@ app todoApp {
 
 route RootRoute { path: "/", to: MainPage }
 page MainPage {
-  authRequired: true, // Limit access to logged in users.
+  authRequired: true, // Limit access to logged-in users.
   component: import Main from "@client/Main.tsx" // Your React code.
 }
 
@@ -72,7 +72,7 @@ The rest of the code you write in React / Node.js / Prisma and just reference it
 
 Given a simple .wasp configuration file that describes the high-level details of your web app, and .js(x)/.css/..., source files with your unique logic, Wasp compiler generates the full source of your web app in the target stack: front-end, back-end and deployment.
 
-This unique approach is what makes Wasp "smart" and gives it its super powers!
+This unique approach is what makes Wasp "smart" and gives it its superpowers!
 
 For more information about Wasp, check [**docs**](https://wasp-lang.dev/docs).
 
@@ -84,7 +84,7 @@ curl -sSL https://get.wasp-lang.dev/installer.sh | sh
 ```
 to install Wasp on OSX/Linux/WSL(Win). From there, just follow the instructions to run your first app in less than a minute!
 
-For more details check out [the docs](https://wasp-lang.dev/docs).
+For more details, check out [the docs](https://wasp-lang.dev/docs).
 
 # This repository
 
@@ -95,15 +95,15 @@ This is the main repo of the Wasp universe, containing core code (mostly `waspc`
 Currently, Wasp is in beta, with most features flushed out and working well.
 However, there are still a lot of improvements and additions that we have in mind for the future, and we are working on them constantly, so you can expect a lot of changes and improvements in the future.
 
-While the idea is to support multiple web tech stacks in the future, right now we are focusing on the specific stack: React + react-query, NodeJS + ExpressJS, Prisma.
+While the idea is to support multiple web tech stacks in the future, right now, we are focusing on the specific stack: React + react-query, NodeJS + ExpressJS, and Prisma.
 
 # Contributing
 
 Any way you want to contribute is a good way :)!
 
-The best place to start is to check out [waspc/](waspc/), where you can find detailed steps for the first time contributors + technical details about the Wasp compiler.
+The best place to start is to check out [waspc/](waspc/), where you can find detailed steps for first-time contributors + technical details about the Wasp compiler.
 
-Core of Wasp is built in Haskell, but there is also a lot of non-Haskell parts of Wasp, so you will certainly be able to find something for you!
+The core of Wasp is built in Haskell, but there are also a lot of non-Haskell parts of Wasp, so you will certainly be able to find something for you!
 
 Even if you don't plan to submit any code, just joining the discussion on discord [![Discord](https://img.shields.io/discord/686873244791210014?label=chat%20on%20discord)](https://discord.gg/rzdnErX) and giving your feedback is already great and helps a lot (motivates us and helps us figure out how to shape Wasp)!
 
@@ -118,7 +118,7 @@ Check our [careers](https://wasp-lang.notion.site/Wasp-Careers-59fd1682c80d446f9
 
 # Sponsors
 
-<a href="https://github.com/michelwaechter"><img src="https://github.com/michelwaechter.png" width="50px" alt="michelwaechter" /></a> - Our first sponsor ever! Thanks so much Michel ❤️ , from the whole Wasp Team, for bravely going where nobody has been before :)!
+<a href="https://github.com/michelwaechter"><img src="https://github.com/michelwaechter.png" width="50px" alt="michelwaechter" /></a> - Our first sponsor ever! Thanks so much, Michel ❤️ , from the whole Wasp Team, for bravely going where nobody has been before :)!
 
 <a href="https://github.com/shayneczyzewski"><img src="https://github.com/shayneczyzewski.png" width="50px" alt="shayneczyzewski" /></a> - Thanks Shayne, for all the contributions you did so far and for your continuous support!
 

waspc/docs/design-docs/db-seeding.org

@@ -13,7 +13,7 @@ I might want to have multiple such states, each of them named.
 
 I imagine this would actually be easier to do by doing snapshots of db then having seeding script, so I don't think this is what Prisma is targeting with their =seed=.
 So I probably went here a bit into a different use case -> still interesting though.
-Actuall, I read a bit more and seeding script is also valid way to do this.
+Actually, I read a bit more and seeding script is also valid way to do this.
 
 As for snapshots -> I guess this would come down to doing postgre exports and then saving those in git and loading them.
 I saw this being called "SQL backup file" somewhere.

waspc/docs/design-docs/server-setup.md

@@ -38,7 +38,7 @@ The solution that people suggested was an async function that returns an object
 
 ### Basic
   - Dev can specify, through wasp language, a JS function that will be executed on server start.
-    Such function would be async, take no arguments, and return an object that would be avaialable in operations (through `context`).
+    Such function would be async, take no arguments, and return an object that would be available in operations (through `context`).
 
 ### Advanced
   - Instead of returning an object that will be added to `context`, function could return a function that modifies the `context`.

waspc/docs/wasplang/src/index.tex

@@ -42,7 +42,7 @@ \subsection{Syntax}
 parse wasp, a quoter starting with \texttt{\{=tag} must contain all text until
 the first \texttt{tag=\}} or until the end of the input.
 
-The nonterminals for strings, numbers, and identifers are not shown.
+The nonterminals for strings, numbers, and identifiers are not shown.
 
 \subsection{Type System}
 
@@ -308,7 +308,7 @@ \subsection{Extensibility}
 \subsection{Simplicity}
 
 While wasp is much more complex than old wasp, it is still fairly simple.
-Noteably, control flow is absent. I wanted wasp to be as simple as possible
+Notably, control flow is absent. I wanted wasp to be as simple as possible
 to make experimenting with its implementation less painful. Hopefully, when
 a good implementation is found, it will be flexible enough to bring
 in more complex features as needed.
@@ -345,7 +345,7 @@ \subsection{Type checking}
 newtype PageParam = PageParam { name :: String
                               , paramType :: ParamType
                               } deriving (Generic)
-newtype Page = Page { componenent :: Analyzer.Primitive.Import
+newtype Page = Page { component :: Analyzer.Primitive.Import
                     , authRequired :: Maybe Bool
                     , params :: Maybe [PageParam]
                     } deriving (Generic)

waspc/src/Wasp/Generator/DbGenerator.hs

@@ -60,7 +60,7 @@ genPrismaSchema spec = do
     AS.Db.PostgreSQL -> return ("postgresql", makeEnvVarField databaseUrlEnvVarName)
     AS.Db.SQLite ->
       if AS.isBuild spec
-        then logAndThrowGeneratorError $ GenericGeneratorError "SQLite (a default database) is not supported in production. To build your Wasp app for production, switch to a different database. Switching to PostgreSQL: https://wasp-lang.dev/docs/language/features#migrating-from-sqlite-to-postgresql ."
+        then logAndThrowGeneratorError $ GenericGeneratorError "SQLite (a default database) is not supported in production. To build your Wasp app for production, switch to a different database. Switching to PostgreSQL: https://wasp-lang.dev/docs/data-model/backends#migrating-from-sqlite-to-postgresql ."
         else return ("sqlite", "\"file:./dev.db\"")
 
   let templateData =