update sha sorting algorithm to coerce to semver sorting

vercel · Mar 28, 2023 · 8015eb2 · 8015eb2
1 parent fbac6b2
commit 8015eb2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/lib/generate-expected-shas.ts b/lib/generate-expected-shas.ts
@@ -3,6 +3,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { log } from './log';
 import { version } from '../package.json';
+import { nodeBinarySortFunction } from './utils';
 
 async function main() {
   const { argv } = yargs
@@ -15,6 +16,8 @@ async function main() {
   const shaFileContent = readFileSync(argv.input).toString();
   const shaMap: { [id: string]: string } = {};
   for (const line of shaFileContent.split('\n')) {
+    // Expect line to be of the form
+    // <sha> node-v<version>-host-arch
     const lineParts = line.split(/\s+/);
     if (lineParts.length === 2) {
       // eslint-disable-next-line prefer-destructuring
@@ -24,14 +27,12 @@ async function main() {
 
   // Sort map
   const sortedShaMap: { [id: string]: string } = {};
-  for (const nodeVersion of Object.keys(shaMap).sort()) {
+  for (const nodeVersion of Object.keys(shaMap).sort(nodeBinarySortFunction)) {
     sortedShaMap[nodeVersion] = shaMap[nodeVersion];
   }
 
   writeFileSync(join(__dirname, '../lib/expected-shas.json'),
                 `${JSON.stringify(sortedShaMap, null, 2)}\n`);
-  // console.log(JSON.stringify(sortedShaMap, null, 2));
-
 }
 
 main().catch((error) => {

diff --git a/lib/print-hashes.ts b/lib/print-hashes.ts
@@ -1,10 +1,11 @@
 import { EXPECTED_HASHES } from './expected';
+import { nodeBinarySortFunction } from './utils';
 
 /* eslint-disable no-console */
 
 function main() {
-  for (const nodeVersion of Object.keys(EXPECTED_HASHES).sort()) {
-    console.log(`${nodeVersion} ${EXPECTED_HASHES[nodeVersion]}`);
+  for (const nodeVersion of Object.keys(EXPECTED_HASHES).sort(nodeBinarySortFunction)) {
+    console.log(`${EXPECTED_HASHES[nodeVersion]} ${nodeVersion}`);
   }
 }
 

diff --git a/lib/utils.ts b/lib/utils.ts
@@ -6,6 +6,7 @@ import path from 'path';
 import { spawnSync, SpawnSyncOptions } from 'child_process';
 import stream from 'stream';
 
+import { coerce } from 'semver';
 import { log, wasReported } from './log';
 
 export async function downloadUrl(url: string, file: string): Promise<void> {
@@ -97,3 +98,12 @@ export async function spawn(
     throw error;
   }
 }
+
+export function nodeBinarySortFunction(a: string, b: string): number {
+  const coercedVersionA = coerce(a);
+  const coercedVersionB = coerce(b);
+  if (coercedVersionA && coercedVersionB) {
+    return coercedVersionA.compare(coercedVersionB);
+  }
+  return 0;
+}