@likec4/language-server 1.8.0 → 1.9.0

package/src/model/model-builder.ts

@@ -1,12 +1,15 @@
 import {
-  type c4,
   compareByFqnHierarchically,
+  compareRelations,
+  computeColorValues,
+  type CustomColorDefinitions,
   isElementView,
   isScopedElementView,
   parentFqn,
   type ScopedElementView,
   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'
@@ -15,14 +18,18 @@ import {
   find,
   flatMap,
   forEach,
+  indexBy,
+  isNonNullish,
   isNullish,
   isNumber,
   isTruthy,
   map,
   mapToObj,
+  mapValues,
   pipe,
   prop,
   reduce,
+  reverse,
   sort,
   values
 } from 'remeda'
@@ -40,26 +47,40 @@ import type { LikeC4Services } from '../module'
 import { printDocs } from '../utils/printDocs'
 import { assignNavigateTo, resolveRelativePaths, resolveRulesExtendedViews } from '../view-utils'
 
-function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[]): c4.LikeC4Model {
+function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[]): c4.ParsedLikeC4Model {
   const c4Specification: ParsedAstSpecification = {
-    kinds: {},
-    relationships: {}
+    tags: new Set(),
+    elements: {},
+    relationships: {},
+    colors: {}
   }
   forEach(map(docs, prop('c4Specification')), spec => {
-    Object.assign(c4Specification.kinds, spec.kinds)
+    spec.tags.forEach(t => c4Specification.tags.add(t))
+    Object.assign(c4Specification.elements, spec.elements)
     Object.assign(c4Specification.relationships, spec.relationships)
+    Object.assign(c4Specification.colors, spec.colors)
   })
   const resolveLinks = (doc: LangiumDocument, links: c4.NonEmptyArray<c4.Link>) => {
-    return links.map(l => ({
-      url: services.lsp.DocumentLinkProvider.resolveLink(doc, l.url),
-      ...(l.title && { title: l.title })
-    })) as 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
+    }
   }
 
+  const customColorDefinitions: CustomColorDefinitions = mapValues(
+    c4Specification.colors,
+    c => computeColorValues(c.color)
+  )
+
   const toModelElement = (doc: LangiumDocument) => {
     return ({
       tags,
-      links,
+      links: unresolvedLinks,
       style: {
         color,
         shape,
@@ -75,11 +96,12 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
       metadata
     }: ParsedAstElement): c4.Element | null => {
       try {
-        const __kind = c4Specification.kinds[kind]
+        const __kind = c4Specification.elements[kind]
         if (!__kind) {
           logger.warn(`No kind '${kind}' found for ${id}`)
           return null
         }
+        const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null
         color ??= __kind.style.color
         shape ??= __kind.style.shape
         icon ??= __kind.style.icon
@@ -96,7 +118,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
             ...(border && { border }),
             ...(isNumber(opacity) && { opacity })
           },
-          links: links ? resolveLinks(doc, links) : null,
+          links,
           tags: tags ?? null,
           technology: technology ?? null,
           description: description ?? null,
@@ -115,6 +137,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     docs,
     flatMap(d => map(d.c4Elements, toModelElement(d))),
     filter(isTruthy),
+    // sort from root elements to nested, so that parent is always present
     sort(compareByFqnHierarchically),
     reduce(
       (acc, el) => {
@@ -123,15 +146,10 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           logWarnError(`No parent found for ${el.id}`)
           return acc
         }
-        if (el.id in acc) {
-          // should not happen, as validated
-          logWarnError(`Duplicate element id: ${el.id}`)
-          return acc
-        }
         acc[el.id] = el
         return acc
       },
-      {} as c4.LikeC4Model['elements']
+      {} as c4.ParsedLikeC4Model['elements']
     )
   )
 
@@ -141,7 +159,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
       source,
       target,
       kind,
-      links,
+      links: unresolvedLinks,
       id,
       ...model
     }: ParsedAstRelation): c4.Relation | null => {
@@ -151,12 +169,13 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         )
         return null
       }
+      const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null
 
