fix: improve runtime placeholder handling

Fixes previous issues with update and remove

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

Author: GordonSmith

package-lock.json

@@ -53,7 +53,7 @@
     },
     "devDependencies": {
         "@hpcc-js/esbuild-plugins": "^1.5.0",
-        "@observablehq/notebook-kit": "1.2.0",
+        "@observablehq/notebook-kit": "1.4.1",
         "@observablehq/parser": "6.1.0",
         "@observablehq/runtime": "5.9.9",
         "@types/jsdom": "21.1.7"

packages/observablehq-compiler/package.json

@@ -3,21 +3,25 @@ import { type Notebook, type Cell, transpile } from "@observablehq/notebook-kit"
 import { type Definition } from "@observablehq/notebook-kit/runtime";
 import { constructFunction } from "./util.ts";
 
+export { Notebook, Cell };
+
 export interface CompileKitOptions {
     inline?: boolean;
+    resolveLocalImports?: boolean;
+    includePinned?: boolean;
 }
 
-export function compileCell(cell: Cell, options: CompileKitOptions = { inline: true }): Definition[] {
+export function compileCell(cell: Cell, { inline = true, resolveLocalImports = false, includePinned = true }: CompileKitOptions = {}): Definition[] {
     const retVal: Definition[] = [];
     const sourceIDOffset = 1000000;
     try {
-        const compiled = transpile(cell);
+        const compiled = transpile(cell, { resolveLocalImports });
         retVal.push({
             id: cell.id,
             ...compiled,
-            body: options.inline ? constructFunction(compiled.body, `cell_${cell.id}`) : compiled.body,
+            body: inline ? constructFunction(compiled.body, `cell_${cell.id}`) : compiled.body,
         });
-        if (cell.pinned) {
+        if (includePinned && cell.pinned) {
             const compiled = transpile({
                 ...cell,
                 mode: "md",
@@ -29,7 +33,7 @@ ${cell.value}
             retVal.push({
                 id: sourceIDOffset + cell.id,
                 ...compiled,
-                body: options.inline ? constructFunction(compiled.body, `cell_source_${sourceIDOffset + cell.id}`) : compiled.body,
+                body: inline ? constructFunction(compiled.body, `cell_${sourceIDOffset + cell.id}`) : compiled.body,
             });
         }
     } catch (error) {
@@ -38,10 +42,10 @@ ${cell.value}
     return retVal;
 }
 
-export function compileNotebook(notebook: Notebook, options: CompileKitOptions = { inline: true }): Definition[] {
+export function compileNotebook(notebook: Notebook, { inline = true, resolveLocalImports = false }: CompileKitOptions = {}): Definition[] {
     const retVal: Definition[] = [];
     for (const cell of notebook.cells) {
-        const cellDefs = compileCell(cell, options);
+        const cellDefs = compileCell(cell, { inline, resolveLocalImports });
         retVal.push(...cellDefs);
     }
     return retVal;

packages/observablehq-compiler/src/kit/compiler.ts

@@ -1,10 +1,9 @@
-import { type DefineState, NotebookRuntime as NotebookRuntimeBase } from "@observablehq/notebook-kit/runtime";
-import { type Definition } from "./index.ts";
+import { type Definition, type DefineState, NotebookRuntime as NotebookRuntimeBase } from "@observablehq/notebook-kit/runtime";
 
 import "@observablehq/notebook-kit/index.css";
 import "@observablehq/notebook-kit/theme-air.css";
 
-export { DefineState };
+export { Definition, DefineState };
 
 export class NotebookRuntime extends NotebookRuntimeBase {
 
@@ -84,4 +83,4 @@ export class NotebookRuntime extends NotebookRuntimeBase {
             target.appendChild(observableDiv);
         }
     }
-}
+}