fix: sort generated import blocks in code-unit order so the drift check is the same on every Bun runtime

Author: ph33nx

scripts/generate.ts

@@ -4,7 +4,8 @@
  * Run with: bun run generate
  */
 import { execSync } from 'node:child_process';
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
 
 const SPEC_URL = 'https://roxyapi.com/api/v2/openapi.json';
 const SPEC_PATH = 'specs/openapi.json';
@@ -51,6 +52,50 @@ async function loadSpec(): Promise<string> {
 	return fetchSpec(SPEC_URL);
 }
 
+/**
+ * Sort the leading import block of every generated file by module specifier in code-unit order.
+ *
+ * @remarks
+ * hey-api orders imports with `localeCompare`, and for `./client.gen.js` against `./client/index.js`
+ * Bun 1.3.14 and Bun 1.4.2 disagree (the same statement lands on either side of the other), so the
+ * committed output depended on which Bun ran the generator and the hermetic drift check went red on
+ * CI for a tree that was correct locally. A code-unit sort is the same on every runtime.
+ */
+function sortImportBlocks(dir: string): void {
+	for (const entry of readdirSync(dir, { withFileTypes: true })) {
+		const path = join(dir, entry.name);
+		if (entry.isDirectory()) {
+			sortImportBlocks(path);
+			continue;
+		}
+		if (!entry.name.endsWith('.gen.ts')) continue;
+		const src = readFileSync(path, 'utf8');
+		const block = /(?:^import\b[^;]*;\n)+/m.exec(src);
+		if (!block) continue;
+		const statements = block[0].split(/(?<=;\n)/).filter(Boolean);
+		const key = (stmt: string) =>
+			`${/from '([^']+)'/.exec(stmt)?.[1] ?? ''}\u0000${stmt}`;
+		const sorted = statements
+			.map((stmt, index) => ({ stmt, index }))
+			.sort((a, b) =>
+				key(a.stmt) < key(b.stmt)
+					? -1
+					: key(a.stmt) > key(b.stmt)
+						? 1
+						: a.index - b.index,
+			)
+			.map(({ stmt }) => stmt)
+			.join('');
+		if (sorted !== block[0])
+			writeFileSync(
+				path,
+				src.slice(0, block.index) +
+					sorted +
+					src.slice(block.index + block[0].length),
+			);
+	}
+}
+
 const spec = JSON.parse(await loadSpec());
 
 // Patch server URL to absolute production URL so the generated default client
@@ -65,6 +110,7 @@ console.log('Spec saved to', SPEC_PATH);
 
 console.log('Running hey-api generator...');
 execSync('bunx openapi-ts', { stdio: 'inherit' });
+sortImportBlocks('src');
 console.log('SDK generated successfully.');
 
 console.log('Syncing README.md and AGENTS.md from spec...');