-      if (!isNullish(kind) && kind in c4Specification.relationships) {
+      if (isNonNullish(kind) && kind in c4Specification.relationships) {
         return {
-          ...(links && { links: resolveLinks(doc, links) }),
           ...c4Specification.relationships[kind],
           ...model,
+          ...(links && { links }),
           source,
           target,
           kind,
@@ -164,7 +183,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         }
       }
       return {
-        ...(links && { links: resolveLinks(doc, links) }),
+        ...(links && { links }),
         ...model,
         source,
         target,
@@ -177,7 +196,9 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     docs,
     flatMap(d => map(d.c4Relations, toModelRelation(d))),
     filter(isTruthy),
-    mapToObj(r => [r.id, r])
+    sort(compareRelations),
+    reverse(),
+    indexBy(prop('id'))
   )
 
   const toC4View = (doc: LangiumDocument) => {
@@ -188,7 +209,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         title,
         description,
         tags,
-        links,
+        links: unresolvedLinks,
 
         // ignore this property
         astPath: _ignore,
@@ -205,34 +226,32 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         title = 'Landscape view'
       }
 
+      const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null
+
       return {
-        id,
-        title,
-        description,
+        ...model,
         tags,
-        links: links ? resolveLinks(doc, links) : null,
+        links,
         docUri,
-        ...model
+        description,
+        title,
+        id,
+        customColorDefinitions
       }
     }
   }
 
-  const views = pipe(
-    docs,
-    flatMap(d => map(d.c4Views, toC4View(d))),
-    resolveRelativePaths,
-    mapToObj(v => [v.id, v]),
-    resolveRulesExtendedViews
-  )
-  // add index view if not present
-  if (!('index' in views)) {
-    views['index' as ViewID] = {
+  const parsedViews = docs.flatMap(d => map(d.c4Views, toC4View(d)))
+  // Add index view if not present
+  if (!parsedViews.some(v => v.id === 'index')) {
+    parsedViews.unshift({
       __: 'element',
       id: 'index' as ViewID,
-      title: 'Landscape',
+      title: 'Landscape view',
       description: null,
       tags: null,
       links: null,
+      customColorDefinitions: customColorDefinitions,
       rules: [
         {
           include: [
@@ -242,17 +261,30 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           ]
         }
       ]
-    }
+    })
   }
 
+  const views = pipe(
+    parsedViews,
+    resolveRelativePaths,
+    indexBy(prop('id')),
+    resolveRulesExtendedViews
+  )
+
   return {
+    specification: {
+      tags: Array.from(c4Specification.tags),
+      elements: c4Specification.elements,
+      relationships: c4Specification.relationships
+    },
     elements,
     relations,
     views
   }
 }
-const RAW_MODEL_CACHE = 'LikeC4RawModel'
-const MODEL_CACHE = 'LikeC4Model'
+
+const CACHE_KEY_PARSED_MODEL = 'ParsedLikeC4Model'
+const CACHE_KEY_COMPUTED_MODEL = 'ComputedLikeC4Model'
 
 type ModelParsedListener = (docs: URI[]) => void
 
