@observablehq/notebook-kit 1.9.2 → 2.1.0

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "1.9.2",
+    "version": "2.1.0",
     "type": "module",
     "scripts": {
         "test": "vitest",

package/dist/src/runtime/define.js

@@ -20,7 +20,7 @@ export function define(main, state, definition, observer = observe) {
                 else if (version > displayVersion)
                     clear(state);
                 displayVersion = version;
-                display(state, value);
+                display(state, value, output);
                 return value;
             };
         });

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

@@ -7,9 +7,9 @@ export type DisplayState = {
     /** for inspected values, any expanded paths; see getExpanded */
     expanded: (number[][] | undefined)[];
 };
-export declare function display(state: DisplayState, value: unknown): void;
+export declare function display(state: DisplayState, value: unknown, name?: string): void;
 export declare function clear(state: DisplayState): void;
-export declare function observe(state: DisplayState, { autodisplay, assets }: Definition): {
+export declare function observe(state: DisplayState, { autodisplay, assets, output }: Definition): {
     _error: boolean;
     _node: HTMLDivElement;
     pending(): void;

package/dist/src/runtime/display.js

@@ -1,8 +1,8 @@
 import { inspect, inspectError, getExpanded } from "./inspect.js";
 import { mapAssets } from "./stdlib/assets.js";
-export function display(state, value) {
+export function display(state, value, name) {
     const { root, expanded } = state;
-    const node = isDisplayable(value, root) ? value : inspect(value, expanded[root.childNodes.length]); // prettier-ignore
+    const node = isDisplayable(value, root) ? value : inspect(value, expanded[root.childNodes.length], name); // prettier-ignore
     displayNode(state, node);
 }
 function displayNode(state, node) {
@@ -16,8 +16,8 @@ function displayNode(state, node) {
         state.root.appendChild(node);
     }
 }
-function displayError(state, value) {
-    displayNode(state, inspectError(value));
+function displayError(state, value, name) {
+    displayNode(state, inspectError(value, name));
 }
 // Note: Element.prototype is instanceof Node, but cannot be inserted! This
 // excludes DocumentFragment since appending a fragment “dissolves” (mutates)
@@ -33,7 +33,7 @@ export function clear(state) {
     while (state.root.lastChild)
         state.root.lastChild.remove();
 }
-export function observe(state, { autodisplay, assets }) {
+export function observe(state, { autodisplay, assets, output }) {
     return {
         _error: false,
         _node: state.root, // _node for visibility promise
@@ -48,7 +48,7 @@ export function observe(state, { autodisplay, assets }) {
                 if (assets && value instanceof Element)
                     mapAssets(value, assets);
                 clear(state);
-                display(state, value);
+                display(state, value, output);
             }
             else if (state.autoclear) {
                 clear(state);
@@ -58,7 +58,7 @@ export function observe(state, { autodisplay, assets }) {
             console.error(error);
             this._error = true;
             clear(state);
-            displayError(state, error);
+            displayError(state, error, output);
         }
     };
 }

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

@@ -1,3 +1,3 @@
-export declare function inspect(value: unknown, expanded?: number[][]): HTMLDivElement;
-export declare function inspectError(value: unknown): HTMLDivElement;
+export declare function inspect(value: unknown, expanded?: number[][], name?: string): HTMLDivElement;
+export declare function inspectError(value: unknown, name?: string): HTMLDivElement;
 export declare function getExpanded(node: Node): number[][] | undefined;

package/dist/src/runtime/inspect.js

@@ -1,7 +1,7 @@
 import { Inspector } from "@observablehq/inspector";
-export function inspect(value, expanded) {
+export function inspect(value, expanded, name) {
     const node = document.createElement("div");
-    new Inspector(node).fulfilled(value); // TODO name?
+    new Inspector(node).fulfilled(value, name);
     if (expanded) {
         for (const path of expanded) {
             let child = node;
@@ -12,9 +12,9 @@ export function inspect(value, expanded) {
     }
     return node;
 }
-export function inspectError(value) {
+export function inspectError(value, name) {
     const node = document.createElement("div");
-    new Inspector(node).rejected(value);
+    new Inspector(node).rejected(value, name);
     return node;
 }
 export function getExpanded(node) {

package/dist/src/runtime/stdlib/index.d.ts

@@ -104,14 +104,5 @@ export declare const library: {
     Promises: () => typeof Promises;
     Files: () => typeof Files;
     DOM: () => typeof DOM;
-    require: () => {
-        (...specifiers: unknown[]): Promise<unknown>;
-        resolve: (specifier: unknown) => string;
-    } & {
-        alias: (aliases: Record<string, string>) => {
-            (...specifiers: unknown[]): Promise<unknown>;
-            resolve: (specifier: unknown) => string;
-        };
-    };
     __ojs_observer: () => () => Observer;
 };

package/dist/src/runtime/stdlib/index.js

@@ -8,7 +8,6 @@ import { Mutable } from "./mutable.js";
 import { Observer } from "./observer.js";
 import * as Promises from "./promises/index.js";
 import * as recommendedLibraries from "./recommendedLibraries.js";
-import { require } from "./require.js";
 import * as sampleDatasets from "./sampleDatasets.js";
 export const root = document.querySelector("main") ?? document.body;
 export const library = {
@@ -23,7 +22,6 @@ export const library = {
     Promises: () => Promises, // deprecated!
     Files: () => Files, // deprecated!
     DOM: () => DOM, // deprecated!
-    require: () => require, // deprecated!
     __ojs_observer: () => () => new Observer(),
     ...recommendedLibraries,
     ...sampleDatasets

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "1.9.2",
+  "version": "2.1.0",
   "type": "module",
   "scripts": {
     "test": "vitest",

package/dist/src/runtime/stdlib/require.d.ts

@@ -1,11 +0,0 @@
-export declare const require: {
-    (...specifiers: unknown[]): Promise<unknown>;
-    resolve: (specifier: unknown) => string;
-} & {
-    alias: typeof alias;
-};
-declare function alias(aliases: Record<string, string>): {
-    (...specifiers: unknown[]): Promise<unknown>;
-    resolve: (specifier: unknown) => string;
-};
-export {};

package/dist/src/runtime/stdlib/require.js

@@ -1,73 +0,0 @@
-const cache = new WeakMap();
-export const require = Object.assign(Requirer(resolve), { alias });
-function Requirer(resolve) {
-    async function require(...specifiers) {
-        return specifiers.length === 1
-            ? import(/* @vite-ignore */ resolve(specifiers[0])).then(objectify)
-            : Promise.all(specifiers.map((s) => require(s))).then(merge);
-    }
-    require.resolve = resolve;
-    return require;
-}
-function parseNpmSpecifier(specifier) {
-    const parts = specifier.split("/");
-    const namerange = specifier.startsWith("@")
-        ? [parts.shift(), parts.shift()].join("/")
-        : parts.shift();
-    const ranged = namerange.indexOf("@", 1);
-    const name = ranged > 0 ? namerange.slice(0, ranged) : namerange;
-    const range = ranged > 0 ? namerange.slice(ranged) : "";
-    const path = parts.length > 0 ? `/${parts.join("/")}` : "";
-    return { name, range, path };
-}
-function alias(aliases) {
-    return Requirer((specifier) => {
-        if (specifier in aliases)
-            specifier = aliases[specifier];
-        return resolve(specifier);
-    });
-}
-function resolve(_specifier) {
-    const specifier = String(_specifier);
-    if (isProtocol(specifier) || isLocal(specifier))
-        return specifier;
-    const { name, range, path } = parseNpmSpecifier(specifier);
-    return `https://cdn.jsdelivr.net/npm/${name}${range}${path + ((isFile(path) && !isJavaScript(path)) || isDirectory(path) ? "" : "/+esm")}`;
-}
-/** Promote exclusive default export to module. */
-function defaultify(module) {
-    for (const key in module)
-        if (key !== "default")
-            return { ...module }; // any named export
-    return "default" in module ? module.default : { ...module }; // promote exclusive default export
-}
-/** Allow mutation of required modules while maintaining a canonical instance; ugly! */
-function objectify(module) {
-    let object = cache.get(module);
-    if (!object)
-        cache.set(module, (object = defaultify(module)));
-    return object;
-}
-function merge(modules) {
-    return Object.assign({}, ...modules);
-}
-/** Returns true for e.g. https://example.com/ */
-function isProtocol(specifier) {
-    return /^\w+:/.test(specifier);
-}
-/** Returns true for e.g. ./foo.js */
-function isLocal(specifier) {
-    return /^(\.\/|\.\.\/|\/)/.test(specifier);
-}
-/** Returns true for e.g. foo/bar.js */
-function isJavaScript(specifier) {
-    return /\.js$/i.test(specifier);
-}
-/** Returns true for e.g. foo/bar.txt */
-function isFile(specifier) {
-    return /\.\w*$/.test(specifier);
-}
-/** Returns true for e.g. foo/bar/ */
-function isDirectory(specifier) {
-    return /\/$/.test(specifier);
-}