fix: prevent pkg_pkg_ duplication in package zip names

parseManifest() was falling back to the filename (pkg_mokowaas.xml → pkg_mokowaas) as the element, then typePrefix() prepended another pkg_. Now uses <packagename> for packages and strips existing type prefixes from the element before prepending. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-05-23 23:20:16 -05:00
parent 4f48dcae5c
commit b8a282cdbc
1 changed files with 12 additions and 0 deletions
@@ -155,6 +155,14 @@ function parseManifest(string $file): array
 	$element = (string) ($xml->element ?? '');
 	$group   = (string) ($xml->attributes()->group ?? '');

+	// For packages, prefer <packagename> as the clean element (avoids pkg_pkg_ duplication)
+	if ($type === 'package' && $element === '') {
+		$packageName = (string) ($xml->packagename ?? '');
+		if ($packageName !== '') {
+			$element = $packageName;
+		}
+	}
+
 	// Fallback element detection
 	if ($element === '') { $element = (string) ($xml->attributes()->plugin ?? ''); }
 	if ($element === '') { $element = (string) ($xml->attributes()->module ?? ''); }
@@ -164,6 +172,10 @@ function parseManifest(string $file): array
 			$element = strtolower(basename(dirname($file)));
 		}
 	}
+
+	// Strip existing type prefix to prevent duplication (e.g. pkg_mokowaas → mokowaas)
+	$element = preg_replace('/^(pkg_|com_|mod_|plg_\w+_|tpl_|lib_)/', '', $element);
+
 	if ($name === '') { $name = $element; }

 	return compact('name', 'type', 'element', 'group');