X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1c2fd8f8d8c72f190c55283d7c4199754a163d06..HEAD:/browser.plp

diff --git a/browser.plp b/browser.plp
index fbbddde..6d75d4a 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,103 +1,125 @@
 <(common.inc.plp)><:
-use 5.010;
-use utf8;
 use List::Util qw(sum max first);
+no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => 'v1.0',
+	version => '1.6',
 	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
+		web browser support compatibility usage matrix available feature
 		html html5 css css3 svg javascript js dom mobile
 		ie internet explorer firefox chrome safari webkit opera
 	'],
 	stylesheet => [qw'circus dark mono red light'],
-	data => ['browser-support.inc.pl'],
+	data => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
-$_->{verrelease} = {
-	# mark last two (future) versions as unreleased, ensure current isn't
-	map { $_->[-1] => 0, $_->[-2] => 0, $_->[-3] => undef } $_->{versions}
-} for values %{ $caniuse->{agents} };
+my $caniuse = Data('data/browser/support');
 
 my %CSTATS = (
 	'n'   => 'l1',
+	'n d' => 'l2',
+	'n x d' => 'l2 ex',
+	'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 j' => 'l2',
-	'j'   => 'l2',
 	'p'   => 'l2',
-	'p p' => 'l2',
 	'u'   => 'l0',
+	'u d' => 'l2',
 );
 my %DSTATS = (
 	u => 'unknown',
 	n => 'unsupported',
 	p => 'plugin required',
-	j => 'javascript required',
 	a => 'partial',
 	y => 'supported',
+	d => '(disabled by default)',
 	x => sub {
 		join(' ',
-			'requires prefix',
-			(map "-$_-", $caniuse->{agents}->{$_[0]}->{prefix} // ()),
+			'with prefix',
+			map {"-$_-"}
+			$caniuse->{agents}->{$_[0]}->{version_list}->{$_[1]}->{prefix}
+			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
 		);
 	},
 );
+my %PSTATS = (  # score percentage
+	y => 1,  'y x' => .9,
+	a => .5, 'a x' => .5, 'a d' => .2,
+	p => .2, 'p d' => .1,
+	n => 0,  'n d' => .2, 'n x d' => .2,
+	u => 0,
+);
 my %CSTATUS = (
 	unoff => 'l1', # unofficial
-	wd    => 'l3', # draft
-	cr    => 'l4', # candidate
-	pr    => 'l4', # proposed
+	wd    => 'l2', # draft
+	cr    => 'l3', # candidate
+	pr    => 'l3', # proposed
 	rec   => 'l5', # recommendation
-	other => 'l2', # non-w3
-	ietf  => 'l5', # standard
+	ls    => 'l4', # whatwg
+	ietf  => 'l0', # standard
+	other => 'l0', # non-w3
 );
 my %versions;
-if (my ($somerow) = values %{ $caniuse->{data} }) {
-	while (my ($browser, $row) = each %{ $somerow->{stats} }) {
-		$versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
-	}
+while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
+	$versions{$browser} = [@{ $row->{versions} }];
 }
-my @browsers = grep { $versions{$_} }
-	qw(trident gecko webkit_saf ios_saf webkit_chr android presto op_mob op_mini);
 
-print <<'';
-<p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
+my $ref = showlink('Can I use', 'https://caniuse.com/');
+$ref =~ s/(?=>)/ title="updated $_"/
+	for map { s/[\sT].*//r } $caniuse->{-date} || ();
+$ref = "Fyrd's $ref page";
+say '<p id="intro">Alternate rendition of '.$ref;
 
 my ($canihas, $usage);
+my $minusage = $get{threshold} // 1;
 given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
 	}
-	when (!/^\w+$/) {
-		printf "<p>Invalid browser usage data request: <em>%s</em>",
-			'identifier must be alphanumeric name or <q>0</q>';
+	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
+		Alert([
+			'Invalid browser usage data request',
+			'Identifier must be alphanumeric name or <q>0</q>.',
+		]);
 	}
-	$canihas = do "browser-usage-$_.inc.pl" or do {
-		printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
+	$canihas = eval { Data("data/browser/usage-$_") } or do {
+		Alert('Browser usage data not found', $@);
 		break;
 	};
 	$usage = $_;
-	my $ref = $canihas->{-source} || 'unknown';
-	$ref = sprintf '<a href="%s">%s</a>', $_, $ref for $canihas->{-url} || ();
-	$ref .= " $_" for $canihas->{-date} || ();
+	my $ref = $canihas->{-title} || 'unknown';
+	$ref = showlink($ref, $_)
+		for $canihas->{-site} || $canihas->{-source} || ();
+	$ref =~ s/(?=>)/ title="updated $_"/ 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 +128,47 @@ 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
+	@{$_} = map { [$_] } @{$_} for values %versions;
+	@browsers = sort {
+		$caniuse->{agents}->{$b}->{prefix} cmp
+		$caniuse->{agents}->{$a}->{prefix}
+			||
+		$a cmp $b
+	} keys %versions;
 }
 :>.
 </p>
@@ -126,13 +188,17 @@ $canihas ||= {
 		}
 	} @browsers
 }; # fallback hash based on release semantics
