in build tests, sort by extension then path (#1809)

* sort by extension then path
this fixes the wobbling tests (duckdb, sql, npm) that change when a commit modifies the content hash of inputs.js vs inputs.css

* win32

* adjust sort order to minimize churn

* remove unused import

---------

Co-authored-by: Mike Bostock <[email protected]>

test/build-test.ts

@@ -2,9 +2,10 @@ import assert from "node:assert";
 import {existsSync, readdirSync, statSync} from "node:fs";
 import {mkdir, mkdtemp, open, readFile, rename, rm, unlink, writeFile} from "node:fs/promises";
 import os from "node:os";
+import {extname} from "node:path/posix";
 import {join, normalize, relative} from "node:path/posix";
 import {PassThrough} from "node:stream";
-import {ascending, difference} from "d3-array";
+import {ascending, difference, sort} from "d3-array";
 import type {BuildManifest} from "../src/build.js";
 import {FileBuildEffects, build} from "../src/build.js";
 import {normalizeConfig, readConfig, setCurrentDate} from "../src/config.js";
@@ -76,7 +77,10 @@ describe("build", () => {
       // renumber the hashes so they are sequential. This way we don’t have to
       // update the test snapshots whenever Framework’s client code changes. We
       // make an exception for minisearch.json because to test the content.
-      for (const path of findFiles(join(outputDir, "_observablehq"))) {
+      for (const path of sort(
+        findFiles(join(outputDir, "_observablehq")),
+        (a, b) => ascending(extname(a) === ".css", extname(b) === ".css") || ascending(a, b)
+      )) {
         const match = /^((.+)\.[0-9a-f]{8})\.(\w+)$/.exec(path);
         if (!match) throw new Error(`no hash found: ${path}`);
         const [, key, name, ext] = match;

test/output/build/duckdb/index.html

@@ -7,16 +7,16 @@
 <title>test DuckDB</title>
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000007.css">
+<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000007.css">
+<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000006.css">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000007.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000007.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000006.css">
 <link rel="modulepreload" href="./_observablehq/client.00000001.js">
 <link rel="modulepreload" href="./_observablehq/runtime.00000002.js">
 <link rel="modulepreload" href="./_observablehq/stdlib.00000003.js">
-<link rel="modulepreload" href="./_observablehq/stdlib/duckdb.00000005.js">
-<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000006.js">
+<link rel="modulepreload" href="./_observablehq/stdlib/duckdb.00000004.js">
+<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000005.js">
 <link rel="modulepreload" href="./_npm/@duckdb/[email protected]/cd372fb8.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">

test/output/build/npm/_import/index.4bdc071f.js

@@ -1 +1 @@
-import "../_observablehq/stdlib/inputs.00000005.js";
+import "../_observablehq/stdlib/inputs.00000004.js";

test/output/build/npm/index.html

@@ -6,16 +6,16 @@
 <meta name="generator" content="Observable Framework v1.0.0-test">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000006.css">
+<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000006.css">
+<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000005.css">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000006.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000006.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000005.css">
 <link rel="modulepreload" href="./_observablehq/client.00000001.js">
 <link rel="modulepreload" href="./_observablehq/runtime.00000002.js">
 <link rel="modulepreload" href="./_observablehq/stdlib.00000003.js">
 <link rel="modulepreload" href="./_import/index.4bdc071f.js">
-<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000005.js">
+<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000004.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">
 <script type="module">

test/output/build/sql/index.html

@@ -6,24 +6,24 @@
 <meta name="generator" content="Observable Framework v1.0.0-test">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000007.css">
+<link rel="preload" as="style" href="./_observablehq/theme-air,near-midnight.00000007.css">
+<link rel="preload" as="style" href="./_observablehq/stdlib/inputs.00000006.css">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
-<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000004.css">
-<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000007.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/theme-air,near-midnight.00000007.css">
+<link rel="stylesheet" type="text/css" href="./_observablehq/stdlib/inputs.00000006.css">
 <link rel="modulepreload" href="./_observablehq/client.00000001.js">
 <link rel="modulepreload" href="./_observablehq/runtime.00000002.js">
 <link rel="modulepreload" href="./_observablehq/stdlib.00000003.js">
-<link rel="modulepreload" href="./_observablehq/stdlib/duckdb.00000005.js">
-<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000006.js">
+<link rel="modulepreload" href="./_observablehq/stdlib/duckdb.00000004.js">
+<link rel="modulepreload" href="./_observablehq/stdlib/inputs.00000005.js">
 <link rel="modulepreload" href="./_npm/@duckdb/[email protected]/cd372fb8.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">
 <link rel="modulepreload" href="./_npm/[email protected]/cd372fb8.js">
 <script type="module">
 
 import {define} from "./_observablehq/client.00000001.js";
 import {registerFile, FileAttachment} from "./_observablehq/stdlib.00000003.js";
-import {registerTable} from "./_observablehq/stdlib/duckdb.00000005.js";
+import {registerTable} from "./_observablehq/stdlib/duckdb.00000004.js";
 
 registerFile("./table.csv", {"name":"./table.csv","mimeType":"text/csv","path":"./_file/table.b9485148.csv","lastModified":/* ts */1706742000000,"size":12});
 registerTable("table", FileAttachment("./table.csv"));