From fe77cb435fa873779cdf74ab486f319f2b2d484a Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 15 Nov 2021 20:09:42 +0100
Subject: [PATCH] browser: determine development status from version release

Instead of assuming special status of last three version columns,
convert version metadata into a lookup hash so it can be used.
---
 browser.plp     | 17 ++++++-----------
 tools/mkcaniuse | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/browser.plp b/browser.plp
index b6b501e..9278c88 100644
--- a/browser.plp
+++ b/browser.plp
@@ -21,13 +21,6 @@ Html({
 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 %CSTATS = (
 	'n'   => 'l1',
@@ -243,13 +236,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 {
+					$_ ? () : '(development)'
+				} $caniuse->{agents}->{$browser}->{version_list}->{$lastver}->{release_date}),
 			),
 			!defined $lastver && ' class="ex"',
 			showversions($lastver // $span->[0]),
@@ -384,9 +379,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} }
 		};
 	}
 
diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index b162c2f..adb437c 100755
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -29,14 +29,6 @@ delete $data->{eras};
 for (values %{ $data->{data} }) {
 	delete @{$_}{qw[ usage_perc_a usage_perc_y ]};
 }
-for (values %{ $data->{agents} }) {
-	delete $_->{usage_global};
-	for (@{ $_->{version_list} }) {
-		delete $_->{era};
-		delete $_->{prefix} unless $_->{prefix};
-	}
-}
-
 while (my ($browser, $target) = each %BROWSERJOIN) {
 	my $agent1 = delete $data->{agents}->{$browser} or next;
 	my $agent2 =        $data->{agents}->{$target}  or next;
@@ -57,8 +49,18 @@ for my $feature (values %{ $data->{data} }) {
 }
 
 while (my ($agent, $row) = each %{ $data->{agents} }) {
+	delete $row->{usage_global};
 	$row->{versions} = [ uniq map { $_->{version} } @{ $row->{version_list} } ];
 
+	# convert metadata list into (cleaned) lookup table
+	my %version_lookup;
+	for (@{ $row->{version_list} }) {
+		delete $_->{era};
+		delete $_->{prefix} unless $_->{prefix};
+		$version_lookup{ delete $_->{version} } = $_;
+	}
+	$row->{version_list} = \%version_lookup;
+
 	# omit identical values from subsequent versions
 	for my $feature (values %{ $data->{data} }) {
 		my $cmp;  # same value to be omitted
-- 
2.30.0