Expand versions returned by getAllVersions(), fixes refresh-downstream bug (#30)

* getAllVersions() now includes 'beta' and 'nightly' versions and pre 2015 versions which are marked as "pre_baseline".  The "supports" value is omitted for versions that don't support Widely or Newly.
* Fixes version comparison issues in refresh-downstream.ts

Author: tonypconway

package-lock.json

@@ -20,14 +20,12 @@
     "refresh-static": "npx tsx scripts/refresh-static.ts"
   },
   "license": "Apache-2.0",
-  "dependencies": {
-    "@mdn/browser-compat-data": "^6.0.9",
-    "web-features": "^2.34.1"
-  },
   "devDependencies": {
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.17",
     "prettier": "^3.5.3",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "@mdn/browser-compat-data": "^6.0.13",
+    "web-features": "^2.34.2"
   },
   "repository": "git+https://github.com/web-platform-dx/baseline-browser-mapping.git"
 }

package.json

@@ -31,6 +31,10 @@ const compareVersions = (
   incomingVersionString: string,
   previousVersionString: string,
 ): number => {
+  if (incomingVersionString === previousVersionString) {
+    return 0;
+  }
+
   let [incomingVersionStringMajor, incomingVersionStringMinor] =
     incomingVersionString.split(".");
   let [previousVersionStringMajor, previousVersionStringMinor] =
@@ -46,22 +50,24 @@ const compareVersions = (
     );
   }
 
+  if (
+    parseInt(incomingVersionStringMajor) > parseInt(previousVersionStringMajor)
+  ) {
+    return 1;
+  }
+
   if (incomingVersionStringMinor) {
     if (
-      parseInt(incomingVersionStringMajor) >=
+      parseInt(incomingVersionStringMajor) ==
         parseInt(previousVersionStringMajor) &&
       (!previousVersionStringMinor ||
         parseInt(incomingVersionStringMinor) >
           parseInt(previousVersionStringMinor))
     ) {
       return 1;
     }
-  } else {
-    if (incomingVersionStringMajor > previousVersionStringMajor) {
-      return 1;
-    }
   }