@@ -274,9 +306,13 @@ export class LikeC4ModelBuilder {
       DocumentState.Validated,
       async (docs, _cancelToken) => {
         let parsed = [] as URI[]
-        logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)\n${printDocs(docs)}`)
-        for (const doc of parser.parse(docs)) {
-          parsed.push(doc.uri)
+        try {
+          logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)\n${printDocs(docs)}`)
+          for (const doc of parser.parse(docs)) {
+            parsed.push(doc.uri)
+          }
+        } catch (e) {
+          logWarnError(e)
         }
         if (parsed.length > 0) {
           this.notifyListeners(parsed)
@@ -287,35 +323,82 @@ export class LikeC4ModelBuilder {
     logger.debug(`[ModelBuilder] Created`)
   }
 
-  public async buildModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.LikeC4Model | null> {
-    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.LikeC4Model | null>
-    if (cache.has(RAW_MODEL_CACHE)) {
-      return cache.get(RAW_MODEL_CACHE)!
+  /**
+   * WARNING:
+   * This method is internal and should to be called only when all documents are known to be parsed.
+   * Otherwise, the model may be incomplete.
+   */
+  public unsafeSyncBuildModel(): c4.ParsedLikeC4Model | null {
+    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ParsedLikeC4Model | null>
+    return cache.get(CACHE_KEY_PARSED_MODEL, () => {
+      const docs = this.documents()
+      if (docs.length === 0) {
+        logger.debug('[ModelBuilder] No documents to build model from')
+        return null
+      }
+      logger.debug(`[ModelBuilder] buildModel from ${docs.length} docs:\n${printDocs(docs)}`)
+      return buildModel(this.services, docs)
+    })
+  }
+
+  public async buildModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ParsedLikeC4Model | null> {
+    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ParsedLikeC4Model | null>
+    if (cache.has(CACHE_KEY_PARSED_MODEL)) {
+      return cache.get(CACHE_KEY_PARSED_MODEL)!
     }
     return await this.services.shared.workspace.WorkspaceLock.read(async () => {
       if (cancelToken) {
         await interruptAndCheck(cancelToken)
       }
-      return cache.get(RAW_MODEL_CACHE, () => {
-        const docs = this.documents()
-        if (docs.length === 0) {
-          logger.debug('[ModelBuilder] No documents to build model from')
-          return null
-        }
-        logger.debug(`[ModelBuilder] buildModel from ${docs.length} docs:\n${printDocs(docs)}`)
-        return buildModel(this.services, docs)
-      })
+      return this.unsafeSyncBuildModel()
     })
   }
 
   private previousViews: Record<ViewID, c4.ComputedView> = {}
 
+  /**
+   * WARNING:
+   * This method is internal and should to be called only when all documents are known to be parsed.
+   * Otherwise, the model may be incomplete.
+   */
+  public unsafeSyncBuildComputedModel(model: c4.ParsedLikeC4Model): c4.ComputedLikeC4Model {
+    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedLikeC4Model>
+    const viewsCache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedView | null>
+    return cache.get(CACHE_KEY_COMPUTED_MODEL, () => {
+      const index = new LikeC4ModelGraph(model)
+
+      const allViews = [] as c4.ComputedView[]
+      for (const view of values(model.views)) {
+        const result = isElementView(view) ? computeView(view, index) : computeDynamicView(view, index)
+        if (!result.isSuccess) {
+          logWarnError(result.error)
+          continue
+        }
+        allViews.push(result.view)
+      }
+      assignNavigateTo(allViews)
+      const views = mapToObj(allViews, v => {
+        const previous = this.previousViews[v.id]
+        const view = previous && eq(v, previous) ? previous : v
+        viewsCache.set(computedViewKey(v.id), view)
+        return [v.id, view] as const
+      })
+      this.previousViews = { ...views }
+      return {
+        specification: model.specification,
+        elements: model.elements,
+        relations: model.relations,
+        views
+      }
+    })
+  }
+
   public async buildComputedModel(
     cancelToken?: Cancellation.CancellationToken
-  ): Promise<c4.LikeC4ComputedModel | null> {
-    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.LikeC4ComputedModel | null>
-    if (cache.has(MODEL_CACHE)) {
-      return cache.get(MODEL_CACHE)!
+  ): Promise<c4.ComputedLikeC4Model | null> {
+    const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedLikeC4Model | null>
+    if (cache.has(CACHE_KEY_COMPUTED_MODEL)) {
+      return cache.get(CACHE_KEY_COMPUTED_MODEL)!
     }
     const model = await this.buildModel(cancelToken)
     if (!model) {
@@ -325,33 +408,7 @@ export class LikeC4ModelBuilder {
       if (cancelToken) {
         await interruptAndCheck(cancelToken)
       }
-      const viewsCache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedView | null>
-      return cache.get(MODEL_CACHE, () => {
-        const index = new LikeC4ModelGraph(model)
-
-        const allViews = [] as c4.ComputedView[]
-        for (const view of values(model.views)) {
-          const result = isElementView(view) ? computeView(view, index) : computeDynamicView(view, index)
-          if (!result.isSuccess) {
-            logWarnError(result.error)
-            continue
-          }
-          allViews.push(result.view)
-        }
-        assignNavigateTo(allViews)
-        const views = mapToObj(allViews, v => {
-          const previous = this.previousViews[v.id]
-          const view = previous && eq(v, previous) ? previous : v
-          viewsCache.set(computedViewKey(v.id), view)
-          return [v.id, view] as const
-        })
-        this.previousViews = { ...views }
-        return {
-          elements: model.elements,
-          relations: model.relations,
-          views
-        }
-      })
+      return this.unsafeSyncBuildComputedModel(model)
     })
   }
 

package/src/model/model-locator.ts

@@ -1,4 +1,4 @@
-import type { likec4 as c4 } from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import type { LangiumDocuments } from 'langium'
 import { AstUtils, GrammarUtils } from 'langium'
 import type { Location } from 'vscode-languageserver-types'

package/src/model/model-parser-where.ts

@@ -1,5 +1,6 @@
-import { type c4, invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
-import { isAndOperator, isOrOperator } from '@likec4/core/types'
+import { invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
+import { isAndOperator, isOrOperator } from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import { ast } from '../ast'
 
 const parseEquals = (

package/src/model/model-parser.ts

@@ -1,4 +1,5 @@
-import { type c4, InvalidModelError, invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
+import { type HexColorLiteral, invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
+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'
@@ -23,6 +24,7 @@ import {
   resolveRelationPoints,
   streamModel,
   toAutoLayout,
+  toColor,
   toElementStyle,
   toRelationshipStyleExcludeDefaults,
   ViewOps
@@ -67,7 +69,7 @@ export class LikeC4ModelParser {
       try {
         result.push(this.parseLikeC4Document(doc))
       } catch (cause) {
-        logError(new InvalidModelError(`Error parsing document ${doc.uri.toString()}`, { cause }))
+        logError(new Error(`Error parsing document ${doc.uri.toString()}`, { cause }))
       }
     }
     return result
@@ -89,20 +91,23 @@ export class LikeC4ModelParser {
     const element_specs = specifications.flatMap(s => s.elements.filter(isValid))
     for (const { kind, props } of element_specs) {
       try {
-        const style = props.find(ast.isElementStyleProperty)
         const kindName = kind.name as c4.ElementKind
-        if (kindName in c4Specification.kinds) {
+        if (!isTruthy(kindName)) {
+          continue
+        }
+        if (kindName in c4Specification.elements) {
           logger.warn(`Element kind "${kindName}" is already defined`)
           continue
         }
+        const style = props.find(ast.isElementStyleProperty)
         const bodyProps = mapToObj(
           props.filter(ast.isSpecificationElementStringProperty).filter(p => isNonNullish(p.value)) ?? [],
-          p => [p.key, removeIndent(p.value)]
+          p => [p.key, removeIndent(p.value)] as const
         )
-        c4Specification.kinds[kindName] = {
+        c4Specification.elements[kindName] = {
           ...bodyProps,
           style: {
-            ...toElementStyle(style?.props)
+            ...toElementStyle(style?.props, isValid)
           }
         }
       } catch (e) {
@@ -114,13 +119,16 @@ export class LikeC4ModelParser {
     for (const { kind, props } of relations_specs) {
       try {
         const kindName = kind.name as c4.RelationshipKind
+        if (!isTruthy(kindName)) {
+          continue
+        }
         if (kindName in c4Specification.relationships) {
           logger.warn(`Relationship kind "${kindName}" is already defined`)
           continue
         }
         const bodyProps = mapToObj(
           props.filter(ast.isSpecificationRelationshipStringProperty).filter(p => isNonNullish(p.value)) ?? [],
-          p => [p.key, p.value]
+          p => [p.key, removeIndent(p.value)]
         )
         c4Specification.relationships[kindName] = {
           ...bodyProps,
@@ -130,13 +138,38 @@ export class LikeC4ModelParser {
         logWarnError(e)
       }
     }
+
+    const tags_specs = specifications.flatMap(s => s.tags.filter(isValid))
+    for (const tagSpec of tags_specs) {
+      const tag = tagSpec.tag.name as c4.Tag
+      if (isTruthy(tag)) {
+        c4Specification.tags.add(tag)
+      }
+    }
+
+    const colors_specs = specifications.flatMap(s => s.colors.filter(isValid))
+    for (const { name, color } of colors_specs) {
+      try {
+        const colorName = name.name as c4.CustomColor
+        if (colorName in c4Specification.colors) {
+          logger.warn(`Custom color "${colorName}" is already defined`)
+          continue
+        }
+
+        c4Specification.colors[colorName] = {
+          color: color as HexColorLiteral
+        }
+      } catch (e) {
+        logWarnError(e)
+      }
+    }
   }
 
   private parseModel(doc: ParsedLikeC4LangiumDocument, isValid: IsValidFn) {
     for (const el of streamModel(doc, isValid)) {
       if (ast.isElement(el)) {
         try {
-          doc.c4Elements.push(this.parseElement(el))
+          doc.c4Elements.push(this.parseElement(el, isValid))
         } catch (e) {
           logWarnError(e)
         }
@@ -154,12 +187,12 @@ export class LikeC4ModelParser {
     }
   }
 
-  private parseElement(astNode: ast.Element): ParsedAstElement {
+  private parseElement(astNode: ast.Element, isValid: IsValidFn): ParsedAstElement {
     const id = this.resolveFqn(astNode)
     const kind = astNode.kind.$refText as c4.ElementKind
     const tags = this.convertTags(astNode.body)
     const stylePropsAst = astNode.body?.props.find(ast.isElementStyleProperty)?.props
-    const style = toElementStyle(stylePropsAst)
+    const style = toElementStyle(stylePropsAst, isValid)
     const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty))
     const astPath = this.getAstNodePath(astNode)
 
@@ -392,8 +425,9 @@ export class LikeC4ModelParser {
           return acc
         }
         if (ast.isColorProperty(prop)) {
-          if (isDefined(prop.value)) {
-            acc.custom[prop.key] = prop.value
+          const value = toColor(prop)
+          if (isDefined(value)) {
+            acc.custom[prop.key] = value
           }
           return acc
         }
@@ -493,8 +527,9 @@ export class LikeC4ModelParser {
           return acc
         }
         if (ast.isColorProperty(prop)) {
-          if (isTruthy(prop.value)) {
-            acc.customRelation[prop.key] = prop.value
+          const value = toColor(prop)
+          if (isTruthy(value)) {
+            acc.customRelation[prop.key] = value
           }
           return acc
         }
@@ -551,7 +586,7 @@ export class LikeC4ModelParser {
       return this.parseViewRulePredicate(astRule, isValid)
     }
     if (ast.isViewRuleStyle(astRule)) {
-      const styleProps = toElementStyle(astRule.props.filter(ast.isStyleProperty))
+      const styleProps = toElementStyle(astRule.props.filter(ast.isStyleProperty), isValid)
       const notation = removeIndent(astRule.props.find(ast.isNotationProperty)?.value)
       const targets = this.parseElementExpressionsIterator(astRule.target)
       return {
@@ -632,7 +667,10 @@ export class LikeC4ModelParser {
             continue
           }
           if (ast.isColorProperty(prop)) {
-            step[prop.key] = prop.value
+            const value = toColor(prop)
+            if (isTruthy(value)) {
+              step[prop.key] = value
+            }
             continue
           }
           if (ast.isLineProperty(prop)) {
@@ -778,7 +816,7 @@ export class LikeC4ModelParser {
             return acc
           }
           if (ast.isViewRuleStyle(n)) {
-            const styleProps = toElementStyle(n.props.filter(ast.isStyleProperty))
+            const styleProps = toElementStyle(n.props.filter(ast.isStyleProperty), isValid)
             const notation = removeIndent(n.props.find(ast.isNotationProperty)?.value)
             const targets = this.parseElementExpressionsIterator(n.target)
             if (targets.length > 0) {
@@ -845,7 +883,7 @@ export class LikeC4ModelParser {
     const tags = [] as c4.Tag[]
     while (iter) {
       try {
-        const values = iter.values.map(t => t.ref?.name).filter(Boolean) as c4.Tag[]
+        const values = iter.values.map(t => t.ref?.name).filter(isTruthy) as c4.Tag[]
         if (values.length > 0) {
           tags.unshift(...values)
         }