Merge branch 'release'

2024-12-26 02:23:21 +03:00 · 2024-04-11 18:53:57 +02:00 · 2024-04-11 18:53:57 +02:00 · 27450eb348
commit 27450eb348
parent bd341f6d31 2fa4c5ed50
21 changed files with 69 additions and 29 deletions
--- a/waspc/ChangeLog.md
+++ b/waspc/ChangeLog.md
@ -1,5 +1,11 @@
 # Changelog

+## 0.13.2 (2024-04-11)
+
+### 🐞 Bug fixes
+
+- Fixed problems with Wasp's type inference in projects created using Wasp 0.13.1.
+
 ## 0.13.1 (2024-04-04)

 ### 🐞 Bug fixes
--- a/waspc/data/Generator/templates/sdk/wasp/package.json
+++ b/waspc/data/Generator/templates/sdk/wasp/package.json
@ -54,10 +54,6 @@
      "./universal/validators": "./dist/universal/validators.js",
      {=!  Parts are used by users, documented. Parts are probably used by our code, undocumented (but accessible). =}
      "./server/utils": "./dist/server/utils.js",
-      {=!  Used by our code (SDK for full-stack type safety), uncodumented (but accessible) for users. =}
-      "./server/opeations/actions": "./dist/server/actions/index.js",
-      {=!  Used by our code (SDK for full-stack type safety), uncodumented (but accessible) for users. =}
-      "./server/operations/queries": "./dist/server/queries/index.js",
      {=!  Used by our code, uncodumented (but accessible) for users. =}
      "./server/auth/email": "./dist/server/auth/email/index.js",
      {=!  Used by our code, uncodumented (but accessible) for users. =}
@ -110,7 +106,17 @@
      "./client/router": "./dist/client/router/index.js",
      "./client/test": "./dist/client/test/index.js",
      "./client": "./dist/client/index.js",
-      "./dev": "./dist/dev/index.js"
+      "./dev": "./dist/dev/index.js",
+
+      {=! todo(filip): Fixes below are for type errors in 0.13.1, remove ASAP =}
+      {=! Used by our code (SDK for full-stack type safety), uncodumented (but accessible) for users. =}
+      "./client/operations/core": "./dist/client/operations/core.js",
+      "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
+      "./server/operations/actions":  "./dist/server/operations/actions/index.js",
+      "./server/operations/queries": "./dist/server/operations/queries/index.js",
+      "./server/_types": "./dist/server/_types/index.js",
+      "./server/_types/serialization": "./dist/server/_types/serialization.js"
+
   },
   {=!
     TypeScript doesn't care about the redirects we define above in "exports" field; those
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
@ -207,7 +207,7 @@
            "file",
            "../out/sdk/wasp/package.json"
        ],
