Merge pull request #1811 from finos/main

Merge main to release-1.1

Author: LeighFinegold

.vscode/settings.json

@@ -20,5 +20,5 @@
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
     },
-    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable"
+    "java.jdt.ls.vmargs": "-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx2G -Xms256m"
 }

calm-plugins/vscode/package.json

@@ -2,7 +2,7 @@
     "name": "calm-vscode-plugin",
     "displayName": "CALM Preview & Tools",
     "description": "Live-visualize CALM architecture models, validate, and generate docs.",
-    "version": "0.0.8",
+    "version": "0.0.9",
     "publisher": "FINOS",
     "homepage": "https://calm.finos.org",
     "repository": {

calm-plugins/vscode/src/features/preview/docify-tab/view/docify-tab.view.ts

@@ -211,9 +211,15 @@ export class DocifyTabView {
      * Expected input format: Mermaid typically generates IDs like "flowchart-conference-website-123".
      * This function removes the "flowchart-" prefix and the trailing numeric suffix.
      * 
+     * For nodes with reserved words, the ID may be prefixed with "node_" to avoid Mermaid conflicts.
+     * This function removes that prefix to get the original CALM node ID.
+     * 
      * Example:
      *   Input:  "flowchart-conference-website-123"
      *   Output: "conference-website"
+     *   
+     *   Input:  "flowchart-node_end-user-456"
+     *   Output: "end-user"
      * 
      * @param mermaidId The Mermaid-generated element ID string.
      * @returns The extracted node ID, or null if extraction fails.
@@ -226,9 +232,12 @@ export class DocifyTabView {
         // Match everything except the last segment if it's purely numeric
         const match = cleaned.match(/^(.+?)-\d+$/)
         if (match) {
-            return match[1]
+            cleaned = match[1]
         }
 
+        // Remove the node_ prefix if it was added to avoid Mermaid reserved words
+        cleaned = cleaned.replace(/^node_/, '')
+
         // If no numeric suffix, return the cleaned ID
         return cleaned || null
     }

calm-plugins/vscode/src/features/preview/webview/mermaid-renderer.ts

@@ -81,7 +81,9 @@ export default class MermaidRenderer {
             // Finally, check for any remaining HTML-encoded Mermaid blocks
             const htmlMermaidRegex = /<pre><code class="language-mermaid">([\s\S]*?)<\/code><\/pre>/g
             while ((match = htmlMermaidRegex.exec(html)) !== null) {
-                const mermaidCode = match[1].trim()
+                // Decode HTML entities before rendering
+                const encodedCode = match[1].trim()
+                const mermaidCode = this.decodeHtmlEntities(encodedCode)
                 try {
                     // Generate a unique ID for this diagram
                     const diagramId = `mermaid-${Math.random().toString(36).substr(2, 9)}`
@@ -116,6 +118,15 @@ export default class MermaidRenderer {
         </div>`
     }
 
+    /**
+     * Decode HTML entities from markdown-it output using DOMParser for security
+     */
+    private decodeHtmlEntities(text: string): string {
+        const parser = new DOMParser()
+        const doc = parser.parseFromString(text, 'text/html')
+        return doc.body.textContent || ''
+    }
+
     /**
      * Initialize pan/zoom on a diagram after it's been rendered to the DOM
      * This should be called from the view after the HTML is inserted

calm-widgets/src/widget-helpers.spec.ts

@@ -89,6 +89,45 @@ describe('Widget Helpers', () => {
         });
     });
 
+    describe('mermaidId helper', () => {
+        it('returns sanitized identifiers for Mermaid', () => {
+            expect(helpers.mermaidId('my-node')).toBe('my-node');
+            expect(helpers.mermaidId('service')).toBe('service');
+        });
+
+        it('prefixes IDs that are exactly reserved words', () => {
+            expect(helpers.mermaidId('end')).toBe('node_end');
+            expect(helpers.mermaidId('graph')).toBe('node_graph');
+            expect(helpers.mermaidId('subgraph')).toBe('node_subgraph');
+            expect(helpers.mermaidId('END')).toBe('node_END');
+        });
+
+        it('prefixes IDs that contain reserved words at word boundaries', () => {
+            expect(helpers.mermaidId('end-user')).toBe('node_end-user');
+            expect(helpers.mermaidId('my-end-service')).toBe('node_my-end-service');
+            expect(helpers.mermaidId('graph-node')).toBe('node_graph-node');
+            expect(helpers.mermaidId('node-end')).toBe('node_node-end');
+        });
+
+        it('does not prefix IDs where reserved word is part of a larger word', () => {
+            expect(helpers.mermaidId('endpoint')).toBe('endpoint');
+            expect(helpers.mermaidId('backend')).toBe('backend');
+            expect(helpers.mermaidId('graphql')).toBe('graphql');
+        });
+
+        it('sanitizes special characters', () => {
+            expect(helpers.mermaidId('my/node')).toBe('my_node');
+            expect(helpers.mermaidId('node with spaces')).toBe('node_with_spaces');
+        });
+
+        it('handles non-string input', () => {
+            expect(helpers.mermaidId(null)).toBe('node_empty');
+            expect(helpers.mermaidId(undefined)).toBe('node_empty');
+            expect(helpers.mermaidId(123)).toBe('node_empty');
+            expect(helpers.mermaidId('')).toBe('node_empty');
+        });
+    });
+
     describe('instanceOf helper', () => {
         it('returns true for matching constructor names', () => {
             const obj = new Date();

calm-widgets/src/widget-helpers.ts

@@ -11,6 +11,33 @@ export function registerGlobalTemplateHelpers(): Record<string, (...args: unknow
             return undefined;
         },
         json: (obj: unknown): string => JSON.stringify(obj, null, 2),
+        mermaidId: (id: unknown): string => {
+            if (typeof id !== 'string' || !id) return 'node_empty';
+
+            // Sanitize: replace non-word chars (except hyphen, colon, dot) with underscore
+            const sanitized = id.replace(/[^\w\-:.]/g, '_');
+
+            // Mermaid reserved words that need prefixing
+            const reservedWords = ['graph', 'subgraph', 'end', 'click', 'call', 'class', 'classDef',
+                'style', 'linkStyle', 'direction', 'TB', 'BT', 'RL', 'LR', 'TD', 'BR'];
+
+            // Check if any reserved word appears as a complete word in the ID
+            // Word boundaries are: start of string, end of string, or delimiters (-, _, ., :)
+            for (const reserved of reservedWords) {
+                // Create regex to match the reserved word at word boundaries
+                // \b doesn't work well with hyphens, so we explicitly check boundaries
+                const pattern = new RegExp(
+                    `(^|[-_.:])${reserved.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}($|[-_.:])`,
+                    'i'
+                );
+
+                if (pattern.test(sanitized)) {
+                    return `node_${sanitized}`;
+                }
+            }
+
+            return sanitized;
+        },
         instanceOf: (value: unknown, className: unknown): boolean =>
             typeof className === 'string' &&
             typeof value === 'object' &&

calm-widgets/src/widgets/block-architecture/block-architecture.hbs

@@ -24,26 +24,26 @@ classDef system fill:#fff8e1,stroke:#f9a825,stroke-width:2px,color:#000;
     {{#if ../renderNodeTypeShapes}}
     {{> typed-node.hbs}}
     {{else}}
-    {{id}}["{{label}}"]:::node
+    {{{mermaidId id}}}["{{label}}"]:::node
     {{/if}}
     {{#each interfaces}}
-        {{id}}["{{label}}"]:::iface
+        {{{mermaidId id}}}["{{label}}"]:::iface
     {{/each}}
 {{/each}}
 
 {{!-- Edges --}}
 {{#each edges}}
-    {{source}} -->{{#if label}}|{{label}}|{{/if}} {{target}}
+    {{{mermaidId source}}} -->{{#if label}}|{{label}}|{{/if}} {{{mermaidId target}}}
 {{/each}}
 
 {{!-- Dotted attachments (node -> interface) --}}
 {{#each attachments}}
-    {{from}} -.- {{to}}
+    {{{mermaidId from}}} -.- {{{mermaidId to}}}
 {{/each}}
 
 {{!-- Highlights --}}
 {{#each highlightNodeIds}}
-    class {{this}} highlight
+    class {{{mermaidId this}}} highlight
 {{/each}}
 {{!-- Clickable links for containers + loose nodes --}}
 {{#if linkPrefix}}

calm-widgets/src/widgets/block-architecture/click-links.hbs

@@ -2,32 +2,32 @@
 {{#if id}}
     {{!-- Generate click for the node itself --}}
     {{#if (lookup linkMap id)}}
-click {{id}} "{{lookup linkMap id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{lookup linkMap id}}" "Jump to {{label}}"
     {{else if linkPrefix}}
-click {{id}} "{{linkPrefix}}{{id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{linkPrefix}}{{id}}" "Jump to {{label}}"
     {{/if}}
     {{!-- Generate clicks for interfaces --}}
     {{#each interfaces}}
         {{#if (lookup ../linkMap id)}}
-click {{id}} "{{lookup ../linkMap id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{lookup ../linkMap id}}" "Jump to {{label}}"
         {{else if ../linkPrefix}}
-click {{id}} "{{../linkPrefix}}{{id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{../linkPrefix}}{{id}}" "Jump to {{label}}"
         {{/if}}
     {{/each}}
 {{/if}}
 
 {{!-- Handle container with nodes array --}}
 {{#each nodes}}
     {{#if (lookup ../linkMap id)}}
-click {{id}} "{{lookup ../linkMap id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{lookup ../linkMap id}}" "Jump to {{label}}"
     {{else if ../linkPrefix}}
-click {{id}} "{{../linkPrefix}}{{id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{../linkPrefix}}{{id}}" "Jump to {{label}}"
     {{/if}}
     {{#each interfaces}}
         {{#if (lookup ../../linkMap id)}}
-click {{id}} "{{lookup ../../linkMap id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{lookup ../../linkMap id}}" "Jump to {{label}}"
         {{else if ../../linkPrefix}}
-click {{id}} "{{../../linkPrefix}}{{id}}" "Jump to {{label}}"
+click {{{mermaidId id}}} "{{../../linkPrefix}}{{id}}" "Jump to {{label}}"
         {{/if}}
     {{/each}}
 {{/each}}

calm-widgets/src/widgets/block-architecture/container.hbs

@@ -1,20 +1,20 @@
 {{!-- Only emit a subgraph if it has content --}}
 {{#if (or (gt (length nodes) 0) (gt (length containers) 0))}}
-    subgraph {{id}}["{{label}}"]
+    subgraph {{{mermaidId id}}}["{{label}}"]
     direction TB
     {{#each nodes}}
     {{#if @root.renderNodeTypeShapes}}
         {{> typed-node.hbs}}
     {{else}}
-        {{id}}["{{label}}"]:::node
+        {{{mermaidId id}}}["{{label}}"]:::node
     {{/if}}
         {{#each interfaces}}
-            {{id}}["{{label}}"]:::iface
+            {{{mermaidId id}}}["{{label}}"]:::iface
         {{/each}}
     {{/each}}
     {{#each containers}}
         {{> container.hbs}}
     {{/each}}
     end
-    class {{id}} boundary
+    class {{{mermaidId id}}} boundary
 {{/if}}

calm-widgets/src/widgets/block-architecture/core/utils.spec.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { prettyLabel, labelFor, sanitizeId, ifaceId, pickIface } from './utils';
+import { prettyLabel, labelFor, sanitizeId, ifaceId, pickIface, mermaidId } from './utils';
 import {
     CalmNodeCanonicalModel,
     CalmNodeInterfaceCanonicalModel,
@@ -91,4 +91,42 @@ describe('utils', () => {
             expect(pickIface(ni)).toBeUndefined();
         });
     });
+
+    describe('mermaidId', () => {
+        it('returns sanitized identifiers for Mermaid', () => {
+            expect(mermaidId('my-node')).toBe('my-node');
+            expect(mermaidId('service')).toBe('service');
+        });
+
+        it('prefixes IDs that are exactly reserved words', () => {
+            expect(mermaidId('end')).toBe('node_end');
+            expect(mermaidId('graph')).toBe('node_graph');
+            expect(mermaidId('subgraph')).toBe('node_subgraph');
+            expect(mermaidId('END')).toBe('node_END'); // Case-insensitive check
+        });
+
+        it('prefixes IDs that contain reserved words at word boundaries', () => {
+            expect(mermaidId('end-user')).toBe('node_end-user');
+            expect(mermaidId('my-end-service')).toBe('node_my-end-service');
+            expect(mermaidId('graph-node')).toBe('node_graph-node');
+            expect(mermaidId('node-end')).toBe('node_node-end');
+        });
+
+        it('does not prefix IDs where reserved word is part of a larger word', () => {
+            expect(mermaidId('endpoint')).toBe('endpoint');
+            expect(mermaidId('backend')).toBe('backend');
+            expect(mermaidId('graphql')).toBe('graphql');
+        });
+
+        it('sanitizes special characters', () => {
+            expect(mermaidId('node/with/slashes')).toBe('node_with_slashes');
+            expect(mermaidId('node"with"quotes')).toBe('node_with_quotes');
+        });
+
+        it('handles special cases', () => {
+            expect(mermaidId('my service!')).toBe('my_service_');
+            expect(mermaidId('node:with:colon')).toBe('node:with:colon');
+            expect(mermaidId('')).toBe('node_empty');
+        });
+    });
 });