@likec4/generators 1.31.0 → 1.32.1

package/src/d2/generate-d2.ts

@@ -1,4 +1,5 @@
-import type { ComputedEdge, ComputedNode, ComputedView, NodeId } from '@likec4/core'
+import type { LikeC4ViewModel } from '@likec4/core/model'
+import type { aux, ComputedNode, NodeId, ProcessedView as AnyView } from '@likec4/core/types'
 import { CompositeGeneratorNode, joinToNode, NL, toString } from 'langium/generate'
 import { isNullish as isNil } from 'remeda'
 
@@ -10,7 +11,10 @@ const nodeName = (node: ComputedNode): string => {
   return fqnName(node.parent ? node.id.slice(node.parent.length + 1) : node.id)
 }
 
-const d2direction = ({ autoLayout }: ComputedView) => {
+type Node = AnyView['nodes'][number]
+type Edge = AnyView['edges'][number]
+
+const d2direction = ({ autoLayout }: AnyView) => {
   switch (autoLayout.direction) {
     case 'TB': {
       return 'down'
@@ -27,7 +31,7 @@ const d2direction = ({ autoLayout }: ComputedView) => {
   }
 }
 
-const d2shape = ({ shape }: ComputedNode) => {
+const d2shape = ({ shape }: Node) => {
   switch (shape) {
     case 'queue':
     case 'cylinder':
@@ -45,11 +49,12 @@ const d2shape = ({ shape }: ComputedNode) => {
   }
 }
 
-export function generateD2<V extends ComputedView>(view: V) {
+export function generateD2(viewmodel: LikeC4ViewModel<aux.Unknown>) {
+  const view = viewmodel.$view
   const { nodes, edges } = view
   const names = new Map<NodeId, string>()
 
-  const printNode = (node: ComputedNode, parentName?: string): CompositeGeneratorNode => {
+  const printNode = (node: Node, parentName?: string): CompositeGeneratorNode => {
     const name = nodeName(node)
     const fqnName = (parentName ? parentName + '.' : '') + name
     names.set(node.id, fqnName)
@@ -69,15 +74,15 @@ export function generateD2<V extends ComputedView>(view: V) {
               NL,
               joinToNode(
                 nodes.filter(n => n.parent === node.id),
-                n => printNode(n, fqnName)
-              )
+                n => printNode(n, fqnName),
+              ),
             ),
-        indentation: 2
+        indentation: 2,
       })
       .append('}', NL)
   }
   //     return `${names.get(edge.source)} -> ${names.get(edge.target)}${edge.label ? ': ' + edge.label : ''}`
-  const printEdge = (edge: ComputedEdge): CompositeGeneratorNode => {
+  const printEdge = (edge: Edge): CompositeGeneratorNode => {
     return new CompositeGeneratorNode()
       .append(names.get(edge.source), ' -> ', names.get(edge.target))
       .append(out => edge.label && out.append(': ', JSON.stringify(edge.label)))
@@ -91,16 +96,16 @@ export function generateD2<V extends ComputedView>(view: V) {
           nodes.filter(n => isNil(n.parent)),
           n => printNode(n),
           {
-            appendNewLineIfNotEmpty: true
-          }
-        )
+            appendNewLineIfNotEmpty: true,
+          },
+        ),
       )
       .appendIf(
         edges.length > 0,
         NL,
         joinToNode(edges, e => printEdge(e), {
-          appendNewLineIfNotEmpty: true
-        })
-      )
+          appendNewLineIfNotEmpty: true,
+        }),
+      ),
   )
 }

package/src/index.ts

@@ -1,6 +1,7 @@
 export { generateD2 } from './d2/generate-d2'
 export { generateMermaid } from './mmd/generate-mmd'
 export { generateLikeC4Model } from './model/generate-likec4-model'
+export { generatePuml } from './puml/generate-puml'
 export { generateReactNext } from './react-next/generate-react-next'
 export { generateReactTypes } from './react/generate-react-types'
 export { generateViewsDataDTs, generateViewsDataJs, generateViewsDataTs } from './views-data-ts/generate-views-data'

package/src/mmd/generate-mmd.spec.ts

@@ -1,15 +1,23 @@
-import { expect, test } from 'vitest'
+import type { LikeC4ViewModel } from '@likec4/core/model'
+import type { aux, ProcessedView } from '@likec4/core/types'
+import { expect, test, vi } from 'vitest'
 import { fakeComputedView3Levels, fakeDiagram, fakeDiagram2 } from '../__mocks__/data'
 import { generateMermaid } from './generate-mmd'
 
+const mockViewModel = vi.fn(function($view: ProcessedView) {
+  return {
+    $view,
+  } as unknown as LikeC4ViewModel<aux.Unknown>
+})
+
 test('generate mermaid - fakeDiagram', () => {
-  expect(generateMermaid(fakeDiagram)).toMatchSnapshot()
+  expect(generateMermaid(mockViewModel(fakeDiagram))).toMatchSnapshot()
 })
 
 test('generate mermaid - fakeDiagram2', () => {
-  expect(generateMermaid(fakeDiagram2)).toMatchSnapshot()
+  expect(generateMermaid(mockViewModel(fakeDiagram2))).toMatchSnapshot()
 })
 
 test('generate mermaid - fakeComputedView 3 Levels', () => {
-  expect(generateMermaid(fakeComputedView3Levels)).toMatchSnapshot()
+  expect(generateMermaid(mockViewModel(fakeComputedView3Levels))).toMatchSnapshot()
 })

package/src/mmd/generate-mmd.ts

