From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 15 Nov 2021 20:27:24 +0000 (+0100)
Subject: browser: retain prefix of merged agents
X-Git-Tag: v1.13~81
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/f42145cdf77de3602378c70f18545703783122c5

browser: retain prefix of merged agents
---

diff --git a/browser.plp b/browser.plp
index 9278c88..d3b4596 100644
--- a/browser.plp
+++ b/browser.plp
@@ -49,7 +49,7 @@ my %DSTATS = (
 		join(' ',
 			'with prefix',
 			map {"-$_-"}
-			($caniuse->{agents}->{$_[0]}->{prefix_exceptions} // {})->{$_[1]}
+			$caniuse->{agents}->{$_[0]}->{version_list}->{$_[1]}->{prefix}
 			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
 		);
 	},
diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index 8378d2f..5ab3cba 100755
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -32,6 +32,9 @@ for (values %{ $data->{data} }) {
 while (my ($browser, $alias) = each %BROWSERJOIN) {
 	my $agent =        $data->{agents}->{$browser} or next;
 	my $amend = delete $data->{agents}->{$alias}   or next;
+	unless ($agent->{prefix} eq $amend->{prefix}) {
+		$_->{prefix} ||= $amend->{prefix} for @{ $amend->{version_list} };
+	}
 	unshift @{ $agent->{version_list} }, @{ $amend->{version_list} };
 	$agent->{browser} = sprintf '%s (former %s)',
 		$agent->{browser}, $amend->{browser};
@@ -53,6 +56,7 @@ for my $feature (values %{ $data->{data} }) {
 
 while (my ($agent, $row) = each %{ $data->{agents} }) {
 	delete $row->{usage_global};
+	delete $row->{prefix_exceptions};  # duplicate of version_list->prefix
 	$row->{versions} = [ uniq map { $_->{version} } @{ $row->{version_list} } ];
 
 	# convert metadata list into (cleaned) lookup table