annotate local paths

src/javascript/transpile.ts

@@ -101,7 +101,7 @@ export async function transpileModule(
 
   async function rewriteImportSource(source: StringLiteral) {
     const specifier = getStringLiteralValue(source);
-    output.replaceLeft(source.start, source.end, JSON.stringify(await resolveImport(specifier)));
+    output.replaceLeft(source.start, source.end, annotatePath(await resolveImport(specifier)));
   }
 
   for (const {name, node} of findFiles(body, path, input)) {
@@ -111,17 +111,15 @@ export async function transpileModule(
     output.replaceLeft(
       source.start,
       source.end,
-      `${JSON.stringify(
+      `${
         info
-          ? {
-              name: p,
-              mimeType: mime.getType(name) ?? undefined,
-              path: relativePath(servePath, resolveFile(name)),
-              lastModified: info.mtimeMs,
-              size: info.size
-            }
-          : p
-      )}, import.meta.url`
+          ? `{"name":${JSON.stringify(p)},"mimeType":${JSON.stringify(
+              mime.getType(name) ?? undefined
+            )},"path":${annotatePath(relativePath(servePath, resolveFile(name)))},"lastModified":${JSON.stringify(
+              info.mtimeMs
+            )},"size":${JSON.stringify(info.size)}`
+          : JSON.stringify(p)
+      }, import.meta.url`
     );
   }
 
@@ -137,7 +135,7 @@ export async function transpileModule(
     if (isImportMetaResolve(node) && isStringLiteral(source)) {
       const value = getStringLiteralValue(source);
       const resolution = isPathImport(value) && !isJavaScript(value) ? resolveFile(value) : await resolveImport(value);
-      output.replaceLeft(source.start, source.end, JSON.stringify(resolution));
+      output.replaceLeft(source.start, source.end, annotatePath(resolution));
     }
   }
 
@@ -259,3 +257,10 @@ export function rewriteParams(output: Sourcemap, body: Node, params: Params, inp
     output.replaceLeft(node.start, node.end, JSON.stringify(params[name]));
   }
 }
+
+/**
+ * Annotate a path to a local import or file so it can be reworked server-side.
+ */
+function annotatePath(uri: string): string {
+  return `${JSON.stringify(uri)}${isPathImport(uri) ? "/* observablehq-file */" : ""}`;
+}

test/javascript/transpile-test.ts

@@ -210,11 +210,11 @@ describe("transpileModule(input, root, path)", () => {
   it("rewrites npm imports", async () => {
     const input = 'import "npm:d3-array";';
     const output = (await transpileModule(input, options)).split("\n").pop()!;
-    assert.strictEqual(output, 'import "../_npm/[email protected]/_esm.js";');
+    assert.strictEqual(output, 'import "../_npm/[email protected]/_esm.js"/* observablehq-file */;');
   });
   it("rewrites node imports", async () => {
     const input = 'import "d3-array";';
     const output = (await transpileModule(input, options)).split("\n").pop()!;
-    assert.strictEqual(output, 'import "../_node/[email protected]/index.js";');
+    assert.strictEqual(output, 'import "../_node/[email protected]/index.js"/* observablehq-file */;');
   });
 });

test/output/build/data-loaders/_import/import-test.e7269c4e.js

@@ -1 +1 @@
-export {test} from "./test.86a60bc6.js";
+export {test} from "./test.86a60bc6.js"/* observablehq-file */;

test/output/build/data-loaders/_import/test.86a60bc6.js

@@ -1,3 +1,3 @@
-import {FileAttachment} from "../_observablehq/stdlib.00000003.js";
+import {FileAttachment} from "../_observablehq/stdlib.00000003.js"/* observablehq-file */;
 
-export const test = FileAttachment({"name":"../test.txt","mimeType":"text/plain","path":"../_file/test.f2ca1bb6.txt","lastModified":/* ts */1706742000000,"size":5}, import.meta.url).text();
+export const test = FileAttachment({"name":"../test.txt","mimeType":"text/plain","path":"../_file/test.f2ca1bb6.txt"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":5, import.meta.url).text();

test/output/build/embed/_import/chart.2ce91e05.js

@@ -1,8 +1,8 @@
-import {FileAttachment} from "../_observablehq/stdlib.00000003.js";
-import * as Plot from "../_npm/@observablehq/[email protected]/cd372fb8.js";
+import {FileAttachment} from "../_observablehq/stdlib.00000003.js"/* observablehq-file */;
+import * as Plot from "../_npm/@observablehq/[email protected]/cd372fb8.js"/* observablehq-file */;
 
 export async function Chart() {
-  const gistemp = await FileAttachment({"name":"../lib/gistemp.csv","mimeType":"text/csv","path":"../_file/lib/gistemp.1cf298b1.csv","lastModified":/* ts */1706742000000,"size":97}, import.meta.url).csv({typed: true});
+  const gistemp = await FileAttachment({"name":"../lib/gistemp.csv","mimeType":"text/csv","path":"../_file/lib/gistemp.1cf298b1.csv"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":97, import.meta.url).csv({typed: true});
   return Plot.plot({
     y: {grid: true},
     color: {scheme: "burd"},

test/output/build/embed/chart.js

@@ -1,4 +1,4 @@
-import "./_observablehq/stdlib.00000003.js";
-import "./_npm/@observablehq/[email protected]/cd372fb8.js";
-import "./_npm/[email protected]/cd372fb8.js";
-export * from "./_import/chart.2ce91e05.js";
+import "./_observablehq/stdlib.00000003.js"/* observablehq-file */;
+import "./_npm/@observablehq/[email protected]/cd372fb8.js"/* observablehq-file */;
+import "./_npm/[email protected]/cd372fb8.js"/* observablehq-file */;
+export * from "./_import/chart.2ce91e05.js"/* observablehq-file */;

test/output/build/imports/_import/bar/bar.13bb8056.js

@@ -1 +1 @@
-export {bar} from "./baz.cdbfb28b.js";
+export {bar} from "./baz.cdbfb28b.js"/* observablehq-file */;

test/output/build/imports/_import/bar/baz.cdbfb28b.js

@@ -1,4 +1,4 @@
-import {foo} from "../foo/foo.5963bf78.js";
+import {foo} from "../foo/foo.5963bf78.js"/* observablehq-file */;
 
 export const bar = "bar";
 export const foobar = foo + "bar";

test/output/build/imports/_import/foo/foo.5963bf78.js

@@ -1,6 +1,6 @@
-import "../../_npm/[email protected]/cd372fb8.js";
-import {bar} from "../bar/bar.13bb8056.js";
-export {top} from "../top.160847a6.js";
+import "../../_npm/[email protected]/cd372fb8.js"/* observablehq-file */;
+import {bar} from "../bar/bar.13bb8056.js"/* observablehq-file */;
+export {top} from "../top.160847a6.js"/* observablehq-file */;
 
 export const foo = "foo";
 export const foobar = "foo" + bar;

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

@@ -1 +1 @@
-import "../_observablehq/stdlib/inputs.00000005.js";
+import "../_observablehq/stdlib/inputs.00000005.js"/* observablehq-file */;