Alternate rendition of Fyrd's when can I use... page my ($canihas, $usage); +my $minusage = $get{threshold} // .5; given ($get{usage} // 'wm') { when (!$_) { # none } - when (!/^\w+$/) { + when (!/^[a-z][\w-]+$/) { printf "
Invalid browser usage data request: %s",
'identifier must be alphanumeric name or 0
';
}
@@ -88,16 +95,27 @@ given ($get{usage} // 'wm') {
break;
};
$usage = $_;
- my $ref = $canihas->{-source} || 'unknown';
- $ref = sprintf '%s', $_, $ref for $canihas->{-url} || ();
+ my $ref = $canihas->{-title} || 'unknown';
+ $ref = sprintf '%s', $_, $ref
+ for $canihas->{-site} || $canihas->{-source} || ();
$ref .= " $_" for $canihas->{-date} || ();
print "\nwith $ref browser usage statistics";
}
-if ($usage) {
- # first() does not work inside given >:(
- while (my ($browser, $row) = each %$canihas) {
+
+my @browsers;
+if ($usage) { # first() does not work inside given >:(
+ # adapt version usage to actual support data
+ my %engineuse; # prefix => usage sum
+ for my $browser (keys %versions) {
+ my $row = $canihas->{$browser} // {};
my $verlist = $versions{$browser} or next;
+ if ($minusage and sum(values %$row) < $minusage) {
+ delete $versions{$browser};
+ next;
+ }
my %supported = map { $_ => 1 } @$verlist;
+
+ # cascade unknown versions
$row->{$_} //= undef for @$verlist; # ensure stable keys during iteration
while (my ($version, $usage) = each %$row) {
next if defined $supported{$version};
@@ -106,7 +124,46 @@ if ($usage) {
$row->{$next} += $usage;
$row->{$version} = 0; # balance browser total
}
+
+ # build row list for each version
+ if ($minusage) {
+ my @vershown; # $verlist replacement
+ my ($rowusage, @verrow) = (0); # replacement row tracking
+ for (@$verlist) {
+ push @verrow, $_; # queue each version
+ if (($rowusage += $row->{$_}) >= $minusage) {
+ push @vershown, [@verrow]; # add row
+ ($rowusage, @verrow) = (0); # reset row tracking
+ }
+ }
+ push @vershown, \@verrow if @verrow; # always add latest
+ @$verlist = @vershown;
+ }
+ else {
+ @$verlist = map { [$_] } @$verlist;
+ }
+
+ # reusable aggregates (grouped by prefix (engine) and browser)
+ $engineuse{ $caniuse->{agents}->{$browser}->{prefix} } +=
+ $row->{-total} = sum(values %$row);
}
+
+ # order browser columns by usage grouped by engine
+ @browsers = sort {
+ $engineuse{ $caniuse->{agents}->{$b}->{prefix} } <=>
+ $engineuse{ $caniuse->{agents}->{$a}->{prefix} }
+ ||
+ $canihas->{$b}->{-total} <=> $canihas->{$a}->{-total}
+ } keys %versions;
+}
+else {
+ # order browser columns by name grouped by engine
+ @browsers = sort {
+ $caniuse->{agents}->{$b}->{prefix} cmp
+ $caniuse->{agents}->{$a}->{prefix}
+ ||
+ $a cmp $b
+ } keys %versions;
}
:>.
| ' x 3; for my $browser (@browsers) { - for my $_ (@{ $versions{$browser} }) { - my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$_}; + for (@{ $versions{$browser} }) { + my $lastver = $_->[-1]; + my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$lastver}; my $future = defined $release; printf(' | %s', join(' ', - sprintf('%.1f%%', $canihas->{$browser}->{$_} * $usagepct), + sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct), $future ? 'development' : (), - "version $_", + 'version ' . join(', ', @{$_}), ), $future && ' class="ex"', - showversions($_), + showversions($lastver), ); } } @@ -263,16 +321,46 @@ sub saystatuscol { sub saybrowsercols { my ($id, $browser) = @_; - my $data = $caniuse->{data}->{$id}->{stats}->{$browser}; + my $feature = $caniuse->{data}->{$id}; + my $data = $feature->{stats}->{$browser}; + if (ref $data eq 'ARRAY') { + # special case for unsupported + my $release = $caniuse->{agents}->{$browser}->{verrelease}; + $data = { + map { $_ => defined $release->{$_} ? 'u' : 'n' } keys %$release + }; + } my ($prev, @span); for my $ver (@{ $versions{$browser} }, undef) { - unless (!defined $prev - or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) { - my $usage = sum(map { $canihas->{$browser}->{$_} } @span); - printf ' | %s', + 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 + || 'u' # unsure + ); + unless (!defined $prev or $prev ~~ $compare) { + my $usage = sum(@{ $canihas->{$browser} }{ map { @{$_} } @span }); + + # strip #\d note references from support class + my @notes; + push @notes, $feature->{notes_by_num}->{$1} + while $prev =~ s/\h \# (\d+) \b//x; + + # prepare version hover details + my $title = sprintf('%.1f%% %s', $usage * $usagepct, join(', ', + map { ref $_ eq 'CODE' ? $_->($browser) : $_ } + map { $DSTATS{$_} // () } + map { split / /, $_ } + $prev + )); + $title .= "\n".EscapeHTML($_) for @notes; + + printf(' | %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)),
@@ -280,18 +368,14 @@ sub saybrowsercols {
sprintf('pp%02d', $usage / $usagemax),
),
scalar @span,
- sprintf('%.1f%% %s', $usage * $usagepct, join(', ',
- map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
- map { $DSTATS{$_} // () }
- map { split / /, $_ }
- ref $data eq 'HASH' && $data->{$prev} || 'u'
- )),
- showversions(@span),
+ $title,
+ showversions($span[0]->[0], @span > 1 ? ($span[-1]->[-1]) : ()),
+ );
undef $prev;
@span = ();
}
- push @span, $ver;
- $prev = $ver;
+ push @span, $ver && [ grep { $data->{ $_ } eq $data->{ $ver->[-1] } } @{$ver} ];
+ $prev = $compare;
}
}
@@ -320,7 +404,7 @@ sub paddedver {
# normalised version number comparable as string (cmp)
shift =~ /(?:.*-|^)(\d*)(.*)/;
# matched (major)(.minor) of last value in range (a-B)
- return sprintf('%02d', $1 || 0) . $2;
+ return sprintf('%02d', $1 || 99) . $2;
}
sub showversions {
@@ -341,7 +425,7 @@ sub showversions {
|