add lastModified to a module’s hash when it references a file attachment (#1837)

* when a module references a file attachment, include the file's lastModified timestamp in the module's hash.

closes #1836

Note that this allows us to remove from the tests the ts rewrite that we used to do on modules, because their payload’s lastModified is now always set to the fake currentDate injected by the tests. Some tests don't want to use the fake date though! (I hope they never run in parallel?)

* clear currentDate in after

* prettier

---------

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

Author: Fil

src/config.ts

@@ -233,7 +233,7 @@ function readPages(root: string, md: MarkdownIt): Page[] {
   return pages;
 }
 
-let currentDate: Date | null = null;
+export let currentDate: Date | null = null;
 
 /** For testing only! */
 export function setCurrentDate(date: Date | null): void {

src/javascript/module.ts

@@ -6,6 +6,7 @@ import {extname, join} from "node:path/posix";
 import type {Program} from "acorn";
 import type {TransformOptions} from "esbuild";
 import {transform, transformSync} from "esbuild";
+import {currentDate} from "../config.js";
 import {resolveJsrImport} from "../jsr.js";
 import {resolveNodeImport} from "../node.js";
 import {resolveNpmImport} from "../npm.js";
@@ -199,7 +200,7 @@ export function getFileInfo(root: string, path: string): FileInfo | undefined {
     const stat = statSync(key);
     if (!stat.isFile()) return; // ignore non-files
     accessSync(key, constants.R_OK); // verify that file is readable
-    mtimeMs = Math.floor(stat.mtimeMs);
+    mtimeMs = Math.floor((currentDate ?? stat.mtimeMs) as number);
     size = stat.size;
   } catch {
     fileInfoCache.delete(key); // delete stale entry

src/loader.ts

@@ -300,7 +300,7 @@ export class LoaderResolver {
   getOutputFileHash(name: string): string {
     const info = this.getOutputInfo(name);
     if (!info) throw new Error(`output file not found: ${name}`);
-    return info.hash;
+    return createHash("sha256").update(info.hash).update(String(info.mtimeMs)).digest("hex");
   }
 
   getSourceInfo(name: string): FileInfo | undefined {

test/build-test.ts

@@ -32,6 +32,7 @@ const failureTests = ["missing-file", "missing-import"];
 
 describe("build", () => {
   before(() => setCurrentDate(new Date("2024-01-10T16:00:00")));
+  after(() => setCurrentDate(null));
   mockJsDelivr();
   mockJsr();
   mockDuckDB();
@@ -233,9 +234,6 @@ class TestEffects extends FileBuildEffects {
       contents = contents.replace(/^(\s*<script>\{).*(\}<\/script>)$/gm, "$1/* redacted init script */$2");
       contents = contents.replace(/(registerFile\(.*,"lastModified":)\d+(,"size":\d+.*\))/gm, "$1/* ts */1706742000000$2"); // prettier-ignore
     }
-    if (typeof contents === "string" && outputPath.endsWith(".js")) {
-      contents = contents.replace(/(FileAttachment\(.*,"lastModified":)\d+(,"size":\d+.*\))/gm, "$1/* ts */1706742000000$2"); // prettier-ignore
-    }
     return super.writeFile(outputPath, contents);
   }
 }

test/config-test.ts

@@ -26,6 +26,7 @@ const DUCKDB_DEFAULTS: DuckDBConfig = {
 
 describe("readConfig(undefined, root)", () => {
   before(() => setCurrentDate(new Date("2024-01-10T16:00:00")));
+  after(() => setCurrentDate(null));
   it("imports the config file at the specified root", async () => {
     const {md, loaders, paths, normalizePath, ...config} = await readConfig(undefined, "test/input/build/config");
     assert(md instanceof MarkdownIt);

test/deploy-test.ts

@@ -195,6 +195,7 @@ const DEPLOY_CONFIG: DeployConfig & {projectId: string; projectSlug: string; wor
 
 describe("deploy", () => {
   before(() => setCurrentDate(new Date("2024-01-10T16:00:00")));
+  after(() => setCurrentDate(null));
   mockObservableApi();
   mockJsDelivr();
 

test/input/build/params2/[code]/analytics.js

@@ -0,0 +1,3 @@
+import {FileAttachment} from "npm:@observablehq/stdlib";
+
+FileAttachment("data.json");

test/input/build/params2/[code]/data.json.js

@@ -0,0 +1 @@
+process.stdout.write(JSON.stringify({a: 1}));

test/input/build/params2/index.md

@@ -0,0 +1,5 @@
+# test
+
+```js
+import "/code/analytics.js"
+```

test/output/build/data-loaders/_import/import-test.3349a02d.js

@@ -0,0 +1 @@
+export {test} from "./test.a9a4ef0e.js";