@observablehq/notebook-kit 2.4.0 → 2.5.0

package/dist/package.json

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

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

@@ -20,7 +20,7 @@ function getImportAttributeKey(node) {
 export function renderObservableImport(source, node, inputs) {
     if (!inputs.includes("@variable"))
         inputs.push("@variable");
-    return `(import(${JSON.stringify(source)}).then((_) => {
+    return `(import(${source}).then((_) => {
   const module = __variable._module._runtime.module(_.default)${"injections" in node ? `.derive([${renderObservableInjections(node)}], __variable._module)` : ""};
   const outputs = new Map(Array.from(__variable._outputs, (v) => [v._name, v]));${flatMapImportSpecifiers(node, (specifier) => {
         const i = dedollar(getImportedName(specifier));

package/dist/src/javascript/imports.js

@@ -93,16 +93,17 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveImport
     });
     const specifiers = [];
     const imports = [];
-    for (const [node, source] of declarations) {
+    for (const [node, literal] of declarations) {
         output.delete(node.start, node.end + +(output.input[node.end] === "\n"));
         specifiers.push(rewriteImportSpecifiers(node));
-        const value = getStringLiteralValue(source);
+        const value = getStringLiteralValue(literal);
         const resolution = resolveImport(value);
+        const source = resolveLocalImports && isLocalImport(resolution)
+            ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
+            : JSON.stringify(resolution);
         imports.push(isObservableImport(node, value)
-            ? renderObservableImport(resolution, node, inputs)
-            : renderImport(resolveLocalImports && isLocalImport(resolution)
-                ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
-                : JSON.stringify(resolution), node, output.input));
+            ? renderObservableImport(source, node, inputs)
+            : renderImport(source, node, output.input));
     }
     if (declarations.length > 1) {
         output.insertLeft(0, `const [${specifiers.join(", ")}] = await Promise.all([${imports.join(", ")}]);\n`); // prettier-ignore

package/dist/src/javascript/template.js

@@ -103,8 +103,8 @@ export function transpileTemplate(input, tag = "", raw = false) {
         (raw ? escapeRawTemplateElements : escapeTemplateElements)(source, template);
         node = template;
     }
-    source.insertLeft(node.start, `${prefix}\``);
-    source.insertRight(node.end, `\`${suffix}`);
+    source.insertLeft(node.start, `${cell?.output ? `const ${cell.output} = ` : ""}${prefix}\``);
+    source.insertRight(node.end, `\`${suffix}${cell?.output ? ";" : ""}`);
     return String(source);
 }
 function getRaw(cell) {
@@ -128,10 +128,10 @@ function getDatabase(cell) {
         : `DatabaseClient(${JSON.stringify(database)}, {id: ${id}${since === undefined ? "" : `, since: ${JSON.stringify(since)}`}})`;
 }
 function getSqlPrefix(cell) {
-    return `${getDatabase(cell)}.sql`;
+    return `${cell.hidden ? "" : cell.output ? "((_) => (display(Inputs.table(_)), _))(" : "Inputs.table("}await ${getDatabase(cell)}.sql`;
 }
 function getSqlSuffix(cell) {
-    return cell.hidden ? "" : ".then(Inputs.table)";
+    return cell.hidden ? "" : ")";
 }
 function getSqlViewSuffix(cell) {
     return `.bind(${getDatabase(cell)})`;

package/dist/src/javascript/transpile.js

@@ -30,12 +30,6 @@ export function transpile(input, mode, options) {
         transpiled.output = cell.output;
     if (cell.hidden)
         transpiled.autodisplay = false;
-    else if (mode !== "js" && mode !== "ts" && mode !== "ojs") {
-        transpiled.autodisplay = !!input;
-        transpiled.autoview = mode === "sql" && transpiled.autodisplay && !!transpiled.output;
-        if (transpiled.autoview)
-            transpiled.output = `viewof$${transpiled.output}`;
-    }
     return transpiled;
 }
 export function transpileTypeScript(input, options) {

package/package.json

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