-my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas) // 1) / 100;
 
-my $usagepct = 1;  # score multiplier for 0..100 result
-# normalise usage percentage to only include shown browsers
-$usagepct = 100 / featurescore({  # yes for every possible version
-	map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
-});
+# score multiplier for percentage of all browser versions
+my $usagepct = 99.99 / sum(
+	map { $_->{-total} // values %{$_} }
+	map { $canihas->{$_} }
+	grep { !/^-/ }
+	keys %{$canihas}
+);
+
+$_->{usage} = featurescore($_->{stats}) * $usagepct
+	for values %{ $caniuse->{data} };
 
 print '<table class="mapped">';
 print '<col span="3">';  # should match first thead row
@@ -141,7 +207,7 @@ say '</colgroup><col>';
 
 my $header = join('',
 	'<tr>',
-	'<th colspan="3">feature',
+	'<th colspan="3" rowspan="2">feature',
 	(map {
 		my $name = $caniuse->{agents}->{$_}->{browser};
 		sprintf('<th colspan="%d" class="%s" title="%s">%s',
@@ -150,50 +216,67 @@ my $header = join('',
 				$_, @{ $caniuse->{agents}->{$_} }{'prefix', 'type'},
 			),
 			join(' ',
-				sprintf('%.1f%%', sum(values %{ $canihas->{$_} }) * $usagepct),
+				sprintf('%.1f%%', $canihas->{$_}->{-total} * $usagepct),
 				$name,
 			),
 			do {
-				length $name < 3 + @{ $versions{$_} }*2 ? $name
+				length $name <= (3 * @{ $versions{$_} }) ? $name
 					: $caniuse->{agents}->{$_}->{abbr};
 			},
 		)
 	} @browsers),
-	'<th>%',
+	'<th rowspan="2">%',
 );
 print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
-print '<td>' x 3;
 for my $browser (@browsers) {
-	for my $_ (@{ $versions{$browser} }) {
-		my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$_};
-		my $future = defined $release;
+	for my $span (@{ $versions{$browser} }) {
+		my $lastver = first {
+			$caniuse->{agents}->{$browser}->{version_list}->{$_}->{release_date} # stable
+		} reverse @{$span};
 		printf('<td title="%s"%s>%s',
 			join(' ',
-				sprintf('%.1f%%', $canihas->{$browser}->{$_} * $usagepct),
-				$future ? 'development' : (),
-				"version $_",
+				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{ @{$span} }) * $usagepct),
+				'version ' . showversions(@{$span}, undef),
+				(map {
+					$_ ? sprintf('(released %d)', $_/3600/24/365.25 + 1970) : '(development)'
+				} $caniuse->{agents}->{$browser}->{version_list}->{$lastver}->{release_date}),
 			),
-			$future && ' class="ex"',
-			showversions($_),
+			!defined $lastver && ' class="ex"',
+			showversions($lastver // $span->[0]),
 		);
 	}
 }
-print '<td>' x 1;
 say '</thead>';
