Skip to content

Commit 40083ae

Browse files
stereoboosterstereobooster
committed
vizdom
1 parent d4a1b5f commit 40083ae

File tree

11 files changed

+71
-221
lines changed

11 files changed

+71
-221
lines changed

‎package.json

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
"playwright": "^1.48.0",
1515
"turbo": "^2.1.3",
1616
"typescript": "^5.6.3",
17-
"vite-plugin-top-level-await": "^1.4.4",
18-
"vite-plugin-wasm": "^3.3.0",
1917
"vite-tsconfig-paths": "^5.0.1",
2018
"vitest": "^2.1.2"
2119
},

‎packages/demo/astro.config.mjs

+2-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import { getCache } from "@beoe/cache";
66
import { rehypeGraphviz } from "@beoe/rehype-graphviz";
77
import { rehypeMermaid } from "@beoe/rehype-mermaid";
88
import { rehypeGnuplot } from "@beoe/rehype-gnuplot";
9-
10-
// import wasm from "vite-plugin-wasm";
11-
// import topLevelAwait from "vite-plugin-top-level-await";
129
// import { rehypeVizdom } from "@beoe/rehype-vizdom";
1310

1411
const cache = await getCache();
@@ -43,16 +40,10 @@ export default defineConfig({
4340
{ cache, class: className, strategy: "img-class-dark-mode" },
4441
],
4542
[rehypeGnuplot, { cache, class: className }],
46-
// [rehypeViszdom, { cache, class: className }],
43+
// [rehypeVizdom, { class: className }],
4744
],
4845
},
4946
vite: {
50-
plugins: [
51-
qrcode(),
52-
// wasm(), topLevelAwait()
53-
],
54-
optimizeDeps: {
55-
exclude: ["@vizdom/vizdom-ts-esm"],
56-
},
47+
plugins: [qrcode()],
5748
},
5849
});

‎packages/demo/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
"@beoe/rehype-graphviz": "workspace:*",
2020
"@beoe/rehype-mermaid": "workspace:*",
2121
"@beoe/rehype-vizdom": "workspace:*",
22-
"vite-plugin-top-level-await": "^1.4.4",
23-
"vite-plugin-wasm": "^3.3.0",
2422
"astro": "4.16.2",
2523
"sharp": "^0.33.5",
2624
"typescript": "^5.6.3",

‎packages/demo/src/content/docs/examples/vizdom.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: vizdom
3+
---
4+
5+
## rehype-plugin
6+
7+
```vizdom
8+
digraph X {
9+
a -> b
10+
}
11+
```

