@likec4/language-server 1.16.0 → 1.17.0

package/src/index.ts

@@ -1,19 +1,19 @@
 import { startLanguageServer as startLanguim } from 'langium/lsp'
-import { NodeFileSystem } from 'langium/node'
 import { createConnection, ProposedFeatures } from 'vscode-languageserver/node'
+import { LikeC4FileSystem } from './LikeC4FileSystem'
 import { createLanguageServices } from './module'
 
 export { logger as lspLogger, setLogLevel } from './logger'
 export type * from './model'
 export type * from './module'
 export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
-
+export { LikeC4FileSystem }
 export function startLanguageServer() {
   /* browser specific setup code */
   const connection = createConnection(ProposedFeatures.all)
 
   // Inject the shared services and language-specific services
-  const services = createLanguageServices({ connection, ...NodeFileSystem })
+  const services = createLanguageServices({ connection, ...LikeC4FileSystem })
 
   // Start the language server with the shared services
   startLanguim(services.shared)

package/src/like-c4.langium

@@ -557,7 +557,7 @@ OpacityProperty:
 
 // Element properties -------------------------------------
 IconProperty:
-  key='icon' ':'? (libicon=[LibIcon:IconId] | value=Uri) ';'?;
+  key='icon' ':'? (libicon=[LibIcon:IconId] | value=('none'|Uri)) ';'?;
 
 ShapeProperty:
   key='shape' ':'? value=ElementShape ';'?;

package/src/lsp/SemanticTokenProvider.ts

@@ -196,6 +196,32 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         property: 'key',
         type: SemanticTokenTypes.property
       })
+      if (ast.isIconProperty(node)) {
+        if (node.libicon) {
+          acceptor({
+            node,
+            property: 'libicon',
+            type: SemanticTokenTypes.enum,
+            modifier: [SemanticTokenModifiers.defaultLibrary]
+          })
+        } else {
+          if (node.value === 'none') {
+            acceptor({
+              node,
+              property: 'value',
+              type: SemanticTokenTypes.enum,
+              modifier: [SemanticTokenModifiers.defaultLibrary]
+            })
+          } else {
+            acceptor({
+              node,
+              property: 'value',
+              type: SemanticTokenTypes.string
+            })
+          }
+        }
+        return 'prune'
+      }
       if ('value' in node && node.value) {
         acceptor({
           node,
@@ -203,14 +229,6 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
           type: SemanticTokenTypes.string
         })
       }
-      if (ast.isIconProperty(node) && node.libicon) {
-        acceptor({
-          node,
-          property: 'libicon',
-          type: SemanticTokenTypes.enum,
-          modifier: [SemanticTokenModifiers.defaultLibrary]
-        })
-      }
       return 'prune'
     }
     if (

package/src/model/fqn-computation.ts

@@ -52,7 +52,9 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
         if (isDefined(el.body) && !isEmpty(el.body.elements)) {
           const fqn = getFqnElementRef(el.element)
           for (const child of el.body.elements) {
-            traverseStack.push([child, fqn])
+            if (!ast.isRelation(child)) {
+              traverseStack.push([child, fqn])
+            }
           }
         }
         continue
@@ -66,7 +68,9 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
         ElementOps.writeId(el, fqn)
         if (isDefined(el.body) && !isEmpty(el.body.elements)) {
           for (const child of el.body.elements) {
-            traverseStack.push([child, fqn])
+            if (!ast.isRelation(child)) {
+              traverseStack.push([child, fqn])
+            }
           }
         }
         continue

package/src/model-graph/compute-view/__test__/fixture.ts

@@ -12,6 +12,7 @@ import {
   type Expression as C4Expression,
   type Fqn,
   type GlobalStyleID,
+  type IconUrl,
   type IncomingExpr as C4IncomingExpr,
   type InOutExpr as C4InOutExpr,
   isElementRef,
@@ -163,6 +164,7 @@ export const fakeElements = {
     id: 'cloud',
     kind: 'system',
     title: 'cloud',
+    icon: 'none',
     tags: ['next', 'old']
   }),
   'cloud.backend': el({
@@ -179,6 +181,7 @@ export const fakeElements = {
   'cloud.backend.graphql': el({
     id: 'cloud.backend.graphql',
     kind: 'component',
+    icon: 'tech:graphql' as IconUrl,
     title: 'graphql'
   }),
   'email': el({
@@ -202,12 +205,14 @@ export const fakeElements = {
     id: 'cloud.frontend.dashboard',
     kind: 'component',
     title: 'dashboard',
+    icon: 'tech:react' as IconUrl,
     tags: ['next']
   }),
   'amazon': el({
     id: 'amazon',
     kind: 'system',
     title: 'amazon',
+    icon: 'tech:aws' as IconUrl,
     tags: ['aws']
   }),
   'amazon.s3': el({
@@ -215,6 +220,7 @@ export const fakeElements = {
     kind: 'component',
     title: 's3',
     shape: 'storage',
+    icon: 'aws:s3' as IconUrl,
     tags: ['aws', 'storage']
   })
 } satisfies Record<string, Element>

package/src/model-graph/compute-view/compute.ts

@@ -181,7 +181,7 @@ export class ComputeCtx {
 
   protected get activeGroup() {
     return this.activeGroupStack[0] ?? this.__rootGroup
-  } 
+  }
 
   protected get includedElements() {
     return new Set([
@@ -283,7 +283,14 @@ export class ComputeCtx {
         ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
         ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep })
       },
-      nodes: map(nodes, omit(['notation'])),
+      nodes: map(nodes, n => {
+        // omit notation
+        delete n.notation
+        if (n.icon === 'none') {
+          delete n.icon
+        }
+        return n
+      }),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...(elementNotations.length > 0 && {
         notation: {

package/src/model-graph/dynamic-view/compute.ts

@@ -208,7 +208,14 @@ export class DynamicViewComputeCtx {
         ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
         ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep })
       },
-      nodes: map(nodes, omit(['notation'])),
+      nodes: map(nodes, n => {
+        // omit notation
+        delete n.notation
+        if (n.icon === 'none') {
+          delete n.icon
+        }
+        return n
+      }),
       edges,
       ...(elementNotations.length > 0 && {
         notation: {

package/src/model-graph/utils/applyCustomElementProperties.ts

@@ -1,7 +1,5 @@
-import { ComputedNode, type Expression, type ViewRule } from '@likec4/core'
-import { Expr, isViewRuleGroup, isViewRulePredicate } from '@likec4/core'
+import { ComputedNode, Expr, type Expression, isViewRuleGroup, isViewRulePredicate, type ViewRule } from '@likec4/core'
 import { isEmpty, isNullish, omitBy } from 'remeda'
-import { NodesGroup } from '../compute-view/compute'
 import { elementExprToPredicate } from './elementExpressionToPredicate'
 
 export function flattenGroupRules<T extends Expression>(guard: (expr: Expression) => expr is T) {