@likec4/generators 0.50.0 → 0.52.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "0.50.0",
+  "version": "0.52.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -34,16 +34,16 @@
     "test": "run -T vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.50.0",
+    "@likec4/core": "0.52.0",
     "json5": "^2.2.3",
     "langium": "^2.1.3",
     "rambdax": "^9.1.1"
   },
   "devDependencies": {
-    "@types/node": "^20.10.1",
-    "typescript": "^5.3.2",
+    "@types/node": "^20.10.4",
+    "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^0.34.6"
+    "vitest": "^1.0.4"
   },
   "packageManager": "yarn@4.0.2",
   "volta": {

package/src/d2/generate-d2.ts

@@ -55,7 +55,7 @@ export function generateD2<V extends ComputedView>(view: V) {
     const fqnName = (parentName ? parentName + '.' : '') + name
     names.set(node.id, fqnName)
 
-    const label = node.title.replaceAll('\n', '\\n')
+    const label = JSON.stringify(node.title)
     const shape = d2shape(node)
 
     return new CompositeGeneratorNode()
@@ -63,7 +63,7 @@ export function generateD2<V extends ComputedView>(view: V) {
       .indent({
         indentedChildren: indent =>
           indent
-            .append('label: "', label, '"', NL)
+            .append('label: ', label, NL)
             .appendIf(shape !== 'rectangle', 'shape: ', shape, NL)
             .appendIf(
               node.children.length > 0,
@@ -81,7 +81,7 @@ export function generateD2<V extends ComputedView>(view: V) {
   const printEdge = (edge: ComputedEdge): CompositeGeneratorNode => {
     return new CompositeGeneratorNode()
       .append(names.get(edge.source), ' -> ', names.get(edge.target))
-      .append(out => edge.label && out.append(': ', edge.label.replaceAll('\n', '\\n')))
+      .append(out => edge.label && out.append(': ', JSON.stringify(edge.label)))
   }
 
   return toString(

package/src/mmd/generate-mmd.ts

@@ -1,5 +1,5 @@
 import type { ComputedEdge, ComputedNode, ComputedView, NodeId } from '@likec4/core'
-import { CompositeGeneratorNode, NL, joinToNode, toString } from 'langium'
+import { CompositeGeneratorNode, NL, NLEmpty, expandToNode, joinToNode, toString } from 'langium'
 import { isNil } from 'rambdax'
 
 const capitalizeFirstLetter = (value: string) =>
@@ -44,22 +44,22 @@ export function generateMermaid<V extends ComputedView>(view: V) {
     const baseNode = new CompositeGeneratorNode()
     if (node.children.length > 0) {
       baseNode
-        .append('subgraph ', fqnName, '["', label, '"]', NL)
+        .append('subgraph ', fqnName, '[', JSON.stringify(node.title), ']', NL)
         .indent({
-          indentedChildren: indent =>
-            indent.appendIf(
-              node.children.length > 0,
-              NL,
-              joinToNode(
-                nodes.filter(n => n.parent === node.id),
-                n => printNode(n, fqnName)
-              )
-            ),
+          indentedChildren: [
+            joinToNode(
+              nodes.filter(n => n.parent === node.id),
+              n => printNode(n, fqnName),
+              {
+                appendNewLineIfNotEmpty: true
+              }
+            )
+          ],
           indentation: 2
         })
         .append('end', NL)
     } else {
-      baseNode.append(fqnName, shape[0], label, shape[1], NL)
+      baseNode.append(fqnName, shape[0], label, shape[1])
     }
     return baseNode
   }
@@ -67,8 +67,8 @@ export function generateMermaid<V extends ComputedView>(view: V) {
   const printEdge = (edge: ComputedEdge): CompositeGeneratorNode => {
     return new CompositeGeneratorNode().append(
       names.get(edge.source),
-      ' --',
-      edge.label ? '"' + edge.label.replaceAll('\n', '\\n') + '"--' : '',
+      ' -.',
+      edge.label ? ' "' + edge.label.replaceAll('\n', '\\n') + '" .-' : '-',
       '> ',
       names.get(edge.target)
     )
@@ -80,27 +80,32 @@ export function generateMermaid<V extends ComputedView>(view: V) {
         view.title !== null && view.title.length > 0,
         '---',
         NL,
-        `title: ${view.title}`,
+        `title: ${JSON.stringify(view.title)}`,
         NL,
         '---',
         NL
       )
-      .append('graph ', view.autoLayout, NL, NL)
-      .append(
-        joinToNode(
-          nodes.filter(n => isNil(n.parent)),
-          n => printNode(n),
-          {
-            appendNewLineIfNotEmpty: true
-          }
-        )
-      )
-      .appendIf(
-        edges.length > 0,
-        NL,
-        joinToNode(edges, e => printEdge(e), {
-          appendNewLineIfNotEmpty: true
-        })
-      )
+      .append('graph ', view.autoLayout, NL)
+      .indent({
+        indentedChildren: indent => {
+          indent
+            .append(
+              joinToNode(
+                nodes.filter(n => isNil(n.parent)),
+                n => printNode(n),
+                {
+                  appendNewLineIfNotEmpty: true
+                }
+              )
+            )
+            .appendIf(
+              edges.length > 0,
+              joinToNode(edges, e => printEdge(e), {
+                appendNewLineIfNotEmpty: true
+              })
+            )
+        },
+        indentation: 2
+      })
   )
 }