diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
index c27f6850d0..e0a0e6f472 100644
--- a/packages/java/tests/csrf-context/package-lock.json
+++ b/packages/java/tests/csrf-context/package-lock.json
@@ -66,10 +66,10 @@
     },
     "../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -91,10 +91,10 @@
     },
     "../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -103,7 +103,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -119,16 +119,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -155,17 +155,17 @@
     },
     "../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -186,21 +186,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -221,20 +221,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -255,22 +255,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -291,24 +291,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -329,13 +329,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7286,7 +7286,7 @@
       "version": "file:../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7326,8 +7326,8 @@
       "version": "file:../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7346,7 +7346,7 @@
       "version": "file:../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7369,9 +7369,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7395,9 +7395,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7419,8 +7419,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7442,9 +7442,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7468,9 +7468,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/csrf-context/package.json b/packages/java/tests/csrf-context/package.json
index aca1fa73bf..e85513a180 100644
--- a/packages/java/tests/csrf-context/package.json
+++ b/packages/java/tests/csrf-context/package.json
@@ -36,16 +36,16 @@
   },
   "vaadin": {
     "dependencies": {
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
       "@vaadin/router": "1.7.5",
diff --git a/packages/java/tests/csrf/package-lock.json b/packages/java/tests/csrf/package-lock.json
index 60cb6f3f20..02b77d8fe1 100644
--- a/packages/java/tests/csrf/package-lock.json
+++ b/packages/java/tests/csrf/package-lock.json
@@ -66,10 +66,10 @@
     },
     "../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -91,10 +91,10 @@
     },
     "../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -103,7 +103,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -119,16 +119,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -155,17 +155,17 @@
     },
     "../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -186,21 +186,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -221,20 +221,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -255,22 +255,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -291,24 +291,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -329,13 +329,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7343,7 +7343,7 @@
       "version": "file:../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7379,8 +7379,8 @@
       "version": "file:../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7399,7 +7399,7 @@
       "version": "file:../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7422,9 +7422,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7448,9 +7448,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7472,8 +7472,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7495,9 +7495,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7521,9 +7521,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/csrf/package.json b/packages/java/tests/csrf/package.json