‎packages/rehype-vizdom/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
},
3434
"dependencies": {
3535
"@beoe/rehype-code-hook": "workspace:*",
36-
"@ts-graphviz/ast": "^2.0.5",
3736
"@vizdom/vizdom-ts-esm": "^0.1.7",
38-
"svgo": "^3.2.0"
37+
"svgo": "^3.2.0",
38+
"ts-graphviz": "^2.1.4"
3939
},
4040
"devDependencies": {
4141
"@types/hast": "^3.0.4",

‎packages/rehype-vizdom/src/index.ts

+23-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import type { Plugin } from "unified";
22
import type { Root } from "hast";
33
import { rehypeCodeHook, type MapLike } from "@beoe/rehype-code-hook";
44
import { type Config as SvgoConfig } from "svgo";
5-
import { parse, toModel } from "@ts-graphviz/ast";
5+
import { fromDot } from "ts-graphviz";
66
import { processVizdomSvg } from "./vizdom.js";
77
import { DirectedGraph, VertexWeakRef } from "@vizdom/vizdom-ts-esm";
88

99
export async function getSvg(code: string) {
1010
const graph = new DirectedGraph();
11-
const ast = parse(code);
12-
const model = toModel(ast);
11+
const model = fromDot(code);
1312

1413
const nodes: Record<string, VertexWeakRef> = {};
1514
model.nodes.forEach((node) => {
@@ -31,12 +30,30 @@ export async function getSvg(code: string) {
3130

3231
model.edges.forEach((edge) => {
3332
const from = edge.targets[0];
34-
const to = edge.targets[0];
33+
const to = edge.targets[1];
3534

3635
if (Array.isArray(from) || Array.isArray(to)) {
3736
throw new Error("what is it?");
3837
}
3938

39+
if (!nodes[from.id]) {
40+
nodes[from.id] = graph.new_vertex({
41+
render: {
42+
label: from.id,
43+
id: from.id,
44+
},
45+
});
46+
}
47+
48+
if (!nodes[to.id]) {
49+
nodes[to.id] = graph.new_vertex({
50+
render: {
51+
label: to.id,
52+
id: to.id,
53+
},
54+
});
55+
}
56+
4057
graph.new_edge(nodes[from.id], nodes[to.id], {
4158
render: {
4259
pen_width: edge.attributes.get("penwidth"),
@@ -84,8 +101,8 @@ export const rehypeVizdom: Plugin<[RehypeVizdomConfig?], Root> = (
84101
salt,
85102
language: "vizdom",
86103
code: ({ code }) =>
87-
getSvg(code).then((str) =>
88-
processVizdomSvg(str, options.class, options.svgo)
104+
getSvg(code).then(
105+
(str) => processVizdomSvg(str, options.class, options.svgo)
89106
),
90107
});
91108
};

‎packages/rehype-vizdom/src/vizdom.ts

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export const processVizdomSvg = (
3131
className?: string,
3232
config?: SvgoConfig | boolean
3333
) => {
34-
svg = svg.split("\n").slice(6).join("\n");
3534
if (config !== false) {
3635
svg = optimize(
3736
svg,

‎packages/rehype-vizdom/test/fixtures/a.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<figure class="beoe vizdom"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 79.41 116"><g class="graph" transform="translate(4 112)"><path fill="#fff" d="M-4 4v-116h79.41V4z"></path><g class="node"><ellipse cx="35.71" cy="-90" fill="none" stroke="#000" rx="32.49" ry="18"></ellipse><text x="35.71" y="-85.8" font-family="Times,serif" font-size="14" text-anchor="middle">Hello</text></g><g class="node"><ellipse cx="35.71" cy="-18" fill="none" stroke="#000" rx="35.71" ry="18"></ellipse><text x="35.71" y="-13.8" font-family="Times,serif" font-size="14" text-anchor="middle">World</text></g><g class="edge"><path fill="none" stroke="#000" d="M35.71-71.7v24.16"></path><path stroke="#000" d="m39.21-47.62-3.5 10-3.5-10z"></path></g></g></svg></figure>
1+
<figure class="beoe vizdom"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89.816 159.272"><path fill="transparent" stroke="transparent" d="M0 0h89.816v159.272H0z"></path><g stroke="#000"><path fill="none" d="M44.408 47.792v62.688"></path><path d="m44.408 110.48 4-10h-8z"></path></g><path fill="#fff" stroke="#000" d="M13 10h62.816v37.792H13z"></path><path d="M35.281 35.104h-1.437v-5.328h-5.86v5.328h-1.437V23.682h1.437v4.828h5.86v-4.828h1.437Zm6.247-8.734q1.11 0 1.89.484.797.469 1.22 1.344.421.875.421 2.047v.843H39.2q.032 1.453.735 2.22.719.75 2 .75.813 0 1.438-.142.64-.156 1.312-.437v1.219q-.656.297-1.297.422-.64.14-1.515.14-1.22 0-2.157-.484-.937-.5-1.468-1.485-.516-.984-.516-2.406 0-1.406.469-2.406.484-1.016 1.328-1.562.86-.547 2-.547m-.016 1.156q-1.015 0-1.593.656-.579.64-.688 1.781h4.36q0-.734-.235-1.265-.219-.547-.672-.86t-1.172-.312m7.134 7.578h-1.407V22.948h1.407Zm4.128 0h-1.407V22.948h1.407Zm10.175-4.297q0 1.063-.282 1.89-.281.829-.797 1.407-.515.563-1.265.86-.735.296-1.656.296-.844 0-1.563-.297t-1.25-.859q-.531-.578-.828-1.406t-.297-1.89q0-1.438.484-2.423.485-.984 1.375-1.5.891-.515 2.125-.515 1.172 0 2.063.515.89.516 1.39 1.5.5.985.5 2.422m-6.47 0q0 1 .25 1.75.266.734.829 1.14.562.391 1.422.391.875 0 1.422-.39.562-.407.828-1.14.265-.75.265-1.75 0-1.032-.28-1.75-.267-.72-.813-1.11-.547-.39-1.438-.39-1.312 0-1.906.858-.578.86-.578 2.391"></path><path fill="#fff" stroke="#000" d="M10 110.48h68.816v37.792H10z"></path><path d="m36.672 124.162-3.047 11.422h-1.453l-2.219-7.484q-.094-.344-.203-.688-.094-.36-.172-.672-.078-.328-.14-.547-.047-.234-.063-.359-.016.125-.062.36-.032.218-.11.546-.078.313-.172.672t-.203.734l-2.156 7.438h-1.453l-3.032-11.422h1.516l1.766 6.969q.093.375.172.734.093.36.156.703.078.344.125.672.047.313.094.61.047-.313.093-.641.063-.344.141-.703l.188-.719q.093-.375.187-.734l2.016-6.89h1.484l2.094 6.937q.125.375.218.75.094.375.172.734.078.344.125.672.063.328.11.594.047-.391.125-.828.093-.454.203-.922.11-.485.234-.985l1.766-6.953Zm8.7 7.125q0 1.063-.28 1.89-.282.829-.798 1.407-.515.563-1.265.86-.735.296-1.657.296-.843 0-1.562-.297t-1.25-.859q-.531-.578-.828-1.406t-.297-1.89q0-1.438.484-2.423.485-.984 1.375-1.5.891-.515 2.125-.515 1.172 0 2.063.515.89.516 1.39 1.5.5.985.5 2.422m-6.468 0q0 1 .25 1.75.265.734.828 1.14.562.391 1.422.391.875 0 1.422-.39.562-.406.828-1.14.265-.75.265-1.75 0-1.032-.28-1.75-.267-.72-.813-1.11-.547-.39-1.438-.39-1.312 0-1.906.858-.578.86-.578 2.391m12.695-4.437q.235 0 .516.03.281.017.5.063l-.187 1.297q-.204-.047-.454-.078t-.468-.031q-.5 0-.953.203-.438.203-.797.594-.344.375-.547.906-.203.516-.203 1.172v4.578h-1.407v-8.578h1.157l.156 1.562h.062q.282-.468.657-.859.39-.39.875-.625.5-.234 1.093-.234m4.015 8.734h-1.407v-12.156h1.407Zm5.768.156q-1.61 0-2.578-1.11-.953-1.108-.953-3.312 0-2.218.969-3.343t2.578-1.125q.672 0 1.156.172.5.156.86.453.375.28.64.64h.094q-.016-.219-.063-.625-.03-.406-.03-.64v-3.422h1.405v12.156h-1.14l-.203-1.156h-.063q-.265.375-.64.672-.36.297-.86.468t-1.172.172m.219-1.172q1.36 0 1.906-.734.563-.75.563-2.25v-.25q0-1.61-.531-2.453-.532-.86-1.954-.86-1.14 0-1.703.907-.562.89-.562 2.422 0 1.53.562 2.375.563.843 1.719.843"></path></svg></figure>

‎packages/rehype-vizdom/test/fixtures/a.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
```dot
1+
```vizdom
22
digraph G { Hello -> World }
33
```

0 commit comments

Comments
 (0)