-        "d0db918bf9df0766992ba13933d847853b330e3b601e5f367c3ad25eaecddc87"
+        "3422dd87e9e5f4aeb3922ee152ad691399d91ad71172f2b76f6235eb28955fa2"
    ],
    [
        [
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/sdk/wasp/package.json
@ -41,6 +41,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -55,21 +56,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/out/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/out/sdk/wasp/package.json
@ -41,6 +41,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -55,21 +56,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
@ -1,7 +1,7 @@
 app waspBuild {
  db: { system: PostgreSQL },
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  title: "waspBuild"
 }
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
@ -207,7 +207,7 @@
            "file",
            "../out/sdk/wasp/package.json"
        ],
-        "d0db918bf9df0766992ba13933d847853b330e3b601e5f367c3ad25eaecddc87"
+        "3422dd87e9e5f4aeb3922ee152ad691399d91ad71172f2b76f6235eb28955fa2"
    ],
    [
        [
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/sdk/wasp/package.json
@ -41,6 +41,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -55,21 +56,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
@ -1,6 +1,6 @@
 app waspCompile {
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  title: "waspCompile"
 }
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
@ -480,7 +480,7 @@
            "file",
            "../out/sdk/wasp/package.json"
        ],
-        "970b830be8de1b4a896fbd5ea192b8382a049325d6f4127bd092c7b794f5955e"
+        "0f0265981290d0585a53f8fb24e8e37f41e0e89c8379efce5334a51197548c93"
    ],
    [
        [
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/sdk/wasp/package.json
@ -47,6 +47,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -61,21 +62,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
@ -1,7 +1,7 @@
 app waspComplexTest {
  db: { system: PostgreSQL },
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  auth: {
    userEntity: User,
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
@ -214,7 +214,7 @@
            "file",
            "../out/sdk/wasp/package.json"
        ],
-        "59c5483e1079ca2ef0ede748d975ddd47050854c61d162c5d86843e7d48dd7da"
+        "3b782f30f90af25108f881b4e7d28cd6a8c2894d169dd78c076cf47d76598440"
    ],
    [
        [
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/sdk/wasp/package.json
@ -42,6 +42,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -56,21 +57,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
@ -1,7 +1,7 @@
 app waspJob {
  db: { system: PostgreSQL },
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  title: "waspJob"
 }
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
@ -207,7 +207,7 @@
            "file",
            "../out/sdk/wasp/package.json"
        ],
-        "d0db918bf9df0766992ba13933d847853b330e3b601e5f367c3ad25eaecddc87"
+        "3422dd87e9e5f4aeb3922ee152ad691399d91ad71172f2b76f6235eb28955fa2"
    ],
    [
        [
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/sdk/wasp/package.json
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/sdk/wasp/package.json
@ -41,6 +41,7 @@
    "./client/auth": "./dist/client/auth/index.js",
    "./client/crud": "./dist/client/crud/index.js",
    "./client/operations": "./dist/client/operations/index.js",
+    "./client/operations/core": "./dist/client/operations/core.js",
    "./client/router": "./dist/client/router/index.js",
    "./client/test": "./dist/client/test/index.js",
    "./client/test/*": "./dist/client/test/*.js",
@ -55,21 +56,24 @@
    "./operations": "./dist/operations/index.js",
    "./operations/*": "./dist/operations/*",
    "./server": "./dist/server/index.js",
+    "./server/_types": "./dist/server/_types/index.js",
+    "./server/_types/serialization": "./dist/server/_types/serialization.js",
    "./server/api": "./dist/server/api/index.js",
    "./server/auth": "./dist/server/auth/index.js",
    "./server/auth/email": "./dist/server/auth/email/index.js",
    "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
    "./server/crud": "./dist/server/crud/index.js",
    "./server/crud/*": "./dist/server/crud/*",
+    "./server/crud/Tasks": "./dist/server/crud/Tasks.js",
    "./server/email": "./dist/server/email/index.js",
    "./server/email/core/types": "./dist/server/email/core/types.js",
    "./server/jobs": "./dist/server/jobs/index.js",
    "./server/jobs/*": "./dist/server/jobs/*.js",
    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
    "./server/middleware": "./dist/server/middleware/index.js",
-    "./server/opeations/actions": "./dist/server/actions/index.js",
    "./server/operations": "./dist/server/operations/index.js",
-    "./server/operations/queries": "./dist/server/queries/index.js",
+    "./server/operations/actions": "./dist/server/operations/actions/index.js",
+    "./server/operations/queries": "./dist/server/operations/queries/index.js",
    "./server/types": "./dist/server/types/index.js",
    "./server/utils": "./dist/server/utils.js",
    "./server/webSocket": "./dist/server/webSocket/index.js",
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
@ -1,6 +1,6 @@
 app waspMigrate {
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  title: "waspMigrate"
 }
--- a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
@ -1,6 +1,6 @@
 app waspNew {
  wasp: {
-    version: "^0.13.1"
+    version: "^0.13.2"
  },
  title: "waspNew"
 }
--- a/waspc/examples/todoApp/tsconfig.json
+++ b/waspc/examples/todoApp/tsconfig.json
@ -5,6 +5,10 @@
 // compiler. Proper TS compiler configuration in Wasp is coming soon :)
 {
  "compilerOptions": {
+    "target": "esnext",
+    // We're bundling all code in the end so this is the most appropriate option,
+    // it's also important for autocomplete to work properly.
+    "moduleResolution": "bundler",
    // JSX support
    "jsx": "preserve",
    "strict": true,
--- a/waspc/waspc.cabal
+++ b/waspc/waspc.cabal
@ -6,7 +6,7 @@ cabal-version: 2.4
 --    Consider using hpack, or maybe even hpack-dhall.

 name:           waspc
-version:        0.13.1
+version:        0.13.2
 description:    Please see the README on GitHub at <https://github.com/wasp-lang/wasp/waspc#readme>
 homepage:       https://github.com/wasp-lang/wasp/waspc#readme
 bug-reports:    https://github.com/wasp-lang/wasp/issues