fix(observablehq-compiler): update dependencies and improve file attachment handling

- Updated `@observablehq/runtime` to version 6.0.0 and added `@observablehq/inspector` and `@observablehq/stdlib` as dependencies in `markdown-it-plugins` and `observablehq-compiler`.
- Enhanced `index-kit.html` and `index-preview.html` to demonstrate file attachment functionality with a CSV example.
- Refactored import statements in various HTML files to align with the new dependency structure.
- Modified `compiler.ts` and `writer.ts` to utilize `FileAttachments` from `@observablehq/stdlib` for better file handling.
- Updated test files to reflect changes in the compilation process and ensure compatibility with the new runtime.

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

package-lock.json

@@ -56,7 +56,9 @@
     "dependencies": {
         "@hpcc-js/observablehq-compiler": "^3.7.12",
         "@observablehq/framework": "1.13.4",
-        "@observablehq/runtime": "5.9.9",
+        "@observablehq/inspector": "5.0.1",
+        "@observablehq/stdlib": "5.8.8",
+        "@observablehq/runtime": "6.0.0",
         "@types/markdown-it": "14.1.2"
     },
     "peerDependencies": {

packages/markdown-it-plugins/package.json

@@ -31,6 +31,28 @@
         import { testOmd } from "./tests/index-notebookkit.ts";
         testOmd("placeholder-omd");
     </script>
+    <hr>
+    <h3>FileAttachment Example</h3>
+    <div class="placeholder" id="placeholder-fileattachment"></div>
+    <script type="module">
+        import { ojs2notebookKit, compileNotebook } from "./src/index.ts";
+        import { NotebookRuntime } from "./src/kit/runtime.ts";
+        import { registerFile } from "@observablehq/notebook-kit/runtime";
+
+        registerFile("AMZN.csv", { path: "./tests/AMZN.csv", mimeType: "text/csv" });
+
+        const ojs = `
+data = FileAttachment("AMZN.csv").csv({ typed: true })
+md\`Loaded \${data.length} rows from AMZN.csv. Columns: \${data.columns.join(", ")}\`
+md\`First row: Date=\${data[0].Date}, Close=\${data[0].Close}\`
+`;
+
+        const element = document.getElementById("placeholder-fileattachment");
+        const notebook = ojs2notebookKit(ojs);
+        const definitions = compileNotebook(notebook);
+        const runtime = new NotebookRuntime();
+        runtime.render(definitions, element);
+    </script>
 </body>
 
 </html>

packages/observablehq-compiler/index-kit.html

@@ -26,7 +26,7 @@
     <script type="importmap">
         {
             "imports": {
-                "@observablehq/runtime": "https://cdn.jsdelivr.net/npm/@observablehq/runtime@5.9.9/dist/runtime.js",
+                "@observablehq/runtime": "https://cdn.jsdelivr.net/npm/@observablehq/runtime@6.0.0/dist/runtime.js",
 
                 "@hpcc-js/observablehq-compiler": "../observablehq-compiler/dist/index.js"
             }
@@ -38,7 +38,9 @@
     <h1>ESM Quick Test</h1>
     <div id="placeholder"></div>
     <script type="module">
-        import { Library, Runtime, Inspector } from "@observablehq/runtime";
+        import { Runtime } from "@observablehq/runtime";
+        import { Inspector } from "@observablehq/inspector";
+        import { Library } from "@observablehq/stdlib";
         import { omd2notebook, compile } from "@hpcc-js/observablehq-compiler";
 
         const md = `\

packages/observablehq-compiler/index-preview.html

@@ -29,7 +29,9 @@
     <h1>ESM Quick Test</h1>
     <div id="placeholder"></div>
     <script type="module">
-        import { Library, Runtime, Inspector } from "@observablehq/runtime";
+        import { Runtime } from "@observablehq/runtime";
+        import { Inspector } from "@observablehq/inspector";
+        import { Library } from "@observablehq/stdlib";
         import { omd2notebook, compile } from "./src/index.ts";
 
         const md = `\

packages/observablehq-compiler/index.html

@@ -39,7 +39,7 @@
         "ojscc": "bin/ojscc.mjs"
     },
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types dist dist-test *.tsbuildinfo .turbo",
         "bundle-node": "node ./esbuild.js",
         "bundle-browser": "vite build",
         "bundle": "run-s bundle-browser bundle-node",
@@ -63,15 +63,17 @@
         "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "jsdom": "26.1.0",
+        "jsdom": "29.1.1",
         "yargs": "18.0.0"
     },
     "devDependencies": {
         "@hpcc-js/esbuild-plugins": "^1.8.10",
         "@observablehq/notebook-kit": "1.7.9",
         "@observablehq/parser": "6.1.0",
-        "@observablehq/runtime": "5.9.9",
-        "@types/jsdom": "21.1.7"
+        "@observablehq/inspector": "5.0.1",
+        "@observablehq/stdlib": "5.8.8",
+        "@observablehq/runtime": "6.0.0",
+        "@types/jsdom": "28.0.3"
     },
     "repository": {
         "type": "git",

packages/observablehq-compiler/package.json

@@ -1,5 +1,5 @@
-
 import { type Notebook, type Definition, compileNotebook, fixRelativeUrl, isRelativePath, obfuscatedImport } from "./kit/index.ts";
+import { FileAttachments } from "@observablehq/stdlib";
 import { ohq, splitModule } from "./observable-shim.ts";
 import { parseCell, ParsedImportCell } from "./cst.ts";
 import { Writer } from "./writer.ts";
@@ -272,8 +272,11 @@ export function notebook(_files: ohq.File[] = [], _cells: CellFunc[] = [], { bas
     const cells = new Map<string | number, CellFunc>(_cells.map(c => [c.id, c]));
 
     const retVal = (runtime: ohq.Runtime, inspector?: InspectorFactoryEx): ohq.Module => {
+        if (!runtime.fileAttachments) {
+            runtime.fileAttachments = FileAttachments;
+        }
         const main = runtime.module();
-        main.builtin("FileAttachment", runtime.fileAttachments(name => {
+        main.builtin("FileAttachment", FileAttachments(name => {
             return fileAttachments.get(name) ?? { url: new URL(fixRelativeUrl(name, baseUrl)), mimeType: null };
         }));
         main.builtin("fetchEx", fetchEx);

packages/observablehq-compiler/src/compiler.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { Library, Runtime } from "@observablehq/runtime";
+import { Runtime } from "@observablehq/runtime";
+import { Library } from "@observablehq/stdlib";
 import { compile, ohq } from "@hpcc-js/observablehq-compiler";
 
 describe("observablehq-compiler", function () {

packages/observablehq-compiler/tests/esm-import.browser.spec.ts

@@ -332,7 +332,7 @@ value
 `;
 
     const notebook = omd2notebookKit(omd2);
-    const definitions = compileKit(notebook);
+    const definitions = compileNotebook(notebook);
     const runtime = new NotebookRuntime();
     runtime.render(definitions, element);
 }
@@ -358,7 +358,7 @@ mo = 38 + 40;
 `;
 
     const notebook = ojs2notebookKit(ojs);
-    const definitions = compileKit(notebook);
+    const definitions = compileNotebook(notebook);
     const runtime = new NotebookRuntime();
     runtime.render(definitions, element);
 }

packages/observablehq-compiler/tests/index-notebookkit.ts

@@ -1,4 +1,6 @@
-import { Library, Runtime, Inspector } from "@observablehq/runtime";
+import { Runtime } from "@observablehq/runtime";
+import { Inspector } from "@observablehq/inspector";
+import { Library } from "@observablehq/stdlib";
 import { describe, it, expect } from "vitest";
 import { compile, download, ohq, ojs2notebook } from "@hpcc-js/observablehq-compiler";
 import { fa } from "./File Attachments.ts";