@@ -1,16 +1,20 @@
-import type { ComputedEdge, ComputedNode, ComputedView, NodeId } from '@likec4/core'
-import { CompositeGeneratorNode, expandToNode, joinToNode, NL, NLEmpty, toString } from 'langium/generate'
+import type { LikeC4ViewModel } from '@likec4/core/model'
+import type { aux, NodeId, ProcessedView as AnyView } from '@likec4/core/types'
+import { CompositeGeneratorNode, joinToNode, NL, toString } from 'langium/generate'
 import { isNullish as isNil } from 'remeda'
 
 const capitalizeFirstLetter = (value: string) => value.charAt(0).toLocaleUpperCase() + value.slice(1)
 
 const fqnName = (nodeId: string): string => nodeId.split('.').map(capitalizeFirstLetter).join('')
 
-const nodeName = (node: ComputedNode): string => {
+type Node = AnyView['nodes'][number]
+type Edge = AnyView['edges'][number]
+
+const nodeName = (node: Node): string => {
   return fqnName(node.parent ? node.id.slice(node.parent.length + 1) : node.id)
 }
 
-const mmdshape = ({ shape }: ComputedNode): [start: string, end: string] => {
+const mmdshape = ({ shape }: Node): [start: string, end: string] => {
   switch (shape) {
     case 'queue':
     case 'cylinder':
@@ -28,11 +32,12 @@ const mmdshape = ({ shape }: ComputedNode): [start: string, end: string] => {
   }
 }
 
-export function generateMermaid<V extends ComputedView>(view: V) {
+export function generateMermaid(viewmodel: LikeC4ViewModel<aux.Unknown>) {
+  const view = viewmodel.$view
   const { nodes, edges } = view
   const names = new Map<NodeId, string>()
 
-  const printNode = (node: ComputedNode, parentName?: string): CompositeGeneratorNode => {
+  const printNode = (node: Node, parentName?: string): CompositeGeneratorNode => {
     const name = nodeName(node)
     const fqnName = (parentName ? parentName + '.' : '') + name
     names.set(node.id, fqnName)
@@ -50,11 +55,11 @@ export function generateMermaid<V extends ComputedView>(view: V) {
               nodes.filter(n => n.parent === node.id),
               n => printNode(n, fqnName),
               {
-                appendNewLineIfNotEmpty: true
-              }
-            )
+                appendNewLineIfNotEmpty: true,
+              },
+            ),
           ],
-          indentation: 2
+          indentation: 2,
         })
         .append('end', NL)
     } else {
@@ -63,13 +68,13 @@ export function generateMermaid<V extends ComputedView>(view: V) {
     return baseNode
   }
   //     return `${names.get(edge.source)} -> ${names.get(edge.target)}${edge.label ? ': ' + edge.label : ''}`
-  const printEdge = (edge: ComputedEdge): CompositeGeneratorNode => {
+  const printEdge = (edge: Edge): CompositeGeneratorNode => {
     return new CompositeGeneratorNode().append(
       names.get(edge.source),
       ' -.',
       edge.label ? ' "' + edge.label.replaceAll('\n', '\\n') + '" .-' : '-',
       '> ',
-      names.get(edge.target)
+      names.get(edge.target),
     )
   }
 
@@ -82,7 +87,7 @@ export function generateMermaid<V extends ComputedView>(view: V) {
         `title: ${JSON.stringify(view.title)}`,
         NL,
         '---',
-        NL
+        NL,
       )
       .append('graph ', view.autoLayout.direction, NL)
       .indent({
@@ -93,18 +98,18 @@ export function generateMermaid<V extends ComputedView>(view: V) {
                 nodes.filter(n => isNil(n.parent)),
                 n => printNode(n),
                 {
-                  appendNewLineIfNotEmpty: true
-                }
-              )
+                  appendNewLineIfNotEmpty: true,
+                },
+              ),
             )
             .appendIf(
               edges.length > 0,
               joinToNode(edges, e => printEdge(e), {
-                appendNewLineIfNotEmpty: true
-              })
+                appendNewLineIfNotEmpty: true,
+              }),
             )
         },
-        indentation: 2
-      })
+        indentation: 2,
+      }),
   )
 }

package/src/model/__snapshots__/aux.generate-valid-code.snap

@@ -0,0 +1,56 @@
+import type { Aux, SpecAux } from '@likec4/core/types';
+
+export type $Specs = SpecAux<
+  // Element kinds
+  | "actor"
+  | "component"
+  | "system",
+  // Deployment kinds
+  | "env"
+  | "vm",
+  // Relationship kinds
+  | "dislike"
+  | "like",
+  // Tags
+  | "tag1"
+  | "tag2",
+  // Metadata keys
+  | "key1"
+  | "key2"
+>
+
+export type $Aux = Aux<
+  "computed",
+  // Elements
+  | "alice"
+  | "bob"
+  | "cloud"
+  | "cloud.backend"
+  | "cloud.frontend"
+  | "cloud.backend.api"
+  | "cloud.backend.db",
+  // Deployments
+  | "dev"
+  | "prod"
+  | "dev.api"
+  | "dev.vm1"
+  | "prod.vm1"
+  | "prod.vm2",
+  // Views
+  | "view1"
+  | "view2",
+  // Project ID
+  "from-builder",
+  $Specs
+>
+
+export type $ElementId = $Aux['ElementId']
+export type $DeploymentId = $Aux['DeploymentId']
+export type $ViewId = $Aux['ViewId']
+
+export type $ElementKind = $Aux['ElementKind']
+export type $RelationKind = $Aux['RelationKind']
+export type $DeploymentKind = $Aux['DeploymentKind']
+export type $Tag = $Aux['Tag']
+export type $Tags = readonly $Aux['Tag'][]
+export type $MetadataKey = $Aux['MetadataKey']