@dxos/plugin-mermaid 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,13 +1,20 @@
 {
   "name": "@dxos/plugin-mermaid",
-  "version": "0.8.4-main.f5c0578",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "Mermaid markdown plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#meta": "./src/meta.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -24,34 +31,36 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "effect": "3.17.7",
-    "mermaid": "^10.6.1",
-    "@dxos/app-framework": "0.8.4-main.f5c0578",
-    "@dxos/plugin-space": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-editor": "0.8.4-main.f5c0578",
-    "@dxos/plugin-markdown": "0.8.4-main.f5c0578"
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "mermaid": "^10.9.4",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-markdown": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-editor": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-editor": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-space": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-schema": "0.8.4-main.f5c0578",
-    "@dxos/react-ui": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578",
-    "@dxos/storybook-utils": "0.8.4-main.f5c0578"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/MermaidPlugin.tsx

@@ -2,17 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Capability, Plugin } from '@dxos/app-framework';
 import { MarkdownCapabilities, MarkdownEvents } from '@dxos/plugin-markdown';
 
+import { meta } from '#meta';
+
 import { mermaid } from './extensions';
-import { meta } from './meta';
 
-export const MermaidPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/markdown`,
-      activatesOn: MarkdownEvents.SetupExtensions,
-      activate: () => contributes(MarkdownCapabilities.Extensions, [mermaid]),
-    }),
-  ]);
+export const MermaidPlugin = Plugin.define(meta).pipe(
+  Plugin.addModule({
+    id: 'markdown',
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: () => Effect.succeed(Capability.contributes(MarkdownCapabilities.Extensions, [mermaid])),
+  }),
+  Plugin.make,
+);

package/src/extensions/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './mermaid';
+export * from './mermaid-extension';

package/src/extensions/mermaid-extension.ts

@@ -0,0 +1,215 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { syntaxTree } from '@codemirror/language';
+import { type Extension } from '@codemirror/state';
+import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate, WidgetType } from '@codemirror/view';
+import _mermaid from 'mermaid';
+
+export type MermaidOptions = {};
+
+/**
+ * Extension to create mermaid diagrams.
+ */
+export const mermaid = (_options: MermaidOptions = {}): Extension => {
+  return [
+    ViewPlugin.fromClass(
+      class {
+        decorations: DecorationSet;
+
+        constructor(view: EditorView) {
+          this.decorations = this.buildDecorations(view);
+        }
+
+        update(update: ViewUpdate) {
+          // Always rebuild decorations when selection changes to handle arrow key navigation.
+          if (update.docChanged || update.viewportChanged || update.selectionSet || update.focusChanged) {
+            this.decorations = this.buildDecorations(update.view);
+          }
+        }
+
+        buildDecorations(view: EditorView): DecorationSet {
+          const decorations: Array<{ from: number; to: number; decoration: Decoration }> = [];
+
+          syntaxTree(view.state).iterate({
+            enter: (node) => {
+              if (node.name === 'FencedCode') {
+                const cursor = view.state.selection.main.head;
+                // Show widget when cursor is outside the code block.
+                // Add a buffer of 1 position before and after to handle edge cases.
+                const showWidget = view.state.readOnly || cursor < node.from - 1 || cursor > node.to + 1;
+                if (showWidget) {
+                  const info = node.node.getChild('CodeInfo');
+                  if (info) {
+                    const type = view.state.sliceDoc(info.from, info.to);
+                    const text = node.node.getChild('CodeText');
+                    if (type === 'mermaid' && text) {
+                      const content = view.state.sliceDoc(text.from, text.to).trim();
+                      const label = content.split(' ')[0];
+
+                      // Create widget.
+                      const widget = new MermaidWidget(`mermaid-${node.from}`, content, label);
+
+                      // Find the line after the code block to place the widget.
+                      const endLine = view.state.doc.lineAt(node.to);
+                      const nextLinePos = endLine.to + 1;
+
+                      // Add widget after the code block.
+                      if (nextLinePos <= view.state.doc.length) {
+                        decorations.push({
+                          from: nextLinePos,
+                          to: nextLinePos,
+                          decoration: Decoration.widget({
+                            widget,
+                          }),
+                        });
+                      } else {
+                        // Check if at the end of the document.
+                        decorations.push({
+                          from: endLine.to,
+                          to: endLine.to,
+                          decoration: Decoration.widget({
+                            widget,
+                            side: 1,
+                          }),
+                        });
+                      }
+
+                      // Hide each line of the code block.
+                      const startLine = view.state.doc.lineAt(node.from);
+                      for (let lineNum = startLine.number; lineNum <= endLine.number; lineNum++) {
+                        const line = view.state.doc.line(lineNum);
+                        decorations.push({
+                          from: line.from,
+                          to: line.from,
+                          decoration: Decoration.line({
+                            class: 'cm-mermaid-hidden',
+                          }),
+                        });
+                      }
+                    }
+                  }
+                }
+              }
+            },
+          });
+
+          return Decoration.set(
+            decorations.sort((a, b) => a.from - b.from || a.to - b.to).map((d) => d.decoration.range(d.from, d.to)),
+          );
+        }
+      },
+      {
+        decorations: (v) => v.decorations,
+      },
+    ),
+    EditorView.theme({
+      '& .cm-mermaid': {
+        position: 'relative',
+        display: 'inline-flex',
+        width: '100%',
+        maring: '4px 0',
+        padding: '16px',
+        justifyContent: 'center',
+        backgroundColor: 'var(--color-group-surface)',
+        borderRadius: '8px',
+      },
+      '& .cm-mermaid-label': {
+        position: 'absolute',
+        right: '16px',
+        fontFamily: 'unset',
+        color: 'var(--color-subdued)',
+      },
+      '& .cm-mermaid-error': {
+        display: 'inline-block',
+        color: 'var(--color-error)',
+      },
+      '& .cm-mermaid-hidden': {
+        display: 'none !important',
+      },
+    }),
+  ];
+};
+
+class MermaidWidget extends WidgetType {
+  _svg: string | undefined;
+  _error: string | undefined;
+
+  // TODO(burdon): Mermaid API requires unique id.
+  constructor(
+    private readonly _id: string,
+    private readonly _source: string,
+    private readonly _label?: string,
+  ) {
+    super();
+  }
+
+  override eq(other: this) {
+    return this._source === other._source;
+  }
+
+  override ignoreEvent(ev: Event) {
+    return !/^mouse/.test(ev.type);
+  }
+
+  override toDOM(view: EditorView) {
+    const div = document.createElement('div');
+    div.className = 'cm-mermaid';
+
+    setTimeout(async () => {
+      // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.type.ts
+      _mermaid.initialize({
+        darkMode: view.state.facet(EditorView.darkTheme),
+        theme: 'neutral',
+        // TODO(burdon): Styles.
+        // NOTE: Must specify 'base' in order to override.
+        // theme: 'base',
+        // themeVariables: {
+        //   primaryColor: getToken('extend.colors.red.100'),
+        //   primaryBorderColor: getToken('extend.colors.neutral.200'),
+        // },
+        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/flowchart/styles.ts
+        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/sequence/styles.js
+        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/state/styles.js
+        // themeCSS: '.node rect { fill: red; }',
+      });
+
+      // TODO(burdon): Cache?
+      const svg = await this.render(div);
+      if (this._error) {
+        div.className = 'cm-mermaid-error';
+        div.innerText = this._error;
+      } else {
+        div.className = 'cm-mermaid';
+        div.innerHTML = svg!;
+
+        if (this._label) {
+          const label = document.createElement('span');
+          label.innerText = this._label;
+          label.className = 'cm-mermaid-label';
+          div.appendChild(label);
+          view.requestMeasure();
+        }
+      }
+    });
+
+    return div;
+  }
+
+  async render(_container: Element): Promise<string | undefined> {
+    try {
+      // https://github.com/mermaid-js/mermaid
+      const valid = await _mermaid.parse(this._source);
+      if (valid) {
+        const result = await _mermaid.render(this._id, this._source);
+        this._error = undefined;
+        this._svg = result.svg;
+        return result.svg;
+      }
+    } catch (err: any) {
+      this._error = String(err);
+      this._svg = undefined;
+    }
+  }
+}

package/src/extensions/mermaid.stories.tsx

@@ -2,39 +2,36 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { useThemeContext } from '@dxos/react-ui';
+import { useTextEditor } from '@dxos/react-ui-editor';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import {
   createBasicExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
   decorateMarkdown,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+} from '@dxos/ui-editor';
 
-import { mermaid } from './mermaid';
+import { mermaid } from './mermaid-extension';
 
 const str = (...lines: string[]) => lines.join('\n');
 
-type StoryProps = {
+type DefaultStoryProps = {
   text?: string;
 };
 
-const DefaultStory = ({ text }: StoryProps) => {
+const DefaultStory = ({ text }: DefaultStoryProps) => {
   const { themeMode } = useThemeContext();
   const { parentRef, focusAttributes } = useTextEditor(
     () => ({
       initialValue: text,
       extensions: [
         createBasicExtensions(),
-        createMarkdownExtensions({ themeMode }),
+        createMarkdownExtensions(),
         createThemeExtensions({ themeMode, syntaxHighlighting: true }),
-        // TODO(burdon): Bug if mermaid extension is provided after decorateMarkdown.
         mermaid(),
         decorateMarkdown(),
       ],
@@ -45,7 +42,17 @@ const DefaultStory = ({ text }: StoryProps) => {
   return <div className='w-[50rem]' ref={parentRef} {...focusAttributes} />;
 };
 
-export const Default = {
+const meta = {
+  title: 'plugins/plugin-mermaid/extensions/mermaid',
+  render: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
   args: {
     text: str(
       '# Mermaid',
@@ -68,7 +75,7 @@ export const Default = {
   },
 };
 
-export const Error = {
+export const Error: Story = {
   args: {
     text: str(
       '# Mermaid',
@@ -85,11 +92,3 @@ export const Error = {
     ),
   },
 };
-
-const meta: Meta = {
-  title: 'plugins/plugin-mermaid/extensions',
-  render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
-};
-
-export default meta;

package/src/meta.ts

@@ -2,14 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
-export const MERMAID_PLUGIN = 'dxos.org/plugin/mermaid';
-
-export const meta: PluginMeta = {
-  id: MERMAID_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.mermaid',
   name: 'Mermaid',
-  description: 'Tool that renders text definitions to create diagrams.',
+  description: trim`
+    Generate diagrams from simple text-based definitions using Mermaid syntax.
+    Create flowcharts, sequence diagrams, and other visualizations that stay in sync with your documentation.
+  `,
   icon: 'ph--anchor-simple--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-mermaid',
 };

package/dist/types/src/extensions/mermaid.d.ts

@@ -1,4 +0,0 @@
-import { type Extension } from '@codemirror/state';
-export type MermaidOptions = {};
-export declare const mermaid: (options?: MermaidOptions) => Extension;
-//# sourceMappingURL=mermaid.d.ts.map

package/dist/types/src/extensions/mermaid.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../../../src/extensions/mermaid.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,SAAS,EAKf,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC;AAEhC,eAAO,MAAM,OAAO,GAAI,UAAS,cAAmB,KAAG,SAStD,CAAC"}

package/src/extensions/mermaid.ts

@@ -1,155 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { syntaxTree } from '@codemirror/language';
-import {
-  type EditorState,
-  type Extension,
-  type RangeSet,
-  RangeSetBuilder,
-  StateField,
-  type Transaction,
-} from '@codemirror/state';
-import { Decoration, EditorView, WidgetType } from '@codemirror/view';
-import _mermaid from 'mermaid';
-
-export type MermaidOptions = {};
-
-export const mermaid = (options: MermaidOptions = {}): Extension => {
-  return [
-    StateField.define<RangeSet<Decoration>>({
-      create: (state) => update(state, options),
-      update: (_: RangeSet<Decoration>, tr: Transaction) => update(tr.state, options),
-      provide: (field) => EditorView.decorations.from(field),
-    }),
-    styles,
-  ];
-};
-
-const update = (state: EditorState, options: MermaidOptions) => {
-  const builder = new RangeSetBuilder<Decoration>();
-  syntaxTree(state).iterate({
-    enter: (node) => {
-      if (node.name === 'FencedCode') {
-        const cursor = state.selection.main.head;
-        if (state.readOnly || cursor < node.from || cursor > node.to) {
-          const info = node.node.getChild('CodeInfo');
-          if (info) {
-            const type = state.sliceDoc(info.from, info.to);
-            const text = node.node.getChild('CodeText');
-            if (type === 'mermaid' && text) {
-              const content = state.sliceDoc(text.from, text.to);
-              // TODO(burdon): Error if extension defined AFTER decorateMarkdown.
-              //  Decorations that replace line breaks may not be specified via plugins
-              builder.add(
-                node.from,
-                node.to,
-                Decoration.replace({
-                  widget: new MermaidWidget(`mermaid-${node.from}`, content),
-                }),
-              );
-            }
-          }
-        }
-      }
-    },
-  });
-
-  return builder.finish();
-};
-
-class MermaidWidget extends WidgetType {
-  _svg: string | undefined;
-  _error: string | undefined;
-
-  // TODO(burdon): Mermaid API requires unique id.
-  constructor(
-    private readonly _id: string,
-    private readonly _source: string,
-  ) {
-    super();
-  }
-
-  override eq(other: this): boolean {
-    return this._source === other._source;
-  }
-
-  override toDOM(view: EditorView): HTMLDivElement {
-    const div = document.createElement('div');
-    setTimeout(async () => {
-      // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.type.ts
-      _mermaid.initialize({
-        darkMode: view.state.facet(EditorView.darkTheme),
-        theme: 'neutral',
-        // TODO(burdon): Styles.
-        // NOTE: Must specify 'base' in order to override.
-        // theme: 'base',
-        // themeVariables: {
-        //   primaryColor: getToken('extend.colors.red.100'),
-        //   primaryBorderColor: getToken('extend.colors.neutral.200'),
-        // },
-        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/flowchart/styles.ts
-        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/sequence/styles.js
-        // https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/diagrams/state/styles.js
-        // themeCSS: '.node rect { fill: red; }',
-      });
-
-      // TODO(burdon): Cache?
-      const svg = await this.render(div);
-      if (this._error) {
-        div.className = 'cm-mermaid-error';
-        div.innerText = this._error;
-      } else {
-        div.className = 'cm-mermaid';
-        div.innerHTML = svg!;
-
-        // const label = document.createElement('span');
-        // label.innerText = 'Mermaid';
-        // label.className = 'cm-mermaid-label';
-        // wrapper.appendChild(label);
-        view.requestMeasure();
-      }
-    });
-
-    return div;
-  }
-
-  async render(container: Element): Promise<string | undefined> {
-    try {
-      // https://github.com/mermaid-js/mermaid
-      const valid = await _mermaid.parse(this._source);
-      if (valid) {
-        const result = await _mermaid.render(this._id, this._source);
-        this._error = undefined;
-        this._svg = result.svg;
-        return result.svg;
-      }
-    } catch (err: any) {
-      this._error = String(err);
-      this._svg = undefined;
-    }
-  }
-
-  override ignoreEvent(e: Event): boolean {
-    return !/^mouse/.test(e.type);
-  }
-}
-
-const styles = EditorView.theme({
-  '& .cm-mermaid': {
-    position: 'relative',
-    display: 'inline-flex',
-    width: '100%',
-    justifyContent: 'center',
-  },
-  // '& .cm-mermaid-label': {
-  //   position: 'absolute',
-  //   right: 0,
-  //   textSize: 10,
-  // },
-  '& .cm-mermaid-error': {
-    display: 'inline-block',
-    color: 'var(--dx-errorText)',
-  },
-});