@observablehq/notebook-kit 2.0.0 → 2.1.1

package/dist/package.json

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

package/dist/src/javascript/imports/observable.js

@@ -1,4 +1,4 @@
-import { getImportedName } from "../imports.js";
+import { getImportedName, getLocalName } from "../imports.js";
 const CODE_DOLLAR = 36;
 /** If specifier is an observable: protocol import, resolves it. */
 export function resolveObservableImport(specifier) {
@@ -18,25 +18,21 @@ function getImportAttributeKey(node) {
 }
 /** Note: mutates inputs! */
 export function renderObservableImport(source, node, inputs) {
-    if (!inputs.includes("__ojs_runtime"))
-        inputs.push("__ojs_runtime");
-    if (!inputs.includes("__ojs_observer"))
-        inputs.push("__ojs_observer");
+    if (!inputs.includes("@variable"))
+        inputs.push("@variable");
     return `(import(${JSON.stringify(source)}).then((_) => {
-  const observers = {};
-  const module = __ojs_runtime.module(_.default);
-  const main = __ojs_runtime.module();${node.specifiers
+  const module = __variable._module._runtime.module(_.default);
+  const outputs = new Map(Array.from(__variable._outputs, (v) => [v._name, v]));${node.specifiers
         .map((specifier) => {
         if (specifier.type === "ImportNamespaceSpecifier")
             throw new SyntaxError("observable namespace imports are not supported");
-        const iname = getImportedName(specifier);
-        const vname = dedollar(iname);
+        const iname = dedollar(getImportedName(specifier));
+        const lname = getLocalName(specifier);
         return `
-  if (!module.defines("${vname}")) throw new SyntaxError(\`export '${vname}' not found\`);
-  main.variable(observers.${iname} = __ojs_observer()).import("${vname}", module);`;
+  outputs.get(${JSON.stringify(lname)})?.import(${JSON.stringify(iname)}${iname === lname ? "" : `, ${JSON.stringify(lname)}`}, module);`;
     })
         .join("")}
-  return observers;
+  return {};
 }))`;
 }
 /** Turns e.g. "viewof$foo" into "viewof foo", and "$$" into "$". */

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

@@ -19,5 +19,6 @@ export type RewriteImportOptions = {
 export declare function rewriteImportExpressions(output: Sourcemap, body: Node, { resolveLocalImports }?: RewriteImportOptions): void;
 /** Note: mutates inputs! */
 export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveLocalImports }?: RewriteImportOptions): void;
+export declare function getLocalName(node: NamedImportSpecifier): string;
 export declare function getImportedName(node: NamedImportSpecifier): string;
 export {};

package/dist/src/javascript/imports.js

@@ -98,7 +98,7 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveLocalIm
                 : JSON.stringify(resolution), node, output.input));
     }
     if (declarations.length > 1) {
-        output.insertLeft(0, `const [${specifiers.join(", ")}] = await Promise.all([${imports.join(", ")}]);\n`);
+        output.insertLeft(0, `const [${specifiers.join(", ")}] = await Promise.all([${imports.join(", ")}]);\n`); // prettier-ignore
     }
     else if (declarations.length === 1) {
         output.insertLeft(0, `const ${specifiers[0]} = await ${imports[0]};\n`);
@@ -117,7 +117,7 @@ function renderImport(source, node, input) {
 })`
         : ""}`;
 }
-function getLocalName(node) {
+export function getLocalName(node) {
     return node.local.name;
 }
 export function getImportedName(node) {

package/dist/src/javascript/transpile.js

@@ -52,7 +52,7 @@ export function transpileJavaScript(input, options) {
         rewriteFileExpressions(output, cell.body);
     if (cell.expression)
         output.insertLeft(0, `return (\n`);
-    output.insertLeft(0, `${async ? "async " : ""}(${inputs}) => {\n`);
+    output.insertLeft(0, `${async ? "async " : ""}(${inputs.map(deat)}) => {\n`);
     if (outputs.length > 0)
         output.insertRight(input.length, `\nreturn {${outputs}};`);
     if (cell.expression)
@@ -65,3 +65,6 @@ export function transpileJavaScript(input, options) {
     const secrets = new Set(cell.secrets.map((f) => f.argument));
     return { body, inputs, outputs, autodisplay, files, databases, secrets };
 }
+function deat(input) {
+    return input.replace(/^@/, "__"); // @variable to __variable
+}

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/index.js

@@ -22,7 +22,7 @@ export class NotebookRuntime {
             writable: true,
             value: void 0
         });
-        const runtime = new Runtime({ ...builtins, __ojs_runtime: () => runtime });
+        const runtime = new Runtime(builtins);
         this.runtime = Object.assign(runtime, { fileAttachments });
         this.main = runtime.module();
     }
@@ -35,7 +35,7 @@ export const runtime = defaultNotebook.runtime;
 export const main = defaultNotebook.main;
 export const define = defaultNotebook.define.bind(defaultNotebook);
 main.constructor.prototype.defines = function (name) {
-    return (this._scope.has(name) ||
+    return (this._scope.has(name) || // prettier
         this._builtins.has(name) ||
         this._runtime._builtin._scope.has(name));
 };

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

@@ -5,7 +5,6 @@ import { FileAttachment } from "./fileAttachment.js";
 import * as Generators from "./generators/index.js";
 import { Interpreter } from "./interpreter.js";
 import { Mutable } from "./mutable.js";
-import { Observer } from "./observer.js";
 import * as Promises from "./promises/index.js";
 export declare const root: HTMLElement;
 export declare const library: {
@@ -104,5 +103,4 @@ export declare const library: {
     Promises: () => typeof Promises;
     Files: () => typeof Files;
     DOM: () => typeof DOM;
-    __ojs_observer: () => () => Observer;
 };

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

@@ -5,7 +5,6 @@ import { FileAttachment } from "./fileAttachment.js";
 import * as Generators from "./generators/index.js";
 import { Interpreter } from "./interpreter.js";
 import { Mutable } from "./mutable.js";
-import { Observer } from "./observer.js";
 import * as Promises from "./promises/index.js";
 import * as recommendedLibraries from "./recommendedLibraries.js";
 import * as sampleDatasets from "./sampleDatasets.js";
@@ -22,7 +21,6 @@ export const library = {
     Promises: () => Promises, // deprecated!
     Files: () => Files, // deprecated!
     DOM: () => DOM, // 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": "2.0.0",
+  "version": "2.1.1",
   "type": "module",
   "scripts": {
     "test": "vitest",

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

@@ -1,16 +0,0 @@
-export declare class Observer {
-    #private;
-    fulfilled?: (value: unknown) => void;
-    rejected?: (error: unknown) => void;
-    constructor();
-    next(): Promise<{
-        done: boolean;
-        value: unknown;
-    }>;
-    throw(): {
-        done: boolean;
-    };
-    return(): {
-        done: boolean;
-    };
-}

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

@@ -1,42 +0,0 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _Observer_promise;
-export class Observer {
-    constructor() {
-        _Observer_promise.set(this, void 0);
-        Object.defineProperty(this, "fulfilled", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "rejected", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.next();
-    }
-    async next() {
-        const value = await __classPrivateFieldGet(this, _Observer_promise, "f");
-        __classPrivateFieldSet(this, _Observer_promise, new Promise((res, rej) => ((this.fulfilled = res), (this.rejected = rej))), "f");
-        return { done: false, value };
-    }
-    throw() {
-        return { done: true };
-    }
-    return() {
-        return { done: true };
-    }
-}
-_Observer_promise = new WeakMap();