@riebeckite/plugin-vega-lite 0.0.31 → 0.0.32

package/dist/client.d.ts

@@ -1,3 +1,7 @@
+type ClientContext = {
+    root?: ParentNode;
+    signal?: AbortSignal;
+};
 /**
  * Renders every server-emitted `[data-vega-lite]` figure in the browser.
  *
@@ -6,4 +10,5 @@
  * `<details>`) when JavaScript is disabled. A broken payload or a Vega error
  * reveals the fallback for that figure without affecting the rest of the page.
  */
-export declare function initVegaLite(): Promise<void>;
+export declare function initVegaLite(context?: ClientContext): Promise<undefined | (() => void)>;
+export {};

package/dist/client.js

@@ -1,9 +1,10 @@
 // client.ts
 var FIGURE_SELECTOR = "[data-vega-lite]";
 var CANVAS_SELECTOR = "[data-vega-lite-canvas]";
-async function initVegaLite() {
+async function initVegaLite(context = {}) {
+  const root = context.root ?? document;
   const figures = Array.from(
-    document.querySelectorAll(FIGURE_SELECTOR)
+    root.querySelectorAll(FIGURE_SELECTOR)
   );
   if (figures.length === 0) return;
   let embed;
@@ -18,33 +19,46 @@ async function initVegaLite() {
     for (const figure of figures) revealFallback(figure);
     return;
   }
+  if (context.signal?.aborted) return;
+  const views = [];
   for (const figure of figures) {
-    await renderFigure(embed, figure);
+    if (context.signal?.aborted || !figure.isConnected) return;
+    const view = await renderFigure(embed, figure, context.signal);
+    if (view) views.push(view);
   }
+  return () => {
+    for (const view of views) view.finalize();
+  };
 }
-async function renderFigure(embed, figure) {
+async function renderFigure(embed, figure, signal) {
   const canvas = figure.querySelector(CANVAS_SELECTOR);
   const serialized = figure.dataset.vegaLiteSpec;
   if (!canvas || !serialized) {
     revealFallback(figure);
-    return;
+    return void 0;
   }
   let spec;
   try {
     spec = JSON.parse(serialized);
   } catch {
     revealFallback(figure);
-    return;
+    return void 0;
   }
   try {
-    await embed(
+    const result = await embed(
       canvas,
       spec,
       buildEmbedOptions(figure)
     );
+    if (signal?.aborted || !figure.isConnected) {
+      result.view.finalize();
+      return void 0;
+    }
     figure.dataset.vegaLite = "rendered";
+    return result.view;
   } catch {
     revealFallback(figure);
+    return void 0;
   }
 }
 function buildEmbedOptions(figure) {

package/dist/index.js

@@ -6,50 +6,20 @@ import {
 } from "@riebeckite/core";
 
 // src/hast.ts
-function visitElements(node, visitor, parent, index) {
-  if (isElementNode(node)) visitor(node, parent, index);
-  for (const [childIndex, child] of [...getChildren(node)].entries()) {
-    visitElements(
-      child,
-      visitor,
-      hasChildren(node) ? node : parent,
-      childIndex
-    );
-  }
-}
-function element(tagName, properties = {}, children = []) {
-  return { type: "element", tagName, properties, children };
-}
-function text(value) {
-  return { type: "text", value };
-}
-function getTextContent(node) {
-  if (node.type === "text" && "value" in node && typeof node.value === "string") {
-    return node.value;
-  }
-  return getChildren(node).map(getTextContent).join("");
-}
-function getStringProperty(node, key) {
-  const value = node.properties?.[key];
-  if (typeof value === "string") return value;
-  if (Array.isArray(value)) return value.join(" ");
-  return null;
-}
-function hasClass(node, className) {
-  const value = node.properties?.className;
-  const classes = Array.isArray(value) ? value.map(String) : typeof value === "string" ? value.split(/\s+/) : [];
-  return classes.includes(className);
-}
-function isElementNode(node) {
-  return node.type === "element";
-}
-function hasChildren(node) {
-  return Array.isArray(node.children);
-}
-function getChildren(node) {
-  const children = node.children;
-  return Array.isArray(children) ? children : [];
-}
+import {
+  element as sharedElement,
+  getStringProperty as sharedGetStringProperty,
+  getTextContent as sharedGetTextContent,
+  hasClass as sharedHasClass,
+  text as sharedText,
+  visitElements as sharedVisitElements
+} from "@riebeckite/diagram";
+var element = sharedElement;
+var text = sharedText;
+var getTextContent = sharedGetTextContent;
+var getStringProperty = sharedGetStringProperty;
+var hasClass = sharedHasClass;
+var visitElements = sharedVisitElements;
 
 // src/rehype.ts
 var DEFAULT_CLASS_NAME = "rb-vega-lite";
@@ -210,7 +180,10 @@ function vegaLite(options = {}) {
       createClientEntry(
         "vega-lite",
         "@riebeckite/plugin-vega-lite/client",
-        "initVegaLite"
+        "initVegaLite",
+        void 0,
+        void 0,
+        "context"
       )
     ]
   });

package/dist/src/hast.d.ts

@@ -1,7 +1,7 @@
 import type { ElementNode, HastNode, ParentNode, TextNode } from "./types.js";
-export declare function visitElements(node: HastNode, visitor: (node: ElementNode, parent?: ParentNode, index?: number) => void, parent?: ParentNode, index?: number): void;
-export declare function element(tagName: string, properties?: Record<string, unknown>, children?: HastNode[]): ElementNode;
-export declare function text(value: string): TextNode;
-export declare function getTextContent(node: HastNode): string;
-export declare function getStringProperty(node: ElementNode, key: string): string | null;
-export declare function hasClass(node: ElementNode, className: string): boolean;
+export declare const element: (tagName: string, properties?: Record<string, unknown>, children?: HastNode[]) => ElementNode;
+export declare const text: (value: string) => TextNode;
+export declare const getTextContent: (node: HastNode) => string;
+export declare const getStringProperty: (node: ElementNode, key: string) => string | null;
+export declare const hasClass: (node: ElementNode, className: string) => boolean;
+export declare const visitElements: (node: HastNode, visitor: (node: ElementNode, parent?: ParentNode, index?: number) => void, parent?: ParentNode, index?: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-vega-lite",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,7 +24,8 @@
     "vega": "^6.4.0",
     "vega-embed": "^7.3.0",
     "vega-lite": "^6.4.3",
-    "@riebeckite/core": "0.0.31"
+    "@riebeckite/core": "0.0.32",
+    "@riebeckite/diagram": "0.0.32"
   },
   "publishConfig": {
     "access": "public"