TableRowTypeResolver updated

Author: dg

CLAUDE.md

@@ -103,7 +103,7 @@ Extensions for specific Nette packages use dedicated namespaces: `Nette\PHPStan\
 
 ### TableRowTypeResolver
 
-`TableRowTypeResolver` is a shared service used by the three database extensions below. It resolves database table names to entity row class types using a configurable convention mask (e.g. `App\Entity\*Row` where `*` is replaced by PascalCase table name) and optional explicit table-to-class overrides. Checks class existence via `ReflectionProvider`. Config: `extension-nette.neon` parameters `nette.database.mapping.convention` and `nette.database.mapping.tables`.
+`TableRowTypeResolver` is a shared service used by the three database extensions below. It resolves database table names to entity row class types using a configurable `tables` map. Keys may contain a single `*` wildcard (e.g. `forum_*`), and a bare `*` acts as a catch-all fallback. Class names may contain `*` which is replaced with PascalCase of the captured portion (or the full table name for exact keys). Exact keys take precedence over wildcards; wildcard entries are tried in declaration order. Checks class existence via `ReflectionProvider`. Mirrors `Nette\Database\DefaultEntityMapping`. Config: `extension-nette.neon` parameter `nette.database.mapping.tables`.
 
 ### ExplorerTableReturnTypeExtension
 

extension-nette.neon

@@ -11,7 +11,6 @@ parameters:
 			mapping: []
 		database:
 			mapping:
-				convention: ''
 				tables: []
 
 
@@ -22,7 +21,6 @@ parametersSchema:
 		])
 		database: structure([
 			mapping: structure([
-				convention: string()
 				tables: arrayOf(string(), string())
 			])
 		])
@@ -60,7 +58,6 @@ services:
 	# nette/database
 	nette.database.tableRowTypeResolver:
 		create: Nette\PHPStan\Database\TableRowTypeResolver(
-			convention: %nette.database.mapping.convention%
 			tables: %nette.database.mapping.tables%
 		)
 	-

src/Database/TableRowTypeResolver.php

@@ -8,18 +8,20 @@
 
 /**
  * Resolves database table names to entity row class types.
- * Convention: table_name -> str_replace('*', PascalCase(table), mask).
- * Explicit overrides in $tables take precedence over convention.
+ * Uses a table-to-class map with optional '*' wildcards in keys (e.g. 'forum_*').
+ * Class names may contain '*' which is replaced with PascalCase of the captured portion
+ * (or the full table name for exact keys). Exact keys take precedence; wildcard entries
+ * are tried in declaration order.
  */
 class TableRowTypeResolver
 {
 	/**
-	 * @param string $convention mask like App\Entity\*Row, where * is replaced by PascalCase table name
-	 * @param array<string, string> $tables explicit table -> FQCN overrides
+	 * @param array<string, string> $tables table -> FQCN map; keys may contain a single '*' wildcard,
+	 *     and a bare '*' acts as a catch-all fallback. Values may contain '*' which is replaced with
+	 *     PascalCase of the captured portion.
 	 */
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
-		private string $convention = '',
 		private array $tables = [],
 	) {
 	}
@@ -31,18 +33,11 @@ public function __construct(
 	 */
 	public function resolve(string $tableName): ?ObjectType
 	{
-		if (isset($this->tables[$tableName])) {
-			$className = $this->tables[$tableName];
-			return $this->reflectionProvider->hasClass($className)
-				? new ObjectType($className)
-				: null;
-		}
-
-		if ($this->convention === '') {
+		$className = $this->resolveClassName($tableName);
+		if ($className === null) {
 			return null;
 		}
 
-		$className = str_replace('*', $this->snakeToPascalCase($tableName), $this->convention);
 		return $this->reflectionProvider->hasClass($className)
 			? new ObjectType($className)
 			: null;
@@ -60,6 +55,34 @@ public function extractTableName(string $key): string
 	}
 
 
+	private function resolveClassName(string $tableName): ?string
+	{
+		if (isset($this->tables[$tableName])) {
+			return $this->expandClass($this->tables[$tableName], $tableName);
+		}
+
+		foreach ($this->tables as $pattern => $class) {
+			if (!str_contains($pattern, '*')) {
+				continue;
+			}
+			$regex = '#^' . str_replace('\*', '(.*)', preg_quote($pattern, '#')) . '$#D';
+			if (preg_match($regex, $tableName, $m)) {
+				return $this->expandClass($class, $m[1]);
+			}
+		}
+
+		return null;
+	}
+
+
+	private function expandClass(string $class, string $capture): string
+	{
+		return str_contains($class, '*')
+			? str_replace('*', $this->snakeToPascalCase($capture), $class)
+			: $class;
+	}
+
+
 	private function snakeToPascalCase(string $table): string
 	{
 		return str_replace(' ', '', ucwords(strtr($table, '_', ' ')));

tests/Database/database-row-mapping.neon

@@ -5,6 +5,6 @@ parameters:
 	nette:
 		database:
 			mapping:
-				convention: '*Row'
-				tables:
+				tables: 
 					custom_table: CustomEntity
+					*: *Row