index: release v1.18 with only altgr index linked

[sheet.git] / tools / mkcaniuse

diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index adb437c91a7fd6c3791406a9f15b54545d7e7d67..5ab3cbaf048ed1c60ac0ad6d6fa590bbe4f00fce 100755 (executable)
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -29,16 +29,22 @@ delete $data->{eras};
 for (values %{ $data->{data} }) {
        delete @{$_}{qw[ usage_perc_a usage_perc_y ]};
 }
-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};
+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};
+
+       # 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};
        }
 }
 
@@ -50,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