@likec4/language-server 1.9.0 → 1.10.1

package/src/generated/module.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

package/src/like-c4.langium

@@ -162,7 +162,12 @@ RelationBody: '{'
 ;
 
 RelationProperty:
-  RelationStringProperty | RelationStyleProperty |  LinkProperty | MetadataProperty;
+  RelationStringProperty |
+  RelationNavigateToProperty |
+  RelationStyleProperty |
+  LinkProperty |
+  MetadataProperty
+;
 
 RelationStringProperty:
   key=('title' | 'technology' | 'description') ':'? value=String ';'?;
@@ -183,7 +188,7 @@ MetadataBody: '{'
 ;
 
 MetadataAttribute:
-  key=IdTerminal value=String
+  key=IdTerminal ':'? value=String ';'?
 ;
 
 // Views -------------------------------------
@@ -215,6 +220,9 @@ ViewRef:
 ElementViewRef:
   view=[ElementView];
 
+DynamicViewRef:
+  view=[DynamicView];
+
 ElementViewBody: '{'
   tags=Tags?
   props+=ViewProperty*
@@ -225,8 +233,11 @@ ElementViewBody: '{'
 DynamicViewBody: '{'
   tags=Tags?
   props+=ViewProperty*
-  (steps+=DynamicViewStep | rules+=DynamicViewRule)*
-  '}'
+  (
+    steps+=(DynamicViewParallelSteps | DynamicViewStep) |
+    rules+=DynamicViewRule
+  )*
+'}'
 ;
 
 
@@ -237,7 +248,8 @@ type StringProperty =
   MetadataAttribute |
   SpecificationElementStringProperty |
   SpecificationRelationshipStringProperty |
-  NotationProperty
+  NotationProperty |
+  NotesProperty
 ;
 
 ViewProperty:
@@ -262,6 +274,12 @@ DynamicViewRule:
   ViewRuleAutoLayout
 ;
 
+DynamicViewParallelSteps:
+  ('parallel'|'par') '{'
+    (steps+=DynamicViewStep)*
+  '}'
+;
+
 DynamicViewStep:
   source=ElementRef
   (isBackward?='<-' |  '->' | '-[' kind=[RelationshipKind] ']->' | kind=[RelationshipKind:DotId] )
@@ -426,6 +444,9 @@ ViewRuleAutoLayout:
 NotationProperty:
   key='notation' ':'? value=String ';'?
 ;
+NotesProperty:
+  key='notes' ':'? value=String ';'?
+;
 
 CustomElementProperties: '{'
   props+=(
@@ -439,8 +460,10 @@ CustomElementProperties: '{'
 
 CustomRelationProperties: '{'
   props+=(
+    RelationNavigateToProperty |
     RelationStringProperty |
     NotationProperty |
+    NotesProperty |
     RelationshipStyleProperty
   )*
 '}'
@@ -449,6 +472,9 @@ CustomRelationProperties: '{'
 NavigateToProperty:
   key='navigateTo' value=ViewRef;
 
+RelationNavigateToProperty:
+  key='navigateTo' value=DynamicViewRef;
+
 // Common properties -------------------------------------
 
 LinkProperty:
@@ -565,7 +591,8 @@ fragment IsEqual:
 // Comments
 hidden terminal BLOCK_COMMENT: /\/\*[\s\S]*?\*\//;
 hidden terminal LINE_COMMENT: /\/\/[^\n\r]*/;
-hidden terminal WS: /\s+/;
+hidden terminal WS: /[\t ]+/;
+hidden terminal NL: /[\r\n]+/;
 
 // -----------------------------------
 // Terminals
@@ -593,4 +620,4 @@ terminal String: /"[^"]*"|'[^']*'/;
 // terminal  TagId: HASH LETTER (LETTER | DIGIT | UNDERSCORE | DASH)*;
 // terminal IdTerminal: (LETTER | UNDERSCORE+ (LETTER | DIGIT)) (LETTER | DIGIT | UNDERSCORE | DASH)*;
 terminal IdTerminal:  /[_]*[a-zA-Z][-\w]*/;