-  return 0;
+  return -1;
 };
 
 const findLatestVersion = (releases: {
@@ -78,7 +84,7 @@ const handleUas = (
   let somethingChanged = false;
 
   const existingData: DownstreamBrowsersData = JSON.parse(
-    readFileSync(process.cwd() + "/src/data/downstream-browsers.json", {
+    readFileSync(process.cwd() + "/static/downstream-browsers.json", {
       encoding: "utf8",
     }),
   );
@@ -130,9 +136,9 @@ const handleUas = (
             compareVersions(
               browserVersion,
               browser.latestExistingVersion?.[0] ?? "",
-            ) &&
-            parseFloat(chromiumVersion) >=
-              parseFloat(
+            ) === 1 &&
+            parseInt(chromiumVersion) >=
+              parseInt(
                 browser.latestExistingVersion?.[1].engine_version ?? "",
               ) &&
             !Object.keys(existingData.browsers[browserName].releases).includes(
@@ -193,25 +199,31 @@ if (process.argv.length === 2) {
       res.on("end", () => {
         latestUas = JSON.parse(Buffer.concat(output).toString());
         let [willWrite, fileOutput] = handleUas(latestUas);
+        Object.keys(fileOutput.browsers).forEach((browserName) => {
+          const releases = fileOutput.browsers[browserName].releases;
+          const sortedReleases = Object.entries(releases)
+            .sort((a, b) => compareVersions(a[0], b[0]))
+            .reduce(
+              (acc, [version, release]) => {
+                acc[version] = release;
+                return acc;
+              },
+              {} as { [version: string]: BrowserRelease },
+            );
+          fileOutput.browsers[browserName].releases = sortedReleases;
+        });
         if (willWrite) {
           fileOutput.lastUpdated = new Date().toISOString();
+          writeFileSync(
+            process.cwd() + "/static/downstream-browsers.json",
+            JSON.stringify(fileOutput, null, 2),
+            { flag: "w" },
+          );
           writeFileSync(
             process.cwd() + "/src/data/downstream-browsers.json",
             JSON.stringify(fileOutput, null, 2),
             { flag: "w" },
           );
-
-          // let packageJson = JSON.parse(
-          //   readFileSync(process.cwd() + "/package.json", { encoding: "utf8" }),
-          // );
-          // let currentVersion = packageJson.version.split(".");
-          // currentVersion[2]++;
-          // packageJson.version = currentVersion.join(".");
-          // writeFileSync(
-          //   process.cwd() + "/package.json",
-          //   JSON.stringify(packageJson, null, 2),
-          //   { encoding: "utf8" },
-          // );
         } else {
           console.log("no updates at this time");
         }

scripts/refresh-downstream.ts

@@ -652,6 +652,24 @@
           "engine_version": "130",
           "status": "unknown",
           "release_date": "2024-11-30"
+        },
+        "25.2": {
+          "engine": "Blink",
+          "engine_version": "132",
+          "status": "unknown",
+          "release_date": "2025-04-24"
+        },
+        "25.3": {
+          "engine": "Blink",
+          "engine_version": "132",
+          "status": "unknown",
+          "release_date": "2025-04-23"
+        },
+        "25.4": {
+          "engine": "Blink",
+          "engine_version": "134",
+          "status": "unknown",
+          "release_date": "2025-04-23"
         }
       }
     },
@@ -1504,5 +1522,5 @@
       }
     }
   },
-  "lastUpdated": "2025-04-09T14:12:33.205Z"
+  "lastUpdated": "2025-04-30T13:52:05.731Z"
 }

src/data/downstream-browsers.json

@@ -47,7 +47,7 @@ type BrowserVersion = {
 };
 
 interface AllBrowsersBrowserVersion extends BrowserVersion {
-  year: number;
+  year: number | string;
   supports?: string;
   wa_compatible?: boolean;
 }
@@ -96,7 +96,15 @@ const downstreamBrowserData: [string, Browser][] = [
   ][]),
 ];
 
-const acceptableStatuses: string[] = ["current", "esr", "retired", "unknown"];
+const acceptableStatuses: string[] = [
+  "current",
+  "esr",
+  "retired",
+  "unknown",
+  "beta",
+  "nightly",
+];
+let suppressPre2015Warning: boolean = false;
 
 const stripLTEPrefix = (str: string): string => {
   if (!str) {
@@ -251,9 +259,17 @@ const getCoreVersionsByDate = (
   date: Date,
   listAllCompatibleVersions: boolean = false,
 ): BrowserVersion[] => {
-  if (date.getFullYear() < 2016) {
+  if (date.getFullYear() < 2015 && !suppressPre2015Warning) {
+    console.warn(
+      new Error(
+        "There are no browser versions compatible with Baseline before 2015.  You may receive unexpected results.",
+      ),
+    );
+  }
+
+  if (date.getFullYear() < 2002) {
     throw new Error(
-      "There are no browser versions compatible with Baseline before 2016",
+      "None of the browsers in the core set were released before 2002.  Please use a date after 2002.",
     );
   }
 
@@ -371,7 +387,7 @@ type Options = {
    */
   widelyAvailableOnDate?: string | number;
   /**
-   * Pass a year between 2016 and the current year to get browser versions compatible with all
+   * Pass a year between 2015 and the current year to get browser versions compatible with all
    * Newly Available features as of the end of the year specified.
    * > NOTE: cannot be used with `widelyAvailableOnDate`.
    */
@@ -466,6 +482,8 @@ type AllVersionsOptions = {
 export function getAllVersions(
   userOptions?: AllVersionsOptions,
 ): AllBrowsersBrowserVersion[] | NestedBrowserVersions | string {
+  suppressPre2015Warning = true;
+
   let incomingOptions = userOptions ?? {};
 
   let options: AllVersionsOptions = {
@@ -477,7 +495,7 @@ export function getAllVersions(
 
   let nextYear = new Date().getFullYear() + 1;
 
-  const yearArray = [...Array(nextYear).keys()].slice(2016);
+  const yearArray = [...Array(nextYear).keys()].slice(2002);
   const yearMinimumVersions: YearVersions = {};
   yearArray.forEach((year: number) => {
     yearMinimumVersions[year] = {};
@@ -505,7 +523,7 @@ export function getAllVersions(
   });
 
   const allVersions = getCompatibleVersions({
-    targetYear: 2016,
+    targetYear: 2002,
     listAllCompatibleVersions: true,
   });
 
@@ -545,17 +563,12 @@ export function getAllVersions(
 
           let versionToPush: AllBrowsersBrowserVersion = {
             ...version,
-            year: year - 1,
+            year: year <= 2015 ? "pre_baseline" : year - 1,
           };
 
           if (options.useSupports) {
-            let supports = "year_only";
-            if (isWaCcompatible && isNaCompatible) supports = "newly";
-            if (isWaCcompatible && !isNaCompatible) supports = "widely";
-            versionToPush = {
-              ...versionToPush,
-              supports: supports,
-            };
+            if (isWaCcompatible) versionToPush.supports = "widely";
+            if (isNaCompatible) versionToPush.supports = "newly";
           } else {
             versionToPush = {
               ...versionToPush,
@@ -602,13 +615,32 @@ export function getAllVersions(
   }
 
   outputArray.sort((a, b) => {
-    if (a.year < b.year) {
+    // Sort by year: "pre_baseline" first, then numerical year in ascending order
+    if (a.year === "pre_baseline" && b.year !== "pre_baseline") {
       return -1;
-    } else if (a.browser > b.browser) {
+    }
+    if (b.year === "pre_baseline" && a.year !== "pre_baseline") {
       return 1;
-    } else {
-      return compareVersions(a.version, b.version);
     }
+    if (a.year !== "pre_baseline" && b.year !== "pre_baseline") {
+      if (a.year < b.year) {
+        return -1;
+      }
+      if (a.year > b.year) {
+        return 1;
+      }
+    }
+
+    // Sort by browser alphabetically
+    if (a.browser < b.browser) {
+      return -1;
+    }
+    if (a.browser > b.browser) {
+      return 1;
+    }
+
+    // Sort by version using compareVersions
+    return compareVersions(a.version, b.version);
   });
 
   if (options.outputFormat === "object") {
@@ -624,10 +656,19 @@ export function getAllVersions(
         engine: version.engine,
         engine_version: version.engine_version,
       };
-      //@ts-ignore
-      outputObject[version.browser][version.version] = options.useSupports
-        ? { ...versionToAdd, supports: version.supports }
-        : { ...versionToAdd, wa_compatible: version.wa_compatible };
+
+      if (options.useSupports) {
+        //@ts-ignore
+        outputObject[version.browser][version.version] = version.supports
+          ? { ...versionToAdd, supports: version.supports }
+          : versionToAdd;
+      } else {
+        //@ts-ignores
+        outputObject[version.browser][version.version] = {
+          ...versionToAdd,
+          wa_compatible: version.wa_compatible,
+        };
+      }
     });
 
     return outputObject ?? {};
@@ -643,7 +684,7 @@ export function getAllVersions(
       let outputs: {
         browser: string;
         version: string;
-        year: number;
+        year: number | string;
         release_date: string;
         engine: string;
         engine_version: string;
@@ -659,7 +700,7 @@ export function getAllVersions(
       };
 
       outputs = options.useSupports
-        ? { ...outputs, supports: version.supports }
+        ? { ...outputs, supports: version.supports ?? "" }
         : { ...outputs, wa_compatible: version.wa_compatible };
 
       outputString +=