@observablehq/notebook-kit 2.6.3 → 2.6.5

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "2.6.3",
+    "version": "2.6.5",
     "type": "module",
     "scripts": {
         "test": "TZ=America/Los_Angeles vitest",

package/dist/src/javascript/imports.d.ts

@@ -23,9 +23,9 @@ export type ImportOptions = {
     /** If specified, allows renaming of imported variables such as viewof$foo for backwards compatibility. */
     renameObservableImport?: (name: string) => string;
 };
-export declare function rewriteImportExpressions(output: Sourcemap, body: Node, { resolveImport, resolveLocalImports }?: ImportOptions): void;
+export declare function rewriteImportExpressions(output: Sourcemap, body: Node, { resolveImport, resolveLocalImports }?: ImportOptions): Set<string>;
 /** Note: mutates inputs! */
-export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveImport, resolveLocalImports, renameObservableImport }?: ImportOptions): void;
+export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveImport, resolveLocalImports, renameObservableImport }?: ImportOptions): Set<string>;
 export declare function getLocalName(node: NamedImportSpecifier): string;
 export declare function getImportedName(node: NamedImportSpecifier): string;
 export declare function flatMapImportSpecifiers<T>(node: ImportDeclaration, f: (node: NamedImportSpecifier) => T): T[];

package/dist/src/javascript/imports.js