-terminal Hex: /[a-zA-Z0-9]+/;
+terminal Hex: /[a-zA-Z0-9]+/;

package/src/lsp/CompletionProvider.ts

@@ -1,7 +1,7 @@
 import { type CompletionProviderOptions, DefaultCompletionProvider } from 'langium/lsp'
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
-  readonly completionOptions = {
+  override readonly completionOptions = {
     triggerCharacters: ['.']
   } satisfies CompletionProviderOptions
 }

package/src/lsp/DocumentLinkProvider.ts

@@ -1,10 +1,10 @@
 import type { LangiumDocument, MaybePromise } from 'langium'
 import { AstUtils, GrammarUtils } from 'langium'
 import type { DocumentLinkProvider } from 'langium/lsp'
-import { hasProtocol, isRelative, withBase } from 'ufo'
+import { hasLeadingSlash, hasProtocol, isRelative, withoutBase, withoutLeadingSlash } from 'ufo'
 import type { DocumentLink, DocumentLinkParams } from 'vscode-languageserver'
 import { ast, isParsedLikeC4LangiumDocument } from '../ast'
-import { logError } from '../logger'
+import { logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 
 export class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
@@ -20,34 +20,46 @@ export class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
     }
     return AstUtils.streamAllContents(doc.parseResult.value)
       .filter(ast.isLinkProperty)
-      .flatMap((n): DocumentLink | Iterable<DocumentLink> => {
+      .map((n): DocumentLink | null => {
         try {
           const range = GrammarUtils.findNodeForProperty(n.$cstNode, 'value')?.range
-          if (!range) {
-            return []
-          }
           const target = this.resolveLink(doc, n.value)
-          return {
-            range,
-            target
+          if (range && hasProtocol(target)) {
+            return {
+              range,
+              target
+            }
           }
         } catch (e) {
-          logError(e)
-          return []
+          logWarnError(e)
         }
+        return null
       })
+      .nonNullable()
       .toArray()
   }
 
   resolveLink(doc: LangiumDocument, link: string): string {
-    if (hasProtocol(link)) {
+    if (hasProtocol(link) || hasLeadingSlash(link)) {
       return link
     }
+    const base = isRelative(link)
+      ? new URL(doc.uri.toString(true))
+      : this.services.shared.workspace.WorkspaceManager.workspaceURL
+    return new URL(link, base).toString()
+  }
+
+  relativeLink(doc: LangiumDocument, link: string): string | null {
+    if (hasLeadingSlash(link)) {
+      return withoutLeadingSlash(link)
+    }
     if (isRelative(link)) {
       const base = new URL(doc.uri.toString(true))
-      return new URL(link, base).toString()
+      const linkURL = new URL(link, base).toString()
+      return withoutLeadingSlash(
+        withoutBase(linkURL, this.services.shared.workspace.WorkspaceManager.workspaceURL.toString())
+      )
     }
-    const workspace = this.services.shared.workspace.WorkspaceManager.workspaceURL
-    return withBase(link, workspace.toString())
+    return null
   }
 }

package/src/lsp/SemanticTokenProvider.ts

@@ -42,7 +42,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.function
       })
     }