index aca1fa73bf..e85513a180 100644
--- a/packages/java/tests/csrf/package.json
+++ b/packages/java/tests/csrf/package.json
@@ -36,16 +36,16 @@
   },
   "vaadin": {
     "dependencies": {
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
       "@vaadin/router": "1.7.5",
diff --git a/packages/java/tests/spring/endpoints-custom-client/package-lock.json b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
index e240b454fe..5c417542b5 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package-lock.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
@@ -42,10 +42,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -67,10 +67,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -79,7 +79,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -95,16 +95,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -131,17 +131,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -162,21 +162,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -197,20 +197,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,22 +231,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -267,24 +267,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -305,13 +305,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7081,7 +7081,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7121,8 +7121,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7141,7 +7141,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7164,9 +7164,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7190,9 +7190,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7214,8 +7214,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7237,9 +7237,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7263,9 +7263,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/endpoints-custom-client/package.json b/packages/java/tests/spring/endpoints-custom-client/package.json
index 7ce47518c6..fd67b761e4 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package.json
@@ -36,16 +36,16 @@
   },
   "vaadin": {
     "dependencies": {
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
       "@vaadin/router": "1.7.5",
diff --git a/packages/java/tests/spring/endpoints/package-lock.json b/packages/java/tests/spring/endpoints/package-lock.json
index e240b454fe..5c417542b5 100644
--- a/packages/java/tests/spring/endpoints/package-lock.json
+++ b/packages/java/tests/spring/endpoints/package-lock.json
@@ -42,10 +42,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -67,10 +67,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -79,7 +79,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -95,16 +95,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -131,17 +131,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -162,21 +162,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -197,20 +197,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,22 +231,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -267,24 +267,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -305,13 +305,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7081,7 +7081,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7121,8 +7121,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7141,7 +7141,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7164,9 +7164,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7190,9 +7190,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7214,8 +7214,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7237,9 +7237,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7263,9 +7263,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/endpoints/package.json b/packages/java/tests/spring/endpoints/package.json
index 7ce47518c6..fd67b761e4 100644
--- a/packages/java/tests/spring/endpoints/package.json
+++ b/packages/java/tests/spring/endpoints/package.json
@@ -36,16 +36,16 @@
   },
   "vaadin": {
     "dependencies": {
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
       "@vaadin/router": "1.7.5",
diff --git a/packages/java/tests/spring/security-contextpath/package-lock.json b/packages/java/tests/spring/security-contextpath/package-lock.json
index 3bb20d9f58..d69442454a 100644
--- a/packages/java/tests/spring/security-contextpath/package-lock.json
+++ b/packages/java/tests/spring/security-contextpath/package-lock.json
@@ -76,10 +76,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -101,10 +101,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -113,7 +113,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -129,16 +129,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -165,17 +165,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -196,21 +196,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,20 +231,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -265,22 +265,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -301,24 +301,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -339,13 +339,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7715,7 +7715,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7755,8 +7755,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7775,7 +7775,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7798,9 +7798,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7824,9 +7824,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7848,8 +7848,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7871,9 +7871,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7897,9 +7897,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/security-contextpath/package.json b/packages/java/tests/spring/security-contextpath/package.json
index 994c10e21a..a993e8a48c 100644
--- a/packages/java/tests/spring/security-contextpath/package.json
+++ b/packages/java/tests/spring/security-contextpath/package.json
@@ -71,16 +71,16 @@
   "vaadin": {
     "dependencies": {
       "@adobe/lit-mobx": "2.0.0-rc.4",
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/iron-icon": "3.0.1",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
diff --git a/packages/java/tests/spring/security-jwt/package-lock.json b/packages/java/tests/spring/security-jwt/package-lock.json
index 3bb20d9f58..d69442454a 100644
--- a/packages/java/tests/spring/security-jwt/package-lock.json
+++ b/packages/java/tests/spring/security-jwt/package-lock.json
@@ -76,10 +76,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -101,10 +101,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -113,7 +113,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -129,16 +129,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -165,17 +165,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -196,21 +196,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,20 +231,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -265,22 +265,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -301,24 +301,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -339,13 +339,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7715,7 +7715,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7755,8 +7755,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7775,7 +7775,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7798,9 +7798,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7824,9 +7824,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7848,8 +7848,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7871,9 +7871,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7897,9 +7897,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/security-jwt/package.json b/packages/java/tests/spring/security-jwt/package.json
index 994c10e21a..a993e8a48c 100644
--- a/packages/java/tests/spring/security-jwt/package.json
+++ b/packages/java/tests/spring/security-jwt/package.json
@@ -71,16 +71,16 @@
   "vaadin": {
     "dependencies": {
       "@adobe/lit-mobx": "2.0.0-rc.4",
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/iron-icon": "3.0.1",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
diff --git a/packages/java/tests/spring/security-urlmapping/package-lock.json b/packages/java/tests/spring/security-urlmapping/package-lock.json
index 3bb20d9f58..d69442454a 100644
--- a/packages/java/tests/spring/security-urlmapping/package-lock.json
+++ b/packages/java/tests/spring/security-urlmapping/package-lock.json
@@ -76,10 +76,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -101,10 +101,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -113,7 +113,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -129,16 +129,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -165,17 +165,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -196,21 +196,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,20 +231,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -265,22 +265,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -301,24 +301,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -339,13 +339,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7715,7 +7715,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7755,8 +7755,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7775,7 +7775,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7798,9 +7798,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7824,9 +7824,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7848,8 +7848,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7871,9 +7871,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7897,9 +7897,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/security-urlmapping/package.json b/packages/java/tests/spring/security-urlmapping/package.json
index 994c10e21a..a993e8a48c 100644
--- a/packages/java/tests/spring/security-urlmapping/package.json
+++ b/packages/java/tests/spring/security-urlmapping/package.json
@@ -71,16 +71,16 @@
   "vaadin": {
     "dependencies": {
       "@adobe/lit-mobx": "2.0.0-rc.4",
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/iron-icon": "3.0.1",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",
diff --git a/packages/java/tests/spring/security/package-lock.json b/packages/java/tests/spring/security/package-lock.json
index 3bb20d9f58..d69442454a 100644
--- a/packages/java/tests/spring/security/package-lock.json
+++ b/packages/java/tests/spring/security/package-lock.json
@@ -76,10 +76,10 @@
     },
     "../../../../ts/form": {
       "name": "@hilla/form",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -101,10 +101,10 @@
     },
     "../../../../ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -113,7 +113,7 @@
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -129,16 +129,16 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
@@ -165,17 +165,17 @@
     },
     "../../../../ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -196,21 +196,21 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -231,20 +231,20 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -265,22 +265,22 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -301,24 +301,24 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "1.4.0-alpha1",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1"
+        "@hilla/form": "1.4.0-alpha2",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-plugin-push": {
       "name": "@hilla/generator-typescript-plugin-push",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "^5.2.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -339,13 +339,13 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1"
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2"
       }
     },
     "../../../../ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.4.0-alpha1",
+      "version": "1.4.0-alpha2",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -7715,7 +7715,7 @@
       "version": "file:../../../../ts/form",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/frontend": "1.4.0-alpha1",
+        "@hilla/frontend": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/chai-dom": "^1.11.1",
         "@types/mocha": "^10.0.2",
@@ -7755,8 +7755,8 @@
       "version": "file:../../../../ts/generator-typescript-cli",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7775,7 +7775,7 @@
       "version": "file:../../../../ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7798,9 +7798,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:../../../../ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7824,9 +7824,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:../../../../ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7848,8 +7848,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:../../../../ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7871,9 +7871,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:../../../../ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
@@ -7897,9 +7897,9 @@
     "@hilla/generator-typescript-plugin-push": {
       "version": "file:../../../../ts/generator-typescript-plugin-push",
       "requires": {
-        "@hilla/generator-typescript-core": "1.4.0-alpha1",
-        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-        "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+        "@hilla/generator-typescript-core": "1.4.0-alpha2",
+        "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+        "@hilla/generator-typescript-utils": "1.4.0-alpha2",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
         "@types/node": "^20.7.1",
diff --git a/packages/java/tests/spring/security/package.json b/packages/java/tests/spring/security/package.json
index 994c10e21a..a993e8a48c 100644
--- a/packages/java/tests/spring/security/package.json
+++ b/packages/java/tests/spring/security/package.json
@@ -71,16 +71,16 @@
   "vaadin": {
     "dependencies": {
       "@adobe/lit-mobx": "2.0.0-rc.4",
-      "@hilla/form": "1.4.0-alpha1",
-      "@hilla/frontend": "1.4.0-alpha1",
-      "@hilla/generator-typescript-cli": "1.4.0-alpha1",
-      "@hilla/generator-typescript-core": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha1",
-      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha1",
-      "@hilla/generator-typescript-utils": "1.4.0-alpha1",
+      "@hilla/form": "1.4.0-alpha2",
+      "@hilla/frontend": "1.4.0-alpha2",
+      "@hilla/generator-typescript-cli": "1.4.0-alpha2",
+      "@hilla/generator-typescript-core": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-backbone": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-barrel": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-client": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-model": "1.4.0-alpha2",
+      "@hilla/generator-typescript-plugin-push": "1.4.0-alpha2",
+      "@hilla/generator-typescript-utils": "1.4.0-alpha2",
       "@polymer/iron-icon": "3.0.1",
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.18",