@riebeckite/plugin-map 0.0.30 → 0.0.32

package/dist/client.js

@@ -4,19 +4,28 @@ var DEFAULT_LEAFLET_STYLE_URL = "https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist
 var DEFAULT_TILE_URL = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
 var DEFAULT_ATTRIBUTION = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
 var leafletPromise = null;
-async function initMap(options = {}) {
+async function initMap(context = {}) {
+  const options = context.config ?? {};
+  const root = context.root ?? document;
   const figures = Array.from(
-    document.querySelectorAll('[data-rr-map="pending"]')
+    root.querySelectorAll('[data-rr-map="pending"]')
   );
   if (figures.length === 0) return;
   const runtime = options.runtime ?? await loadLeaflet(options);
+  if (context.signal?.aborted) return;
   if (!runtime) {
     for (const figure of figures) setError(figure);
     return;
   }
+  const maps = [];
   for (const figure of figures) {
-    renderMap(runtime, figure, options);
+    if (context.signal?.aborted || !figure.isConnected) break;
+    const map = renderMap(runtime, figure, options);
+    if (map) maps.push(map);
   }
+  return () => {
+    for (const map of maps) map.remove();
+  };
 }
 function renderMap(runtime, figure, options) {
   const canvas = figure.querySelector("[data-rr-map-canvas]");
@@ -57,6 +66,7 @@ function renderMap(runtime, figure, options) {
       map.setView([payload.center.lat, payload.center.lng], payload.zoom);
     }
     figure.dataset.rrMap = "rendered";
+    return map;
   } catch {
     setError(figure);
   }

package/dist/index.js

@@ -56,50 +56,20 @@ function clampZoom(value, minimum = 1) {
 }
 
 // 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/parse.ts
 var KEY_VALUE = /^([A-Za-z][\w-]*)\s*:\s*(.*)$/;
@@ -578,7 +548,9 @@ function map(options = {}) {
           attribution: resolved.attribution,
           minZoom: resolved.minZoom,
           maxZoom: resolved.maxZoom
-        }
+        },
+        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/dist/src/init.d.ts

@@ -1,4 +1,9 @@
 import type { MapClientOptions } from "./types.js";
+type ClientContext = {
+    root?: ParentNode;
+    signal?: AbortSignal;
+    config?: MapClientOptions;
+};
 /**
  * Upgrades every server-emitted `[data-rr-map="pending"]` figure to an
  * interactive Leaflet map.
@@ -8,4 +13,5 @@ import type { MapClientOptions } from "./types.js";
  * `data-rr-map-payload`, which means the page still renders its static
  * fallback when JavaScript is disabled or the CDN is unreachable.
  */
-export declare function initMap(options?: MapClientOptions): Promise<void>;
+export declare function initMap(context?: ClientContext): Promise<undefined | (() => void)>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-map",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -21,7 +21,8 @@
     "./style.css": "./style.css"
   },
   "dependencies": {
-    "@riebeckite/core": "0.0.30"
+    "@riebeckite/core": "0.0.32",
+    "@riebeckite/diagram": "0.0.32"
   },
   "publishConfig": {
     "access": "public"