-    if (ast.isNavigateToProperty(node)) {
+    if (ast.isNavigateToProperty(node) || ast.isRelationNavigateToProperty(node)) {
       acceptor({
         node,
         property: 'key',

package/src/lsp/index.ts

@@ -4,5 +4,5 @@ export * from './DocumentHighlightProvider'
 export * from './DocumentLinkProvider'
 export * from './DocumentSymbolProvider'
 export * from './HoverProvider'
-export * from './RenameProvider'
+// export * from './RenameProvider'
 export * from './SemanticTokenProvider'

package/src/model/fqn-index.ts

@@ -26,7 +26,6 @@ export class FqnIndex {
     services.shared.workspace.DocumentBuilder.onBuildPhase(
       DocumentState.IndexedContent,
       async (docs, _cancelToken) => {
-        logger.debug(`[FqnIndex] onIndexedContent ${docs.length}:\n` + printDocs(docs))
         for (const doc of docs) {
           if (isLikeC4LangiumDocument(doc)) {
             delete doc.c4fqnIndex

package/src/model/model-builder.ts

@@ -1,24 +1,24 @@
+import type * as c4 from '@likec4/core'
 import {
-  compareByFqnHierarchically,
   compareRelations,
   computeColorValues,
   type CustomColorDefinitions,
   isElementView,
   isScopedElementView,
   parentFqn,
-  type ScopedElementView,
+  sortByFqnHierarchically,
   type ViewID
 } from '@likec4/core'
-import type * as c4 from '@likec4/core'
 import { deepEqual as eq } from 'fast-equals'
 import type { Cancellation, LangiumDocument, LangiumDocuments, URI, WorkspaceCache } from 'langium'
 import { Disposable, DocumentState, interruptAndCheck } from 'langium'
 import {
   filter,
-  find,
   flatMap,
   forEach,
+  groupBy,
   indexBy,
+  isEmpty,
   isNonNullish,
   isNullish,
   isNumber,
@@ -38,7 +38,8 @@ import type {
   ParsedAstRelation,
   ParsedAstSpecification,
   ParsedAstView,
-  ParsedLikeC4LangiumDocument
+  ParsedLikeC4LangiumDocument,
+  ParsedLink
 } from '../ast'
 import { isParsedLikeC4LangiumDocument } from '../ast'
 import { logError, logger, logWarnError } from '../logger'
@@ -60,16 +61,24 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     Object.assign(c4Specification.relationships, spec.relationships)
     Object.assign(c4Specification.colors, spec.colors)
   })
-  const resolveLinks = (doc: LangiumDocument, links: c4.NonEmptyArray<c4.Link>) => {
-    try {
-      return links.map(l => ({
-        ...l,
-        url: services.lsp.DocumentLinkProvider.resolveLink(doc, l.url)
-      })) as c4.NonEmptyArray<c4.Link>
-    } catch (e) {
-      logWarnError(e)
-      return null
-    }
+  function resolveLinks(doc: LangiumDocument, links: c4.NonEmptyArray<ParsedLink>) {
+    return map(
+      links,
+      (link): c4.Link => {
+        try {
+          const relative = services.lsp.DocumentLinkProvider.relativeLink(doc, link.url)
+          if (relative && relative !== link.url) {
+            return {
+              ...link,
+              relative
+            }
+          }
+        } catch (e) {
+          logWarnError(e)
+        }
+        return link
+      }
+    )
   }
 
   const customColorDefinitions: CustomColorDefinitions = mapValues(
@@ -77,7 +86,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     c => computeColorValues(c.color)
   )
 
-  const toModelElement = (doc: LangiumDocument) => {
+  function toModelElement(doc: LangiumDocument) {
     return ({
       tags,
       links: unresolvedLinks,
@@ -112,7 +121,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           ...(color && { color }),
           ...(shape && { shape }),
           ...(icon && { icon }),
-          ...(metadata && { metadata }),
+          ...(metadata && !isEmpty(metadata) && { metadata }),
           ...(__kind.notation && { notation: __kind.notation }),
           style: {
             ...(border && { border }),
@@ -138,7 +147,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     flatMap(d => map(d.c4Elements, toModelElement(d))),
     filter(isTruthy),
     // sort from root elements to nested, so that parent is always present
-    sort(compareByFqnHierarchically),
+    // Import to preserve the order from the source
+    sortByFqnHierarchically,
     reduce(
       (acc, el) => {
         const parent = parentFqn(el.id)
@@ -153,7 +163,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     )
   )
 
-  const toModelRelation = (doc: LangiumDocument) => {
+  function toModelRelation(doc: LangiumDocument) {
     return ({
       astPath,
       source,
@@ -180,7 +190,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           target,
           kind,
           id
-        }
+        } satisfies c4.Relation
       }
       return {
         ...(links && { links }),
@@ -188,7 +198,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         source,
         target,
         id
-      }
+      } satisfies c4.Relation
     }
   }
 
@@ -201,7 +211,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     indexBy(prop('id'))
   )
 
-  const toC4View = (doc: LangiumDocument) => {
+  function toC4View(doc: LangiumDocument) {
     const docUri = doc.uri.toString()
     return (parsedAstView: ParsedAstView): c4.LikeC4View => {
       let {
@@ -210,10 +220,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         description,
         tags,
         links: unresolvedLinks,
-
         // ignore this property
         astPath: _ignore,
-
         // model should include discriminant __
         ...model
       } = parsedAstView
@@ -440,19 +448,22 @@ export class LikeC4ModelBuilder {
         }
         let computedView = result.view
 
-        const allElementViews = values(model.views).filter(
-          (v): v is ScopedElementView => isScopedElementView(v) && v.id !== viewId
+        const allElementViews = pipe(
+          model.views,
+          values(),
+          filter(isScopedElementView),
+          filter(v => v.id !== viewId),
+          groupBy(v => v.viewOf)
         )
 
-        computedView.nodes.forEach(node => {
+        for (const node of computedView.nodes) {
           if (!node.navigateTo) {
-            // find first element view that is not the current one
-            const navigateTo = find(allElementViews, v => v.viewOf === node.id)
-            if (navigateTo) {
-              node.navigateTo = navigateTo.id
+            const viewsOfNode = allElementViews[node.id]
+            if (viewsOfNode) {
+              node.navigateTo = viewsOfNode[0].id
             }
           }
-        })
+        }
 
         const previous = this.previousViews[viewId]
         computedView = previous && eq(computedView, previous) ? previous : computedView

package/src/model/model-parser.ts

@@ -2,7 +2,7 @@ import { type HexColorLiteral, invariant, isNonEmptyArray, nonexhaustive } from
 import type * as c4 from '@likec4/core'
 import type { AstNode, LangiumDocument } from 'langium'
 import { AstUtils, CstUtils } from 'langium'
-import { filter, flatMap, isDefined, isNonNullish, isTruthy, mapToObj, pipe } from 'remeda'
+import { filter, first, flatMap, isDefined, isNonNullish, isTruthy, map, mapToObj, pipe } from 'remeda'
 import stripIndent from 'strip-indent'
 import type { Writable } from 'type-fest'
 import type {
@@ -247,6 +247,14 @@ export class LikeC4ModelParser {
       p => [p.key, p.value]
     )
 
+    const navigateTo = pipe(
+      astNode.body?.props ?? [],
+      filter(ast.isRelationNavigateToProperty),
+      map(p => p.value.view.ref?.name),
+      filter(isTruthy),
+      first()
+    )
+
     const title = removeIndent(astNode.title ?? bodyProps.title) ?? ''
     const description = removeIndent(bodyProps.description)
     const technology = removeIndent(astNode.technology) ?? toSingleLine(bodyProps.technology)
@@ -269,7 +277,8 @@ export class LikeC4ModelParser {
       ...(kind && { kind }),
       ...(tags && { tags }),
       ...(isNonEmptyArray(links) && { links }),
-      ...toRelationshipStyleExcludeDefaults(styleProp?.props)
+      ...toRelationshipStyleExcludeDefaults(styleProp?.props),
+      ...(navigateTo && { navigateTo: navigateTo as c4.ViewID })
     }
   }
 
@@ -514,7 +523,7 @@ export class LikeC4ModelParser {
     const props = astNode.custom?.props ?? []
     return props.reduce(
       (acc, prop) => {
-        if (ast.isRelationStringProperty(prop)) {
+        if (ast.isRelationStringProperty(prop) || ast.isNotationProperty(prop) || ast.isNotesProperty(prop)) {
           if (isDefined(prop.value)) {
             acc.customRelation[prop.key] = removeIndent(prop.value) ?? ''
           }
@@ -539,9 +548,10 @@ export class LikeC4ModelParser {
           }
           return acc
         }
-        if (ast.isNotationProperty(prop)) {
-          if (isTruthy(prop.value)) {
-            acc.customRelation[prop.key] = removeIndent(prop.value)
+        if (ast.isRelationNavigateToProperty(prop)) {
+          const viewId = prop.value.view.ref?.name
+          if (isTruthy(viewId)) {
+            acc.customRelation.navigateTo = viewId as c4.ViewID
           }
           return acc
         }
@@ -624,6 +634,12 @@ export class LikeC4ModelParser {
     }
   }
 
+  private parseDynamicParallelSteps(node: ast.DynamicViewParallelSteps): c4.DynamicViewParallelSteps {
+    return {
+      __parallel: node.steps.map(step => this.parseDynamicStep(step))
+    }
+  }
+
   private parseDynamicStep(node: ast.DynamicViewStep): c4.DynamicViewStep {
     const sourceEl = elementRef(node.source)
     if (!sourceEl) {
@@ -635,9 +651,7 @@ export class LikeC4ModelParser {
     }
     let source = this.resolveFqn(sourceEl)
     let target = this.resolveFqn(targetEl)
-    const title = removeIndent(
-      node.title ?? node.custom?.props.find((p): p is ast.RelationStringProperty => p.key === 'title')?.value
-    ) ?? ''
+    const title = removeIndent(node.title) ?? null
 
     let step: Writable<c4.DynamicViewStep> = {
       source,
@@ -655,31 +669,35 @@ export class LikeC4ModelParser {
     if (Array.isArray(node.custom?.props)) {
       for (const prop of node.custom.props) {
         try {
-          if (ast.isRelationStringProperty(prop)) {
-            const value = removeIndent(prop.value)
-            if (isTruthy(value) && prop.key !== 'title') {
-              step[prop.key] = value
+          if (ast.isRelationStringProperty(prop) || ast.isNotationProperty(prop) || ast.isNotesProperty(prop)) {
+            if (isDefined(prop.value)) {
+              step[prop.key] = removeIndent(prop.value) ?? ''
             }
             continue
           }
           if (ast.isArrowProperty(prop)) {
-            step[prop.key] = prop.value
+            if (isDefined(prop.value)) {
+              step[prop.key] = prop.value
+            }
             continue
           }
           if (ast.isColorProperty(prop)) {
             const value = toColor(prop)
-            if (isTruthy(value)) {
+            if (isDefined(value)) {
               step[prop.key] = value
             }
             continue
           }
           if (ast.isLineProperty(prop)) {
-            step[prop.key] = prop.value
+            if (isDefined(prop.value)) {
+              step[prop.key] = prop.value
+            }
             continue
           }
-          if (ast.isNotationProperty(prop)) {
-            if (isTruthy(prop.value)) {
-              step[prop.key] = prop.value
+          if (ast.isRelationNavigateToProperty(prop)) {
+            const viewId = prop.value.view.ref?.name
+            if (isTruthy(viewId)) {
+              step.navigateTo = viewId as c4.ViewID
             }
             continue
           }
@@ -845,13 +863,17 @@ export class LikeC4ModelParser {
       steps: body.steps.reduce((acc, n) => {
         try {
           if (isValid(n)) {
-            acc.push(this.parseDynamicStep(n))
+            if (ast.isDynamicViewParallelSteps(n)) {
+              acc.push(this.parseDynamicParallelSteps(n))
+            } else {
+              acc.push(this.parseDynamicStep(n))
+            }
           }
         } catch (e) {
           logWarnError(e)
         }
         return acc
-      }, [] as c4.DynamicViewStep[]),
+      }, [] as c4.DynamicViewStepOrParallel[]),
       ...(manualLayout && { manualLayout })
     }
   }