@riebeckite/plugin-plantuml 0.0.31 → 0.0.33

package/README.md

@@ -20,7 +20,7 @@ export default defineConfig({
 });
 ```
 
-`plantuml` is also exported under the alias `plantumlPlugin`.
+`plantuml` is also exported under the alias `plantuml`.
 
 ## Live example
 
@@ -100,7 +100,7 @@ Encoding failures are reported with `file.message(...)`. Diagnostics use
 ## Exports
 
 - `plantuml(options?)` — plugin factory
-- `plantumlPlugin` — alias of `plantuml`
+- `plantuml` — alias of `plantuml`
 - Types: `PlantumlOptions`, `PlantumlFormat`
 
 ## See also

package/README_ja.md

@@ -6,7 +6,7 @@
 
 [English](./README.md)
 
-## 設定する
+## 使い方
 
 ```ts
 import { defineConfig } from "@riebeckite/core";
@@ -18,7 +18,7 @@ export default defineConfig({
 });
 ```
 
-`plantuml` は `plantumlPlugin` という別名でもエクスポートしています。
+`plantuml` は `plantuml` という別名でもエクスポートしています。
 
 ## 実行例
 
@@ -35,7 +35,7 @@ Bob --> Alice: Hi
 ```
 ````
 
-#### 実行例
+#### 描画結果
 
 ```plantuml
 @startuml
@@ -71,7 +71,7 @@ Bob --> Alice: Hi
 
 ## 出力される HTML / CSS
 
-プラグインは `style.css` を公開し、`rb-plantuml`、`rb-plantuml__frame`、`rb-plantuml__image`、`rb-plantuml__caption`、`rb-plantuml__fallback` という安定したクラス名で出力します。CSS 変数 `--rb-color-*` があればそれに追従し、`html[data-theme="dark"]`、または `data-theme` が無いときの `prefers-color-scheme: dark` で暗色に切り替わります。
+プラグインは `style.css` を公開し、`rb-plantuml`、`rb-plantuml__frame`、`rb-plantuml__image`、`rb-plantuml__caption`、`rb-plantuml__fallback` という安定したクラス名で出力します。CSS 変数 `--rb-color-*` があればそれに追従し、`html[data-theme="dark"]`、または `data-theme` が無いときの `prefers-color-scheme: dark` で暗い配色に切り替わります。
 
 ## 診断
 
@@ -86,7 +86,7 @@ Bob --> Alice: Hi
 ## 主なエクスポート
 
 - `plantuml(options?)`: プラグインを作成する
-- `plantumlPlugin`: `plantuml` の別名
+- `plantuml`: `plantuml` の別名
 - 型: `PlantumlOptions`、`PlantumlFormat`
 
 ## 関連資料

package/dist/index.d.ts

@@ -7,4 +7,3 @@ export type { PlantumlFormat, PlantumlOptions } from "./src/types.js";
  * required while building and no client bundle is shipped.
  */
 export declare function plantuml(options?: PlantumlOptions): import("@riebeckite/core").RiebeckitePlugin<PlantumlOptions>;
-export declare const plantumlPlugin: typeof plantuml;

package/dist/index.js

@@ -14,60 +14,30 @@ var __export = (target, all) => {
 };
 
 // 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, text, getTextContent, getStringProperty, hasClass, visitElements;
 var init_hast = __esm({
   "src/hast.ts"() {
+    element = sharedElement;
+    text = sharedText;
+    getTextContent = sharedGetTextContent;
+    getStringProperty = sharedGetStringProperty;
+    hasClass = sharedHasClass;
+    visitElements = sharedVisitElements;
   }
 });
 
 // src/plantuml-encoder.ts
 var plantuml_encoder_exports = {};
 __export(plantuml_encoder_exports, {
-  encodePlantuml: () => encodePlantuml,
-  encodePlantumlBase64: () => encodePlantumlBase64
+  encodePlantuml: () => encodePlantuml
 });
 async function encodePlantuml(source) {
   const { deflateRawSync } = await import("node:zlib");
@@ -172,10 +142,14 @@ function buildFigure(input) {
   );
   if (input.fallback) {
     children.push(
-      element("details", { className: "rb-plantuml__fallback" }, [
-        element("summary", {}, [text("Diagram source")]),
-        element("pre", {}, [element("code", {}, [text(input.source)])])
-      ])
+      element(
+        "details",
+        { className: "rb-plantuml__fallback rb-source-fallback" },
+        [
+          element("summary", {}, [text("Diagram source")]),
+          element("pre", {}, [element("code", {}, [text(input.source)])])
+        ]
+      )
     );
   }
   if (input.caption) {
@@ -269,7 +243,6 @@ function plantuml(options = {}) {
     ]
   });
 }
-var plantumlPlugin = plantuml;
 function validatePlantumlOptions(options) {
   if (!options) return [];
   const issues = [];
@@ -300,6 +273,5 @@ function rehypePlantumlLazy(options = {}) {
   };
 }
 export {
-  plantuml,
-  plantumlPlugin
+  plantuml
 };

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/plantuml-encoder.d.ts

@@ -32,9 +32,3 @@
  */
 /** Encodes PlantUML source into the server URL path segment. */
 export declare function encodePlantuml(source: string): Promise<string>;
-/**
- * Re-encodes raw DEFLATE bytes with PlantUML's custom base64 alphabet.
- * Exposed separately from the compression step so it can be reasoned about
- * (and tested) without a Node runtime.
- */
-export declare function encodePlantumlBase64(bytes: Uint8Array): string;

package/dist/src/types.d.ts

@@ -36,7 +36,7 @@ export type TextNode = {
     type: "text";
     value: string;
 };
-export type RawNode = {
+type RawNode = {
     type: "raw";
     value: string;
 };
@@ -44,3 +44,4 @@ export type HastNode = ElementNode | TextNode | RawNode | {
     type: string;
     [key: string]: unknown;
 };
+export {};

package/package.json

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

package/style.css

@@ -41,29 +41,6 @@
   font-size: 0.875rem;
 }
 
-.rb-plantuml__fallback {
-  align-self: stretch;
-  border-top: 1px solid var(--rb-plantuml-rule);
-  color: var(--rb-plantuml-muted);
-  font-size: 0.8125rem;
-  text-align: left;
-}
-
-.rb-plantuml__fallback summary {
-  cursor: pointer;
-  padding: 0.5rem 0;
-}
-
-.rb-plantuml__fallback pre {
-  overflow: auto;
-  margin: 0;
-  padding: 0.75rem;
-  border-top: 1px solid var(--rb-plantuml-rule);
-  color: var(--rb-plantuml-ink);
-  background: color-mix(in srgb, var(--rb-plantuml-ink) 6%, transparent);
-  text-align: left;
-}
-
 .rb-plantuml__frame:empty::before {
   content: "Diagram could not be rendered.";
   color: var(--rb-plantuml-muted);