X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/1c575b2b48f7b4769d1ce38d81dc200a4b999ef6..18402f44dfbfb0f3ab6f6069e51ac78c7e17707a:/browser.plp

diff --git a/browser.plp b/browser.plp
index b6b501e..a100bcb 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,10 +1,9 @@
 <(common.inc.plp)><:
 use List::Util qw(sum max first);
-no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => '1.5',
+	version => '1.6',
 	description => [
 		"Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
 		"comparing support and usage share for all popular browser versions.",
@@ -14,20 +13,12 @@ Html({
 		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 => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'data/browser/support.inc.pl' or die $@ || $!;
-$_->{verrelease} = {
-	# mark last three (future) versions as unreleased, ensure current isn't
-	map {
-		$_->[-1] => 0, $_->[-2] => 0, $_->[-3] => 0,
-		$_->[-4] => undef,
-	} $_->{versions}
-} for values %{ $caniuse->{agents} };
+my $caniuse = Data('data/browser/support');
 
 my %CSTATS = (
 	'n'   => 'l1',
@@ -56,7 +47,7 @@ my %DSTATS = (
 		join(' ',
 			'with prefix',
 			map {"-$_-"}
-			($caniuse->{agents}->{$_[0]}->{prefix_exceptions} // {})->{$_[1]}
+			$caniuse->{agents}->{$_[0]}->{version_list}->{$_[1]}->{prefix}
 			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
 		);
 	},
@@ -80,10 +71,7 @@ my %CSTATUS = (
 );
 my %versions;
 while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
-	$versions{$browser} = [
-		sort { paddedver($a) cmp paddedver($b) } grep { defined }
-		@{ $row->{versions} }
-	];
+	$versions{$browser} = [@{ $row->{versions} }];
 }
 
 my $ref = showlink('Can I use', 'https://caniuse.com/');
@@ -94,19 +82,19 @@ say '<p id="intro">Alternate rendition of '.$ref;
 
 my ($canihas, $usage);
 my $minusage = $get{threshold} // 1;
-given ($get{usage} // 'wm') {
-	when (!$_) {
-		# none
-	}
-	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
+for ($get{usage} // 'wm') {
+	$_ or next;  # none
+	unless (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>.',
 		]);
+		next;
 	}
-	$canihas = do "data/browser/usage-$_.inc.pl" or do {
-		Alert('Browser usage data not found', $@ || $!);
-		break;
+
+	$canihas = eval { Data("data/browser/usage-$_") } or do {
+		Alert('Browser usage data not found', ref $@ ? @{$@} : $@);
+		next;
 	};
 	$usage = $_;
 	my $ref = $canihas->{-title} || 'unknown';
@@ -243,13 +231,15 @@ print "\n<tr>";
 for my $browser (@browsers) {
 	for my $span (@{ $versions{$browser} }) {
 		my $lastver = first {
-			!defined $caniuse->{agents}->{$browser}->{verrelease}->{$_} # stable
+			$caniuse->{agents}->{$browser}->{version_list}->{$_}->{release_date} # stable
 		} reverse @{$span};
 		printf('<td title="%s"%s>%s',
 			join(' ',
 				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{ @{$span} }) * $usagepct),
 				'version ' . showversions(@{$span}, undef),
-				$span->[-1] eq $lastver ? () : '(development)',
+				(map {
+					$_ ? sprintf('(released %d)', $_/3600/24/365.25 + 1970) : '(development)'
+				} $caniuse->{agents}->{$browser}->{version_list}->{$lastver}->{release_date}),
 			),
 			!defined $lastver && ' class="ex"',
 			showversions($lastver // $span->[0]),
@@ -316,6 +306,7 @@ sub formatnotes {
 		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;
@@ -384,9 +375,9 @@ sub saybrowsercols {
 	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
+			map { $_ => 'n' }
+			keys %{ $caniuse->{agents}->{$browser}->{version_list} }
 		};
 	}
 
@@ -399,7 +390,7 @@ sub saybrowsercols {
 			// $prev                     # inherit from predecessor
 			|| 'u'                       # unsure
 		);
-		if (defined $prev and not $prev ~~ $compare) {
+		if (defined $prev and not (defined $compare and $prev eq $compare)) {
 			# different columns
 			my @vercover = (map { @{$_} } @span);  # accumulated conforming versions
 			for ($ver ? @{$ver} : ()) {
@@ -474,7 +465,7 @@ sub paddedver {
 	# normalised version number comparable as string (cmp)
 	$_[0] =~ m/(?:.*-|^)(\d*)(.*)/;
 	# matched (major)(.minor) of last value in range (a-B)
-	return sprintf('%02d', length $1 ? $1 : 99) . $2;
+	return sprintf('%03d', length $1 ? $1 : 999) . $2;
 }
 
 sub showversions {