X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/1c575b2b48f7b4769d1ce38d81dc200a4b999ef6..HEAD:/tools/mkcaniuse

diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index b162c2f..5ab3cba 100755
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -29,24 +29,22 @@ delete $data->{eras};
 for (values %{ $data->{data} }) {
 	delete @{$_}{qw[ usage_perc_a usage_perc_y ]};
 }
-for (values %{ $data->{agents} }) {
-	delete $_->{usage_global};
-	for (@{ $_->{version_list} }) {
-		delete $_->{era};
-		delete $_->{prefix} unless $_->{prefix};
+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};
 
-while (my ($browser, $target) = each %BROWSERJOIN) {
-	my $agent1 = delete $data->{agents}->{$browser} or next;
-	my $agent2 =        $data->{agents}->{$target}  or next;
-	push @{ $agent2->{version_list} }, @{ $agent1->{version_list} };
-	$agent2->{browser} = sprintf '%s (former %s)',
-		$agent1->{browser}, $agent2->{browser};
+	# prefer deprecated name if newer is convoluted (Chr/And.)
+	$agent->{abbr} = $amend->{abbr} if $agent->{abbr} =~ m{/};
 
 	for (values %{ $data->{data} }) {
-		my $stats = delete $_->{stats}->{$browser} or next;
-		$_ = { %{$_}, %{$stats} } for $_->{stats}->{$target};
+		my $stats = delete $_->{stats}->{$alias} or next;
+		$_ = { %{$_}, %{$stats} } for $_->{stats}->{$browser};
 	}
 }
 
@@ -57,8 +55,19 @@ 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
+	my %version_lookup;
+	for (@{ $row->{version_list} }) {
+		delete $_->{era};
+		delete $_->{prefix} unless $_->{prefix};
+		$version_lookup{ delete $_->{version} } = $_;
+	}
+	$row->{version_list} = \%version_lookup;
+
 	# omit identical values from subsequent versions
 	for my $feature (values %{ $data->{data} }) {
 		my $cmp;  # same value to be omitted