browser: store only changed values in version support

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index a3fa063056dd96a8c4886095b86ba242676f1a33..b6b501e5be17a44efa70275cd939f8fa9b650e03 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -36,11 +36,14 @@ my %CSTATS = (
        'p d' => 'l2',
        'a d' => 'l2',
        'y'   => 'l5',
+       'y #' => 'l4',
        'y x' => 'l5 ex',
+       'y x #' => 'l4 ex',
        'a'   => 'l3',
        'a x' => 'l3 ex',
        'p'   => 'l2',
        'u'   => 'l0',
+       'u d' => 'l2',
 );
 my %DSTATS = (
        u => 'unknown',
@@ -198,7 +201,10 @@ $canihas ||= {
 
 # score multiplier for percentage of all browser versions
 my $usagepct = 99.99 / sum(
-       map { $_->{-total} // values %{$_} } values %{$canihas}
+       map { $_->{-total} // values %{$_} }
+       map { $canihas->{$_} }
+       grep { !/^-/ }
+       keys %{$canihas}
 );
 
 $_->{usage} = featurescore($_->{stats}) * $usagepct
@@ -273,9 +279,12 @@ sub featurescore {
                if ($canihas) {
                        while (my ($browser, $versions) = each %$row) {
                                ref $versions eq 'HASH' or next;
-                               while (my ($version, $status) = each %$versions) {
+                               my $prev;
+                               for my $version (@{ $caniuse->{agents}->{$browser}->{versions} }) {
+                                       my $status = $versions->{$version} // $prev;
                                        $status =~ s/\h\#\d+//g;
                                        $rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$status};
+                                       $prev = $status;
                                }
                        }
                        return $rank;
@@ -386,15 +395,15 @@ sub saybrowsercols {
                my $compare = (
                        !defined $ver ? undef :      # last column if nameless
                        ref $data ne 'HASH' ? '' :   # unclassified if no support hash
-                       $data->{ $ver->[-1] } // $prev  # known or inherit from predecessor
-                       // (grep { defined } @{$data}{ map { $_->[0] } @{ $versions{$browser} } })[0]
-                          ~~ 'n' && 'n'             # first known version is unsupported
+                       (first { defined } @{$data}{ reverse @{$ver} })  # last known version
+                       // $prev                     # inherit from predecessor
                        || 'u'                       # unsure
                );
-               unless (!defined $prev or $prev ~~ $compare) {
-                       my @vercover = (map { @{$_} } @span);
+               if (defined $prev and not $prev ~~ $compare) {
+                       # different columns
+                       my @vercover = (map { @{$_} } @span);  # accumulated conforming versions
                        for ($ver ? @{$ver} : ()) {
-                               $data->{$_} eq $data->{$vercover[-1]} or last;
+                               last if defined $data->{$_};  # until different
                                push @vercover, $_;  # matches from next span start
                        }
                        my $usage = sum(@{ $canihas->{$browser} }{@vercover});
@@ -416,6 +425,7 @@ sub saybrowsercols {
                        ));
                        $title .= "\n$_" for notestotitle(@notes);
 
+                       $prev .= ' #' if @notes and $prev =~ /^y/;
                        printf('<td class="%s" colspan="%d" title="%s">%s',
                                join(' ',
                                        X => $CSTATS{$prev},
@@ -431,7 +441,11 @@ sub saybrowsercols {
                        undef $prev;
                        @span = ();
                }
-               push @span, $ver && [ grep { $data->{ $_ } eq $data->{ $ver->[-1] } } @{$ver} ];
+               if ($ver) {
+                       my $startversion = first { defined $data->{ $ver->[$_] } }
+                               reverse 0 .. $#{$ver};  # compare index
+                       push @span, [ @{$ver}[ $startversion .. $#{$ver} ] ];
+               }
                $prev = $compare;
        }
 }
@@ -477,6 +491,7 @@ sub showversions {
 <div class="legend">
        <table class="glyphs"><tr>
        <td class="X l5">supported
+       <td class="X l4">annotated
        <td class="X l3">partial
        <td class="X l2">optional
        <td class="X l1">missing