@observablehq/notebook-kit 1.3.0-rc.1 → 1.3.0-rc.3

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "1.3.0-rc.1",
+    "version": "1.3.0-rc.3",
     "type": "module",
     "scripts": {
         "test": "vitest",
@@ -51,6 +51,7 @@
         "@lezer/html": "^1.3.10",
         "@lezer/javascript": "^1.5.1",
         "@lezer/markdown": "^1.4.3",
+        "@lezer/python": "^1.1.18",
         "@observablehq/inspector": "^5.0.1",
         "@observablehq/parser": "^6.1.0",
         "@observablehq/runtime": "^6.0.0",

package/dist/src/interpreters/index.d.ts

@@ -1,2 +1,3 @@
 import type { Cell } from "../lib/notebook.js";
 export declare function getInterpreterCachePath(sourcePath: string, interpreter: string, format: Cell["format"], input: string): Promise<string>;
+export declare function getInterpreterCommand(interpreter: string): [command: string, args: string[]];

package/dist/src/interpreters/index.js

@@ -6,3 +6,13 @@ export async function getInterpreterCachePath(sourcePath, interpreter, format, i
     const cacheName = `${await nameHash(interpreter)}-${await stringHash(input)}${getInterpreterExtension(format)}`; // TODO avoid conflict with database cache?
     return join(sourceDir, ".observable", "cache", cacheName);
 }
+export function getInterpreterCommand(interpreter) {
+    switch (interpreter) {
+        case "node":
+            return ["node", ["--input-type=module", "--permission", "--allow-fs-read=."]];
+        case "python":
+            return ["python3", []];
+        default:
+            throw new Error(`unknown interpreter: ${interpreter}`);
+    }
+}

package/dist/src/javascript/template.js

@@ -82,7 +82,7 @@ export function transpileTemplate(input, tag = "", raw = false) {
         return input;
     const source = new Sourcemap(input);
     let node;
-    if (cell && isInterpreter(cell)) {
+    if (cell && isInterpreter(cell.mode)) {
         node = { type: "Literal", start: 0, end: input.length };
         escapeBacktick(source, node);
         escapeBackslash(source, node);
@@ -106,7 +106,7 @@ function getTag(cell) {
         ? "tex.block"
         : cell.mode === "sql"
             ? getSqlTag(cell)
-            : isInterpreter(cell)
+            : isInterpreter(cell.mode)
                 ? getInterpreterTag(cell)
                 : cell.mode;
 }
@@ -123,7 +123,7 @@ function getInterpreterTag(cell) {
 function getSuffix(cell) {
     return cell.mode === "sql" && !cell.hidden
         ? ".then(Inputs.table)"
-        : isInterpreter(cell)
+        : isInterpreter(cell.mode)
             ? getInterpreterSuffix(cell)
             : "";
 }

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

@@ -1,4 +1,4 @@
 import type { Cell } from "./notebook.js";
-export declare function isInterpreter(cell: Cell): boolean;
+export declare function isInterpreter(mode: Cell["mode"]): boolean;
 export declare function getInterpreterExtension(format: Cell["format"]): string;
 export declare function getInterpreterMethod(format: Cell["format"]): string;

package/dist/src/lib/interpreters.js

@@ -1,5 +1,5 @@
-export function isInterpreter(cell) {
-    return cell.mode === "node";
+export function isInterpreter(mode) {
+    return mode === "node" || mode === "python";
 }
 export function getInterpreterExtension(format) {
     switch (format) {

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

@@ -21,7 +21,7 @@ export interface CellSpec {
     /** the committed cell value; defaults to empty */
     value?: string;
     /** the mode; affects how the value is evaluated; defaults to js */
-    mode?: "js" | "ojs" | "md" | "html" | "tex" | "dot" | "sql" | "node";
+    mode?: "js" | "ojs" | "md" | "html" | "tex" | "dot" | "sql" | "node" | "python";
     /** if true, the editor will stay open when not focused; defaults to false */
     pinned?: boolean;
     /** if true, implicit display will be suppressed; defaults to false */

package/dist/src/lib/notebook.js

@@ -1,3 +1,4 @@
+import { isInterpreter } from "./interpreters.js";
 export function toNotebook({ cells = [], title = "Untitled", theme = "air", readOnly = false }) {
     return {
         cells: cells.map(toCell),
@@ -6,7 +7,7 @@ export function toNotebook({ cells = [], title = "Untitled", theme = "air", read
         readOnly
     };
 }
-export function toCell({ id, value = "", mode = "js", pinned = defaultPinned(mode), hidden = false, output, format = mode === "node" ? "buffer" : undefined, database = mode === "sql" ? "var:db" : undefined, since }) {
+export function toCell({ id, value = "", mode = "js", pinned = defaultPinned(mode), hidden = false, output, format = isInterpreter(mode) ? "buffer" : undefined, database = mode === "sql" ? "var:db" : undefined, since }) {
     return {
         id,
         value,
@@ -14,7 +15,7 @@ export function toCell({ id, value = "", mode = "js", pinned = defaultPinned(mod
         pinned,
         hidden,
         output,
-        format: mode === "node" ? format : undefined,
+        format: isInterpreter(mode) ? format : undefined,
         database: mode === "sql" ? database : undefined,
         since: since !== undefined ? asDate(since) : undefined
     };
@@ -23,5 +24,5 @@ function asDate(date) {
     return date instanceof Date ? date : new Date(date);
 }
 export function defaultPinned(mode) {
-    return mode === "js" || mode === "sql" || mode === "node" || mode === "ojs";
+    return mode === "js" || mode === "sql" || isInterpreter(mode) || mode === "ojs";
 }

package/dist/src/lib/serialize.js

@@ -70,6 +70,8 @@ function serializeMode(mode) {
             return "text/vnd.graphviz";
         case "node":
             return "application/vnd.node.javascript";
+        case "python":
+            return "text/x-python";
         case "ojs":
             return "application/vnd.observable.javascript";
         default:
@@ -90,6 +92,8 @@ function deserializeMode(mode) {
             return "dot";
         case "application/vnd.node.javascript":
             return "node";
+        case "text/x-python":
+            return "python";
         case "application/vnd.observable.javascript":
             return "ojs";
         default:

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

@@ -51,14 +51,14 @@ async function getParser(language) {
         case "js":
         case "ts":
         case "jsx":
-        case "node":
             return (await import("@lezer/javascript")).parser.configure({ dialect: language });
+        case "python":
+            return (await import("@lezer/python")).parser;
         case "html":
             return (await import("@lezer/html")).parser;
         case "css":
             return (await import("@lezer/css")).parser;
         case "md":
-        case "markdown":
             return (await import("@lezer/markdown")).parser;
     }
 }
@@ -68,10 +68,15 @@ function getLanguage(code) {
         ?.slice("language-".length)
         ?.toLowerCase();
     switch (language) {
+        case "node":
         case "javascript":
             return "js";
         case "typescript":
             return "ts";
+        case "py":
+            return "python";
+        case "markdown":
+            return "md";
     }
     return language;
 }

package/dist/src/vite/observable.js

@@ -6,8 +6,8 @@ import { relative } from "node:path/posix";
 import { fileURLToPath } from "node:url";
 import { JSDOM } from "jsdom";
 import { getQueryCachePath } from "../databases/index.js";
-import { getInterpreterCachePath } from "../interpreters/index.js";
-import { getInterpreterMethod } from "../lib/interpreters.js";
+import { getInterpreterCachePath, getInterpreterCommand } from "../interpreters/index.js";
+import { getInterpreterMethod, isInterpreter } from "../lib/interpreters.js";
 import { deserialize } from "../lib/serialize.js";
 import { Sourcemap } from "../javascript/sourcemap.js";
 import { transpile } from "../javascript/transpile.js";
@@ -85,14 +85,14 @@ export function observable({ window = new JSDOM().window, parser = new window.DO
                             cell.value = `FileAttachment(${JSON.stringify(relative(dir, cachePath))}).json().then(DatabaseClient.revive)${hidden ? "" : `.then(Inputs.table)${cell.output ? ".then(view)" : ""}`}`;
                         }
                     }
-                    else if (mode === "node") {
+                    else if (isInterpreter(mode)) {
                         const { filename: sourcePath } = context;
                         const sourceDir = dirname(sourcePath);
                         const cachePath = await getInterpreterCachePath(sourcePath, mode, format, value);
                         if (!existsSync(cachePath)) {
                             await mkdir(dirname(cachePath), { recursive: true });
-                            const args = ["--input-type=module", "--permission", "--allow-fs-read=."];
-                            const child = spawn("node", args, { cwd: sourceDir });
+                            const [command, args] = getInterpreterCommand(mode);
+                            const child = spawn(command, args, { cwd: sourceDir });
                             child.stdin.end(value);
                             child.stderr.pipe(process.stderr);
                             child.stdout.pipe(createWriteStream(cachePath));

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "1.3.0-rc.1",
+  "version": "1.3.0-rc.3",
   "type": "module",
   "scripts": {
     "test": "vitest",
@@ -51,6 +51,7 @@
     "@lezer/html": "^1.3.10",
     "@lezer/javascript": "^1.5.1",
     "@lezer/markdown": "^1.4.3",
+    "@lezer/python": "^1.1.18",
     "@observablehq/inspector": "^5.0.1",
     "@observablehq/parser": "^6.1.0",
     "@observablehq/runtime": "^6.0.0",