@@ -51,8 +51,10 @@ export function resolveImportDefault(specifier) {
     return resolveObservableImport(resolveJsrImport(resolveNpmImport(specifier)));
 }
 export function rewriteImportExpressions(output, body, { resolveImport = resolveImportDefault, resolveLocalImports } = {}) {
+    const sources = new Set();
     function rewriteImportSource(source, node = source) {
         const value = getStringLiteralValue(source);
+        sources.add(value);
         const resolution = resolveImport(value);
         output.replaceLeft(node.start, node.end, resolveLocalImports && isLocalImport(resolution)
             ? `new URL(${JSON.stringify(resolution)}, document.baseURI).href`
@@ -77,9 +79,11 @@ export function rewriteImportExpressions(output, body, { resolveImport = resolve
             }
         }
     });
+    return sources;
 }
 /** Note: mutates inputs! */
 export function rewriteImportDeclarations(output, body, inputs, { resolveImport = resolveImportDefault, resolveLocalImports, renameObservableImport = dedollar } = {}) {
+    const sources = new Set();
     const declarations = [];
     simple(body, {
         ImportDeclaration(node) {
@@ -97,6 +101,7 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveImport
         output.delete(node.start, node.end + +(output.input[node.end] === "\n"));
         specifiers.push(rewriteImportSpecifiers(node));
         const value = getStringLiteralValue(literal);
+        sources.add(value);
         const resolution = resolveImport(value);
         const source = resolveLocalImports && isLocalImport(resolution)
             ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
@@ -111,6 +116,7 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveImport
     else if (declarations.length === 1) {
         output.insertLeft(0, `const ${specifiers[0]} = await ${imports[0]};\n`);
     }
+    return sources;
 }
 function renderImport(source, node, input) {
     const names = node.specifiers

package/dist/src/javascript/observable.js

@@ -53,7 +53,7 @@ function transpileObservableImport(input, cell, options) {
     const declarations = flatMapImportSpecifiers(cell.body, (s) => s.local);
     const outputs = Array.from(new Set(declarations.map(asDeclaration)));
     transformObservableImport(cell.body);
-    rewriteImportDeclarations(output, cell.body, inputs, options);
+    const imports = rewriteImportDeclarations(output, cell.body, inputs, options);
     output.insertLeft(0, `async (__variable) => {\n`);
     if (outputs.length > 0)
         output.insertRight(input.length, `\nreturn {${outputs}};`);
@@ -66,7 +66,8 @@ function transpileObservableImport(input, cell, options) {
         autodisplay: false,
         files: new Set(),
         secrets: new Set(),
-        databases: new Set()
+        databases: new Set(),
+        imports
     };
 }
 /** Mutates the given import declaration to be an Observable import. */

package/dist/src/javascript/transpile.d.ts

@@ -21,6 +21,8 @@ export type TranspiledJavaScript = {
     databases?: Set<string>;
     /** the names of any referenced secrets */
     secrets?: Set<string>;
+    /** the module specifiers of any (statically analyzable) imports */
+    imports?: Set<string>;
 };
 export interface TranspileOptions extends ImportOptions {
     /** If true, resolve file using import.meta.url (so Vite treats it as an asset). */

package/dist/src/javascript/transpile.js

@@ -50,8 +50,8 @@ function transpileCell(cell, output, options) {
         async = true;
     const outputs = Array.from(new Set(cell.declarations?.map((r) => r.name)));
     output.trim();
-    rewriteImportDeclarations(output, cell.body, inputs, options);
-    rewriteImportExpressions(output, cell.body, options);
+    const importDeclarations = rewriteImportDeclarations(output, cell.body, inputs, options);
+    const importExpressions = rewriteImportExpressions(output, cell.body, options);
     if (options?.resolveFiles)
         rewriteFileExpressions(output, cell.body);
     if (cell.expression)
@@ -67,7 +67,8 @@ function transpileCell(cell, output, options) {
     const files = new Set(cell.files.map((f) => f.argument));
     const databases = new Set(cell.databases.map((f) => f.argument));
     const secrets = new Set(cell.secrets.map((f) => f.argument));
-    return { body, inputs, outputs, autodisplay, files, databases, secrets };
+    const imports = new Set([...importDeclarations, ...importExpressions]);
+    return { body, inputs, outputs, autodisplay, files, databases, secrets, imports };
 }
 function deat(input) {
     return input.replace(/^@/, "__"); // @variable to __variable

package/dist/src/lib/unprefix.d.ts

@@ -0,0 +1 @@
+export declare function unprefix(name: string, prefix: string): string;

package/dist/src/lib/unprefix.js

@@ -0,0 +1,5 @@
+export function unprefix(name, prefix) {
+    if (!name.startsWith(prefix))
+        throw new Error(`expected ${prefix}: ${name}`);
+    return name.slice(prefix.length);
+}

package/dist/src/runtime/define.js

@@ -1,3 +1,4 @@
+import { unprefix } from "../lib/unprefix.js";
 import { clear, display, observe } from "./display.js";
 import { input } from "./stdlib/generators/index.js";
 import { Mutator } from "./stdlib/mutable.js";
@@ -56,8 +57,3 @@ export function define(main, state, definition, observer = observe) {
         }
     }
 }
-function unprefix(name, prefix) {
-    if (!name.startsWith(prefix))
-        throw new Error(`expected ${prefix}: ${name}`);
-    return name.slice(prefix.length);
-}

package/dist/src/runtime/display.d.ts

@@ -10,7 +10,7 @@ export type DisplayState = {
 };
 export declare function display(state: DisplayState, value: unknown, name?: string, mode?: DisplayMode): void;
 export declare function clear(state: DisplayState): void;
-export declare function observe(state: DisplayState, { autodisplay, assets, output: name, displayMode: mode }: Definition): {
+export declare function observe(state: DisplayState, { autodisplay, assets, output: name, automutable, displayMode: mode }: Definition): {
     _error: boolean;
     _node: HTMLDivElement;
     pending(): void;

package/dist/src/runtime/display.js

@@ -1,3 +1,4 @@
+import { unprefix } from "../lib/unprefix.js";
 import { inspect, inspectError, getExpanded } from "./inspect.js";
 import { mapAssets } from "./stdlib/assets.js";
 export function display(state, value, name, mode) {
@@ -45,7 +46,9 @@ export function clear(state) {
     while (state.root.lastChild)
         state.root.lastChild.remove();
 }
-export function observe(state, { autodisplay, assets, output: name, displayMode: mode }) {
+export function observe(state, { autodisplay, assets, output: name, automutable, displayMode: mode }) {
+    if (automutable && name)
+        name = unprefix(name, "initial ");
     return {
         _error: false,
         _node: state.root, // _node for visibility promise

package/dist/src/styles/global.css

@@ -128,11 +128,15 @@ h2,
 h3,
 h4,
 h5,
-h6,
-.katex-display {
+h6 {
   max-width: 640px;
 }
 
+.katex-display {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+
 blockquote,
 ol,
 ul {

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "2.6.3",
+  "version": "2.6.5",
   "type": "module",
   "scripts": {
     "test": "TZ=America/Los_Angeles vitest",