Support typed autowiring of two parameters in form handlers

composer.json

@@ -24,12 +24,12 @@
 		"nette/application": "^3.0",
 		"nette/di": "^3.0",
 		"nette/tester": "^2.5.2",
-		"latte/latte": "^2.10.2 || ^3.0.12",
+		"latte/latte": "^3.0.12",
 		"tracy/tracy": "^2.9",
 		"phpstan/phpstan-nette": "^2.0@stable"
 	},
 	"conflict": {
-		"latte/latte": ">=3.0.0 <3.0.12 || >=3.2"
+		"latte/latte": "<3.0.12 || >=3.2"
 	},
 	"suggest": {
 		"ext-intl": "to use date/time controls"
@@ -47,7 +47,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.2-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -2,8 +2,8 @@ Nette Forms: greatly facilitates web forms
 ==========================================
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/forms.svg)](https://packagist.org/packages/nette/forms)
-[![Tests](https://github.com/nette/forms/actions/workflows/tests.yml/badge.svg?branch=v3.2)](https://github.com/nette/forms/actions)
-[![Coverage Status](https://coveralls.io/repos/github/nette/forms/badge.svg?branch=v3.2)](https://coveralls.io/github/nette/forms?branch=v3.2)
+[![Tests](https://github.com/nette/forms/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/nette/forms/actions)
+[![Coverage Status](https://coveralls.io/repos/github/nette/forms/badge.svg?branch=master)](https://coveralls.io/github/nette/forms?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/nette/forms/v/stable)](https://github.com/nette/forms/releases)
 [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/forms/blob/master/license.md)
 

rollup.config.js

@@ -34,21 +34,21 @@ function spaces2tabs() {
 
 
 export default [
-	{
+	{ // TODO: consider the possibility of cutting off the UMD versions completely due to collision
 		input: 'src/assets/index.umd.ts',
 		output: [
 			{
 				format: 'umd',
 				name: 'Nette',
-				dir: 'src/assets',
-				entryFileNames: 'netteForms.js',
+				dir: 'src/assets/dist',
+				entryFileNames: 'nette-forms.umd.js',
 				generatedCode: 'es2015',
 			},
 			{
 				format: 'umd',
 				name: 'Nette',
-				dir: 'src/assets',
-				entryFileNames: 'netteForms.min.js',
+				dir: 'src/assets/dist',
+				entryFileNames: 'nette-forms.umd.min.js',
 				generatedCode: 'es2015',
 				plugins: [
 					terser(),
@@ -65,9 +65,36 @@ export default [
 	},
 
 	{
-		input: 'src/assets/index.umd.ts',
+		input: 'src/assets/index.esm.ts',
+		output: [
+			{
+				format: 'es',
+				dir: 'src/assets/dist',
+				entryFileNames: 'nette-forms.esm.js',
+				generatedCode: 'es2015',
+			},
+			{
+				format: 'es',
+				dir: 'src/assets/dist',
+				entryFileNames: 'nette-forms.esm.min.js',
+				generatedCode: 'es2015',
+				plugins: [
+					terser(),
+				],
+			},
+		],
+		plugins: [
+			json(),
+			nodeResolve(),
+			typescript(),
+			spaces2tabs(),
+		],
+	},
+
+	{
+		input: 'src/assets/index.esm.ts',
 		output: [{
-			file: 'src/assets/netteForms.d.ts',
+			file: 'src/assets/dist/nette-forms.d.ts',
 			format: 'es',
 		}],
 		plugins: [