Restructuring prototype RFC

waspc/cli/src/Wasp/Cli/Common.hs

@@ -44,13 +44,13 @@ dotWaspInfoFileInGeneratedCodeDir :: Path' (Rel Wasp.Generator.Common.ProjectRoo
 dotWaspInfoFileInGeneratedCodeDir = [relfile|.waspinfo|]
 
 extServerCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
-extServerCodeDirInWaspProjectDir = [reldir|src/server|]
+extServerCodeDirInWaspProjectDir = [reldir|src|]
 
 extClientCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
-extClientCodeDirInWaspProjectDir = [reldir|src/client|]
+extClientCodeDirInWaspProjectDir = [reldir|src|]
 
 extSharedCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
-extSharedCodeDirInWaspProjectDir = [reldir|src/shared|]
+extSharedCodeDirInWaspProjectDir = [reldir|src|]
 
 waspSays :: String -> IO ()
 waspSays what = putStrLn $ Term.applyStyles [Term.Yellow] what

waspc/data/Cli/templates/basic/src/client/vite-env.d.ts

@@ -1 +1 @@
-/// <reference types="../../.wasp/out/web-app/node_modules/vite/client" />
+/// <reference types="vite/client" />

waspc/data/Generator/templates/react-app/src/index.tsx

@@ -7,7 +7,7 @@ import router from './router'
 import {
   initializeQueryClient,
   queryClientInitialized,
-} from './queryClient'
+} from '@wasp/rpc/queryClient'
 
 {=# setupFn.isDefined =}
 {=& setupFn.importStatement =}

waspc/data/Generator/templates/react-app/src/router.tsx

@@ -12,7 +12,7 @@ import type {
 {=/ rootComponent.isDefined =}
 
 {=# isAuthEnabled =}
-import createAuthRequiredPage from "./auth/pages/createAuthRequiredPage"
+import createAuthRequiredPage from "@wasp/auth/pages/createAuthRequiredPage"
 {=/ isAuthEnabled =}
 
 {=# pagesToImport =}

waspc/data/Generator/templates/react-app/tsconfig.json

@@ -8,6 +8,12 @@
     // Allow importing pages with the .tsx extension.
     "allowImportingTsExtensions": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}

waspc/data/Generator/templates/react-app/vite.config.ts

@@ -14,6 +14,9 @@ const _waspUserProvidedConfig = {};
 const defaultViteConfig = {
   base: "{= baseDir =}",
   plugins: [react()],
+  optimizeDeps: {
+    exclude: ['@wasp']
+  },
   server: {
     port: {= defaultClientPort =},
     host: "0.0.0.0",

waspc/data/Generator/templates/server/nodemon.json

@@ -4,7 +4,9 @@
   },
   "watch": [
     "src/",
+    "../../../src/",
     ".env"
   ],
+  "comment-filip": "We now have to watch ../../../src/ because we're importing client files directly",
   "ext": "ts,mts,js,mjs,json"
 }

waspc/data/Generator/templates/server/package.json

@@ -4,9 +4,10 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
+  "comment-filip": "The server.js location changed because we have now included client source files above .wasp/out/server/src.",
   "scripts": {
     "build": "npx tsc",
-    "start": "npm run validate-env && NODE_PATH=dist node -r dotenv/config dist/server.js",
+    "start": "npm run validate-env && NODE_PATH=dist node -r dotenv/config dist/.wasp/out/server/src/server.js",
     "build-and-start": "npm run build && npm run start",
     "watch": "nodemon --exec 'npm run build-and-start || exit 1'",
     "validate-env": "node -r dotenv/config ./scripts/validate-env.mjs",

waspc/data/Generator/templates/server/tsconfig.json

@@ -2,6 +2,15 @@
   "extends": "@tsconfig/node18/tsconfig.json",
   "compilerOptions": {
     // Overriding this until we implement more complete TypeScript support.
+    // Filip: begin client file hacks
+    // We need this to make server work with copied client files (we copy everything)
+    "jsx": "preserve",
+    "lib": [
+      "esnext",
+      "dom",
+      "DOM.Iterable"
+    ],
+    // Filip: end client file hacks
     "strict": false,
     // Overriding this because we want to use top-level await
     "module": "esnext",
@@ -10,12 +19,13 @@
     "sourceMap": true,
     // The remaining settings should match node18/tsconfig.json, but I kept
     // them here to be explicit.
-
     // Enable default imports in TypeScript.
     "esModuleInterop": true,
     "moduleResolution": "node",
     "outDir": "dist",
     "allowJs": true
   },
-  "include": ["src"]
-}
+  "include": [
+    "src"
+  ]
+}

waspc/examples/todo-typescript/.gitignore

@@ -0,0 +1,4 @@
+/.wasp/
+/.env.server
+/.env.client
+/node_modules/

waspc/examples/todo-typescript/.wasproot

@@ -0,0 +1 @@
+File marking the root of Wasp project.

waspc/examples/todo-typescript/main.wasp

@@ -0,0 +1,77 @@
+app TodoTypescript {
+  wasp: {
+    version: "^0.11.0"
+  },
+  title: "ToDo TypeScript",
+
+  auth: {
+    userEntity: User,
+    methods: {
+      usernameAndPassword: {}, // this is a very naive implementation, use 'email' in production instead
+      //google: {}, //https://wasp-lang.dev/docs/integrations/google
+      //gitHub: {}, //https://wasp-lang.dev/docs/integrations/github
+      //email: {} //https://wasp-lang.dev/docs/guides/email-auth
+    },
+    onAuthFailedRedirectTo: "/login",
+  }
+}
+
+// Use Prisma Schema Language (PSL) to define our entities: https://www.prisma.io/docs/concepts/components/prisma-schema
+// Run `wasp db migrate-dev` in the CLI to create the database tables
+// Then run `wasp db studio` to open Prisma Studio and view your db models
+entity User {=psl
+  id          Int     @id @default(autoincrement())
+  username    String  @unique
+  password    String
+  tasks       Task[]
+psl=}
+
+entity Task {=psl
+  id          Int     @id @default(autoincrement())
+  description String
+  isDone      Boolean @default(false)
+  user        User   @relation(fields: [userId], references: [id])
+  userId      Int
+psl=}
+
+route RootRoute { path: "/", to: MainPage }
+page MainPage {
+  authRequired: true,
+  // todo(filip): LSP features are broken beucase I haven't yet updated LSP to the new structure.
+  component: import { MainPage } from "@src/MainPage.tsx"
+}
+
+route LoginRoute { path: "/login", to: LoginPage }
+page LoginPage {
+  component: import { LoginPage } from "@src/user/LoginPage.tsx"
+}
+
+route SignupRoute { path: "/signup", to: SignupPage }
+page SignupPage {
+  component: import { SignupPage } from "@src/user/SignupPage.tsx"
+}
+
+query getTasks {
+  // We specify the JS implementation of our query (which is an async JS function)
+  // Even if you use TS and have a queries.ts file, you will still need to import it using the .js extension.
+  // see here for more info: https://wasp-lang.dev/docs/tutorials/todo-app/03-listing-tasks#wasp-declaration
+  fn: import { getTasks } from "@src/task/queries.js",
+  // We tell Wasp that this query is doing something with the `Task` entity. With that, Wasp will
+  // automatically refresh the results of this query when tasks change.
+  entities: [Task]
+}
+
+action createTask {
+  fn: import { createTask } from "@src/task/actions.js",
+  entities: [Task]
+}
+
+action updateTask {
+  fn: import { updateTask } from "@src/task/actions.js",
+  entities: [Task]
+}
+
+action deleteTasks {
+  fn: import { deleteTasks } from "@src/task/actions.js",
+  entities: [Task],
+}

waspc/examples/todo-typescript/migrate

@@ -0,0 +1,6 @@
+rsync -a .wasp/out/web-app/node_modules/ node_modules/
+rsync -a .wasp/out/server/node_modules/ node_modules/
+# rsync -a node_modules_wasp/ node_modules
+rw db migrate-dev
+fd . '.wasp/out/server/node_modules' | grep -v prisma -i | xargs rm -r
+rm -r .wasp/out/web-app/node_modules

waspc/examples/todo-typescript/migrations/20230816092617_migracijone/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "username" TEXT NOT NULL,
+    "password" TEXT NOT NULL
+);
+
+-- CreateTable
+CREATE TABLE "Task" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "description" TEXT NOT NULL,
+    "isDone" BOOLEAN NOT NULL DEFAULT false,
+    "userId" INTEGER,
+    CONSTRAINT "Task_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_username_key" ON "User"("username");

waspc/examples/todo-typescript/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "sqlite"