browser: cleanup duplicate support determination

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index 19011ab21d91ae8b601244de11f0f2ce58a32ed4..863f806f1e6990eeaf15f4bdb1af626c26c840f3 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -6,8 +6,10 @@ use List::Util qw(sum max first);
 Html({
        title => 'browser compatibility cheat sheet',
        version => 'v1.0',
-       description =>
-               "caniuse.",
+       description => [
+               "Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
+               "comparing support and usage share for all popular browser versions.",
+       ],
        keywords => [qw'
                web browser support compatibility usage available feature
                html html5 css css3 svg javascript js dom mobile
@@ -86,8 +88,9 @@ given ($get{usage} // 'wm') {
                break;
        };
        $usage = $_;
-       my $ref = $canihas->{-source} || 'unknown';
-       $ref = sprintf '<a href="%s">%s</a>', $_, $ref for $canihas->{-url} || ();
+       my $ref = $canihas->{-title} || 'unknown';
+       $ref = sprintf '<a href="%s">%s</a>', $_, $ref
+               for $canihas->{-site} || $canihas->{-source} || ();
        $ref .= " $_" for $canihas->{-date} || ();
        print "\nwith $ref browser usage statistics";
 }
@@ -99,9 +102,10 @@ if ($usage) {
                $row->{$_} //= undef for @$verlist;  # ensure stable keys during iteration
                while (my ($version, $usage) = each %$row) {
                        next if defined $supported{$version};
-                       $_ = paddedver($_) for $version;
-                       my $next = first { paddedver($_) ge $version } @$verlist; # or next
+                       my $next = first { paddedver($_) ge paddedver($version) } @$verlist
+                               or warn("No fallback found for $browser v$version; $usage% ignored"), next;
                        $row->{$next} += $usage;
+                       $row->{$version} = 0;  # balance browser total
                }
        }
 }
@@ -163,16 +167,19 @@ print '<thead>', $header;
 print "\n<tr>";
 print '<td>' x 3;
 for my $browser (@browsers) {
-       printf('<td title="%s"%s>%s',
-               join(' ',
-                       sprintf('%.1f%%', $canihas->{$browser}->{$_} * $usagepct),
-                       "version $_",
-               ),
-               (map {
-                       defined $_ && !$_ && ' class="ex"'
-               } $caniuse->{agents}->{$browser}->{verrelease}->{$_}),
-               showversions($_),
-       ) for @{ $versions{$browser} };
+       for my $_ (@{ $versions{$browser} }) {
+               my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$_};
+               my $future = defined $release;
+               printf('<td title="%s"%s>%s',
+                       join(' ',
+                               sprintf('%.1f%%', $canihas->{$browser}->{$_} * $usagepct),
+                               $future ? 'development' : (),
+                               "version $_",
+                       ),
+                       $future && ' class="ex"',
+                       showversions($_),
+               );
+       }
 }
 print '<td>' x 1;
 say '</thead>';
@@ -232,10 +239,14 @@ sub saytitlecol {
        } $row->{title};
        print '<div class=aside>';
        s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-               Entity($row->{description}), formathtml($row->{notes});  # sic
+               Entity($row->{description}),
+               map { s/\s*\n/\n<br>/g; $_ } $row->{notes};
        printf 'Resources: %s.', join(', ', map {
                sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
        } @$_) for grep { @$_ } $row->{links} // ();
+       printf '<br>Parent feature: %s.', join(', ', map {
+               sprintf '<a href="%s">%s</a>', EscapeHTML("#$_"), $caniuse->{data}->{$_}->{title}
+       } $_) for $row->{parent} || ();
        print '</div>';
 }
 
@@ -257,12 +268,17 @@ sub saybrowsercols {
 
        my ($prev, @span);
        for my $ver (@{ $versions{$browser} }, undef) {
-               unless (!defined $prev
-               or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) {
+               my $compare = (
+                       !defined $ver ? undef :      # last column if nameless
+                       ref $data ne 'HASH' ? 'u' :  # unsupported if no support hash
+                       $data->{$ver}                # known
+                       || 'u'                       # unsure unless oldest is unsupported
+               );
+               unless (!defined $prev or $prev ~~ $compare) {
                        my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
                        printf '<td class="%s" colspan="%d" title="%s">%s',
                                join(' ',
-                                       X => $CSTATS{ ref $data eq 'HASH' && $data->{$prev} || 'u' },
+                                       X => $CSTATS{$prev},
                                        !$usage ? ('p0') : ('p',
                                                sprintf('p%01d', $usage * ($usagepct - .0001) / 10),
                                                sprintf('p%02d', $usage * ($usagepct - .0001)),
@@ -274,14 +290,14 @@ sub saybrowsercols {
                                        map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
                                        map { $DSTATS{$_} // () }
                                        map { split / /, $_ }
-                                       ref $data eq 'HASH' && $data->{$prev} || 'u'
+                                       $prev
                                )),
                                showversions(@span),
                        undef $prev;
                        @span = ();
                }
                push @span, $ver;
-               $prev = $ver;
+               $prev = $compare;
        }
 }
 
@@ -306,16 +322,6 @@ for my $id (sort {
 say '</tbody>';
 say '</table>';
 
-sub formathtml {
-       my $ref = defined wantarray ? [@_] : \@_;
-       for (@$ref) {
-               s/& (?!\w)/&amp;/gx;
-               s/< \s/&lt;/gx;
-               s/\n\K\n/<br>/g;
-       }
-       return @$ref;
-}
-
 sub paddedver {
        # normalised version number comparable as string (cmp)
        shift =~ /(?:.*-|^)(\d*)(.*)/;
@@ -325,10 +331,11 @@ sub paddedver {
 
 sub showversions {
        my @span = ($_[0], @_>1 ? $_[-1] : ());
+       s/-.*// for $span[0];
        for (@span) {
                s/^\./0./;
                s/x$/.*/;
-               s/-.*//;
+               s/.*-//;
        }
        return join('‒', @span);
 }