-say '<tfoot>', $header, '</tfoot>';
+say '<tfoot>', $header;
+{
+	# prefix indicates browser family; count adjacent families
+	my (@families, %familycount);
+	for my $browser (@browsers) {
+		my $family = $caniuse->{agents}->{$browser}->{prefix};
+		push @families, $family unless $familycount{$family};
+		$familycount{$family} += @{ $versions{$browser} };
+	}
+
+	print "\n", '<tr class="cat">';
+	printf '<th colspan="%d">%s', $familycount{$_}, $_ for @families;
+}
+say '</tfoot>';
 
 sub featurescore {
 	# relative amount of support for given feature
-	state $statspts = { y=>1, 'y x'=>1, a=>.5, 'a x'=>.5, j=>.2, 'p j'=>.2, 'p p'=>.2, p=>.1 };
 	my $rank = 0;
 	if (my $row = shift) {
 		if ($canihas) {
 			while (my ($browser, $versions) = each %$row) {
 				ref $versions eq 'HASH' or next;
-				while (my ($version, $_) = each %$versions) {
-					$rank += ($canihas->{$browser}->{$version} || .001) * $statspts->{$_};
+				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;
@@ -211,12 +294,35 @@ sub featurescore {
 				}
 				splice @vers, -1, 0, @future;  # move ahead to decrease precedence
 			}
-			$rank += $statspts->{$_} * 2**($div--) for reverse @vers;
+			$rank += $PSTATS{$_} * 2**($div--) for reverse @vers;
 		}
 	}
 	return $rank;
 }
 
+sub formatnotes {
+	my @html = @_;
+	for (@html) {
+		s/\r\n?/\n/g;  # windows returns
+		s/\h* $//gmx;  # trailing whitespace
+		s/(?<= [^.\n]) $/./gmx;  # consistently end each line by a period
+		Entity($_);
+		s{  ` ([^`]*)  ` }{<code>$1</code>}gx;
+		s{ \(\K (?: \Qhttps://caniuse.com\E )? (?: /? \#feat= | / ) }{#}gx;
+		s{ \[ ([^]]*) \] \( ([^)]*) \) }{<a href="$2">$1</a>}gx;
+	}
+	return @html;
+}
+
+sub notestotitle {
+	my @notes = @_;
+	for (@notes) {
+		EscapeHTML($_);
+		s{ \[ ([^]]*) \] \( [^)]* \) }{$1}gx;  # strip link urls
+	}
+	return @notes;
+}
+
 sub saytitlecol {
 	my ($id) = @_;
 	my $row = $caniuse->{data}->{$id};
@@ -237,14 +343,18 @@ sub saytitlecol {
 		);
 	} $row->{title};
 	print '<div class=aside>';
-	s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-		Entity($row->{description}),
-		map { s/\s*\n/\n<br>/g; $_ } $row->{notes};
+	print "<p>$_</p>"
+		for formatnotes($row->{description}, $row->{notes} || ());
+	if (my %notes = %{ $row->{notes_by_num} }) {
+		say '<p>Browser-specific notes:';
+		say "<br>#$_: ", formatnotes($notes{$_}) for sort keys %notes;
+		say '</p>';
+	}
 	printf 'Resources: %s.', join(', ', map {
-		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
+		showlink($_->{title}, $_->{url})
 	} @$_) for grep { @$_ } $row->{links} // ();
 	printf '<br>Parent feature: %s.', join(', ', map {
-		sprintf '<a href="%s">%s</a>', EscapeHTML("#$_"), $caniuse->{data}->{$_}->{title}
+		showlink($caniuse->{data}->{$_}->{title}, "#$_")
 	} $_) for $row->{parent} || ();
 	print '</div>';
 }
@@ -255,7 +365,7 @@ sub saystatuscol {
 
 	for ($row->{status}) {
 		my $cell = $_ // '-';
-		$cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
+		$cell = showlink($cell, $_) for $row->{spec} // ();
 		printf '<td title="%s" class="l %s">%s',
 			$caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
 	}
@@ -263,47 +373,84 @@ 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
+		$data = {
+			map { $_ => 'n' }
+			keys %{ $caniuse->{agents}->{$browser}->{version_list} }
+		};
+	}
 
 	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 '<td class="%s" colspan="%d" title="%s">%s',
+		my $compare = (
+			!defined $ver ? undef :      # last column if nameless
+			ref $data ne 'HASH' ? '' :   # unclassified if no support hash
+			(first { defined } @{$data}{ reverse @{$ver} })  # last known version
+			// $prev                     # inherit from predecessor
+			|| 'u'                       # unsure
+		);
+		if (defined $prev and not $prev ~~ $compare) {
+			# different columns
+			my @vercover = (map { @{$_} } @span);  # accumulated conforming versions
+			for ($ver ? @{$ver} : ()) {
+				last if defined $data->{$_};  # until different
+				push @vercover, $_;  # matches from next span start
+			}
+			my $usage = sum(@{ $canihas->{$browser} }{@vercover});
+
+			# 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, $vercover[0]) : $_ }
+				 map { $DSTATS{$_} // () }
+				 map { split / /, $_ }
+				 $prev
+				),
+				'in', $caniuse->{agents}->{$browser}->{abbr},
+				showversions(@vercover, undef),
+			));
+			$title .= "\n$_" for notestotitle(@notes);
+
+			$prev .= ' #' if @notes and $prev =~ /^y/;
+			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)),
 					),
-					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 && defined $ver ? $span[-1]->[-1] : ()),
+			);
 			undef $prev;
 			@span = ();
 		}
-		push @span, $ver;
-		$prev = $ver;
+		if ($ver) {
+			my $startversion = first { defined $data->{ $ver->[$_] } }
+				reverse 0 .. $#{$ver};  # compare index
+			push @span, [ @{$ver}[ $startversion .. $#{$ver} ] ];
+		}
+		$prev = $compare;
 	}
 }
 
 sub sayusagecol {
 	my ($id) = @_;
-	print '<td>', int featurescore($caniuse->{data}->{$id}->{stats}) * $usagepct;
+	print '<td>', int $caniuse->{data}->{$id}->{usage};
 }
 
 say '<tbody>';
 for my $id (sort {
-	    featurescore($caniuse->{data}->{$b}->{stats})
-	<=> featurescore($caniuse->{data}->{$a}->{stats})
+	$caniuse->{data}->{$b}->{usage} <=> $caniuse->{data}->{$a}->{usage}
 } keys %{ $caniuse->{data} }) {
 	$caniuse->{data}->{$id}->{stats} or next;  # skip metadata [summary]
 	printf '<tr id="%s">', $id;
@@ -318,19 +465,16 @@ say '</table>';
 
 sub paddedver {
 	# normalised version number comparable as string (cmp)
-	shift =~ /(?:.*-|^)(\d*)(.*)/;
+	$_[0] =~ m/(?:.*-|^)(\d*)(.*)/;
 	# matched (major)(.minor) of last value in range (a-B)
-	return sprintf('%02d', $1 || 0) . $2;
+	return sprintf('%03d', length $1 ? $1 : 999) . $2;
 }
 
 sub showversions {
-	my @span = ($_[0], @_>1 ? $_[-1] : ());
-	s/-.*// for $span[0];
-	for (@span) {
-		s/^\./0./;
-		s/x$/.*/;
-		s/.*-//;
-	}
+	# title to describe minumum version and optional maximum for multiple cells
+	my @span = (map { split /-/ } grep { defined } @_);
+	return $span[0] =~ s/\.0\z//r if @_ <= 1;
+	splice @span, 1, -1;
 	return join('‒', @span);
 }
 
@@ -340,8 +484,9 @@ 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">external (js/plugin)
+	<td class="X l2">optional
 	<td class="X l1">missing
 	<td class="X l0">unknown
 	<td class="X ex">prefixed
@@ -370,10 +515,14 @@ sub showversions {
 			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
 		<li><strong>usage</strong> source is
 			<:= !defined $get{usage} && 'default ' :><:= defined $usage ? "<em>$usage</em>" : 'not included (<em>0</em>)' :>
+		<li>usage <strong>threshold</strong> is
+			<:= defined $get{threshold} && 'changed to ' :><em><:= $minusage :>%</em>
 		</ul>
 	</div>
 </div>
 
 <script type="text/javascript" src="/searchlocal.js"></script>
-<script type="text/javascript"> prependsearch(document.getElementById('intro')) </script>
+<script type="text/javascript"><!--
+	prependsearch(document.getElementById('intro'));
+//--></script>