@observablehq/notebook-kit 2.5.3 → 2.5.5

package/dist/package.json

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

package/dist/src/javascript/template.js

@@ -123,9 +123,11 @@ function getPrefix(cell) {
 }
 function getDatabase(cell) {
     const { id, database = "var:db", since } = cell;
-    return database.startsWith("var:")
-        ? database.slice("var:".length)
-        : `DatabaseClient(${JSON.stringify(database)}, {id: ${id}${since === undefined ? "" : `, since: ${JSON.stringify(since)}`}})`;
+    if (database.startsWith("var:")) {
+        const name = database.slice("var:".length);
+        return `(await DatabaseClient.of(${name}, ${JSON.stringify(name)}))`;
+    }
+    return `DatabaseClient(${JSON.stringify(database)}, {id: ${id}${since === undefined ? "" : `, since: ${JSON.stringify(since)}`}})`;
 }
 function getSqlPrefix(cell) {
     return `${cell.hidden ? "" : cell.output ? "((_) => (display(Inputs.table(_)), _))(" : "Inputs.table("}await ${getDatabase(cell)}.sql`;

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

@@ -32,6 +32,7 @@ export interface DatabaseClient<T = QueryResult> {
 }
 export declare const DatabaseClient: {
     (name: string, options?: QueryOptionsSpec): DatabaseClient;
+    of: typeof of;
     revive: typeof revive;
     prototype: DatabaseClientImpl;
 };
@@ -42,5 +43,8 @@ declare class DatabaseClientImpl implements DatabaseClient {
     sql<T = QueryResult>(strings: readonly string[], ...params: unknown[]): Promise<T>;
     cachePath(strings: readonly string[], ...params: unknown[]): Promise<string>;
 }
+declare function of(source: unknown, name: string): Promise<{
+    sql: DatabaseClient["sql"];
+}>;
 declare function revive({ rows, schema, date, ...meta }: SerializableQueryResult): QueryResult;
 export {};

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

@@ -40,6 +40,14 @@ class DatabaseClientImpl {
         return `.observable/cache/${await nameHash(this.name)}-${await hash(strings, ...params)}.json`;
     }
 }
+async function of(source, name) {
+    return source != null &&
+        typeof source === "object" &&
+        "sql" in source &&
+        typeof source["sql"] === "function"
+        ? source
+        : (await import("./duckdb.js")).DuckDBClient.of({ [name]: source });
+}
 function revive({ rows, schema, date, ...meta }) {
     for (const column of schema) {
         switch (column.type) {
@@ -72,6 +80,7 @@ function revive({ rows, schema, date, ...meta }) {
 function asDate(value) {
     return new Date(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(?::\d{2})?$/.test(value) ? value + "Z" : value);
 }
+DatabaseClient.of = of;
 DatabaseClient.revive = revive;
 DatabaseClient.prototype = DatabaseClientImpl.prototype; // instanceof
 Object.defineProperty(DatabaseClientImpl, "name", { value: "DatabaseClient" }); // prevent mangling

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

@@ -52,6 +52,9 @@ export declare const library: {
     width: () => ObservableAsyncGenerator<number>;
     DatabaseClient: () => {
         (name: string, options?: import("./databaseClient.js").QueryOptionsSpec): DatabaseClient;
+        of: (source: unknown, name: string) => Promise<{
+            sql: DatabaseClient["sql"];
+        }>;
         revive: ({ rows, schema, date, ...meta }: import("../../databases/index.js").SerializableQueryResult) => import("./databaseClient.js").QueryResult;
         prototype: {
             readonly name: string;

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

@@ -1,10 +1,11 @@
-import slugify from "@sindresorhus/slugify";
+import { slugifyWithCounter } from "@sindresorhus/slugify";
 import MarkdownIt from "markdown-it";
 import MarkdownItAnchor from "markdown-it-anchor";
 const mi = MarkdownIt({ html: true, linkify: true, typographer: true });
+const slugify = slugifyWithCounter();
 mi.use(MarkdownItAnchor, {
     level: [2, 3],
-    slugify: (s) => slugify(s),
+    slugify: (s) => slugify(s).replace(/^(?=\d)/, "-"),
     permalink: MarkdownItAnchor.permalink.headerLink({ class: "" })
 });
 export function MarkdownRenderer({ document = window.document } = {}) {
@@ -42,6 +43,7 @@ export function MarkdownRenderer({ document = window.document } = {}) {
             source += template[i + 1];
         }
         // Render the text.
+        slugify.reset();
         const root = document.createElement("div");
         root.innerHTML = mi.render(source);
         // Walk the rendered content to replace anchor placeholders.

package/package.json

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