@likec4/language-server 1.17.1 → 1.18.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -49,11 +49,6 @@
       "types": "./dist/protocol.d.ts",
       "import": "./dist/protocol.mjs",
       "require": "./dist/protocol.cjs"
-    },
-    "./model-graph": {
-      "types": "./dist/model-graph/index.d.ts",
-      "import": "./dist/model-graph/index.mjs",
-      "require": "./dist/model-graph/index.cjs"
     }
   },
   "publishConfig": {
@@ -86,11 +81,6 @@
         "types": "./dist/protocol.d.ts",
         "import": "./dist/protocol.mjs",
         "require": "./dist/protocol.cjs"
-      },
-      "./model-graph": {
-        "types": "./dist/model-graph/index.d.ts",
-        "import": "./dist/model-graph/index.mjs",
-        "require": "./dist/model-graph/index.cjs"
       }
     }
   },
@@ -111,21 +101,19 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@dagrejs/dagre": "^1.1.4",
-    "@likec4/core": "1.17.1",
-    "@likec4/log": "1.17.1",
+    "@likec4/core": "1.18.0",
+    "@likec4/log": "1.18.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
+    "esm-env": "^1.2.1",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
     "langium": "3.3.0",
-    "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.17.3",
-    "string-hash": "^1.1.3",
+    "remeda": "^2.17.4",
     "strip-indent": "^4.0.0",
-    "type-fest": "4.27.1",
+    "type-fest": "4.28.1",
     "ufo": "^1.5.4",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
@@ -133,20 +121,18 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.17.1",
-    "@likec4/tsconfig": "1.17.1",
+    "@likec4/icons": "1.18.0",
+    "@likec4/tsconfig": "1.18.0",
     "@types/node": "^20.17.7",
-    "@types/object-hash": "^3.0.6",
-    "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.5",
+    "@vitest/coverage-v8": "^2.1.8",
     "execa": "^9.3.1",
     "langium-cli": "3.3.0",
     "npm-run-all2": "^7.0.1",
     "tsx": "~4.9.3",
-    "turbo": "^2.3.1",
+    "turbo": "^2.3.3",
     "typescript": "^5.7.2",
     "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.8"
   },
   "packageManager": "yarn@4.5.3"
 }

package/src/Rpc.ts

@@ -42,9 +42,9 @@ export class Rpc implements Disposable {
         })
       },
       {
-        timing: 'both',
-        waitMs: 250,
-        maxWaitMs: 500
+        timing: 'trailing',
+        waitMs: 300,
+        maxWaitMs: 1000
       }
     )
 
@@ -114,6 +114,9 @@ export class Rpc implements Disposable {
         if ('view' in params) {
           return modelLocator.locateView(params.view)
         }
+        if ('deployment' in params) {
+          return modelLocator.locateDeploymentElement(params.deployment, params.property ?? 'name')
+        }
         nonexhaustive(params)
       }),
       connection.onRequest(changeView, async (request, _cancelToken) => {

package/src/ast.ts

@@ -1,15 +1,15 @@
-import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from '@likec4/core'
 import type * as c4 from '@likec4/core'
+import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { DocumentState } from 'langium'
 import { clamp, isDefined, isNullish, isTruthy } from 'remeda'
 import type { ConditionalPick, SetRequired, ValueOf } from 'type-fest'
 import type { Diagnostic } from 'vscode-languageserver-types'
 import { DiagnosticSeverity } from 'vscode-languageserver-types'
-import { elementRef } from './elementRef'
 import type { LikeC4Grammar } from './generated/ast'
 import * as ast from './generated/ast'
 import { LikeC4LanguageMetaData } from './generated/module'
+import { elementRef } from './utils/elementRef'
 
 export { ast }
 
@@ -20,10 +20,19 @@ declare module './generated/ast' {
     [idattr]?: c4.Fqn | undefined
   }
   export interface ElementView {
-    [idattr]?: c4.ViewID | undefined
+    [idattr]?: c4.ViewId | undefined
   }
   export interface DynamicView {
-    [idattr]?: c4.ViewID | undefined
+    [idattr]?: c4.ViewId | undefined
+  }
+  export interface DeploymentView {
+    [idattr]?: c4.ViewId | undefined
+  }
+  export interface DeploymentNode {
+    [idattr]?: c4.Fqn | undefined
+  }
+  export interface DeployedInstance {
+    [idattr]?: c4.Fqn | undefined
   }
 }
 
@@ -59,6 +68,7 @@ export interface ParsedAstSpecification {
       color: c4.HexColorLiteral
     }
   >
+  deployments: Record<c4.DeploymentNodeKind, c4.DeploymentNodeKindSpecification>
 }
 
 export interface ParsedAstElement {
@@ -75,7 +85,7 @@ export interface ParsedAstElement {
 }
 
 export interface ParsedAstRelation {
-  id: c4.RelationID
+  id: c4.RelationId
   astPath: string
   source: c4.Fqn
   target: c4.Fqn
@@ -89,10 +99,20 @@ export interface ParsedAstRelation {
   head?: c4.RelationshipArrowType
   tail?: c4.RelationshipArrowType
   links?: c4.NonEmptyArray<ParsedLink>
-  navigateTo?: c4.ViewID
+  navigateTo?: c4.ViewId
   metadata?: { [key: string]: string }
 }
 
+// Alias for easier refactoring
+export type ParsedAstDeployment = c4.DeploymentElement
+export namespace ParsedAstDeployment {
+  export type Node = c4.DeploymentNode
+  export type Instance = c4.DeployedInstance
+}
+export type ParsedAstDeploymentRelation = c4.DeploymentRelation & {
+  astPath: string
+}
+
 // export interface ParsedAstGlobals {
 //   predicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.ViewRulePredicate>>
 //   dynamicPredicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.DynamicViewIncludeRule>>
@@ -103,9 +123,9 @@ export type ParsedAstGlobals = c4.ModelGlobals
 
 export interface ParsedAstElementView {
   __: 'element'
-  id: c4.ViewID
+  id: c4.ViewId
   viewOf?: c4.Fqn
-  extends?: c4.ViewID
+  extends?: c4.ViewId
   astPath: string
   title: string | null
   description: string | null
@@ -117,7 +137,7 @@ export interface ParsedAstElementView {
 
 export interface ParsedAstDynamicView {
   __: 'dynamic'
-  id: c4.ViewID
+  id: c4.ViewId
   astPath: string
   title: string | null
   description: string | null
@@ -128,13 +148,24 @@ export interface ParsedAstDynamicView {
   manualLayout?: c4.ViewManualLayout
 }
 
-export type ParsedAstView = ParsedAstElementView | ParsedAstDynamicView
+export interface ParsedAstDeploymentView {
+  __: 'deployment'
+  id: c4.ViewId
+  astPath: string
+  title: string | null
+  description: string | null
+  tags: c4.NonEmptyArray<c4.Tag> | null
+  links: c4.NonEmptyArray<ParsedLink> | null
+  rules: Array<c4.DeploymentViewRule>
+}
+
+export type ParsedAstView = ParsedAstElementView | ParsedAstDynamicView | ParsedAstDeploymentView
 export const ViewOps = {
-  writeId<T extends ast.LikeC4View>(node: T, id: c4.ViewID): T {
+  writeId<T extends ast.LikeC4View>(node: T, id: c4.ViewId): T {
     node[idattr] = id
     return node
   },
-  readId(node: ast.LikeC4View): c4.ViewID | undefined {
+  readId(node: ast.LikeC4View): c4.ViewId | undefined {
     return node[idattr]
   }
 }
@@ -145,7 +176,7 @@ export interface ParsedLink {
 }
 
 export const ElementOps = {
-  writeId(node: ast.Element, id: c4.Fqn | null) {
+  writeId(node: ast.Element | ast.DeploymentElement, id: c4.Fqn | null) {
     if (isNullish(id)) {
       node[idattr] = undefined
     } else {
@@ -153,7 +184,7 @@ export const ElementOps = {
     }
     return node
   },
-  readId(node: ast.Element) {
+  readId(node: ast.Element | ast.DeploymentElement) {
     return node[idattr]
   }
 }
@@ -162,6 +193,11 @@ export interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
   fqn: c4.Fqn
 }
 
+export interface DeploymentAstNodeDescription extends AstNodeDescription {
+  // Fullname of the artifact or node
+  fqn: string
+}
+
 // export type LikeC4AstNode = ast.LikeC4AstType[keyof ast.LikeC4AstType]
 export type LikeC4AstNode = ValueOf<ConditionalPick<ast.LikeC4AstType, AstNode>>
 type LikeC4DocumentDiagnostic = Diagnostic & DiagnosticInfo<LikeC4AstNode>
@@ -173,21 +209,18 @@ export interface LikeC4DocumentProps {
   c4Relations?: ParsedAstRelation[]
   c4Globals?: ParsedAstGlobals
   c4Views?: ParsedAstView[]
+  c4Deployments?: ParsedAstDeployment[]
+  c4DeploymentRelations?: ParsedAstDeploymentRelation[]
   // Fqn -> Element
   c4fqnIndex?: MultiMap<c4.Fqn, DocFqnIndexAstNodeDescription>
 }
 
-export interface LikeC4LangiumDocument
-  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, LikeC4DocumentProps
-{}
-export interface FqnIndexedDocument
-  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, SetRequired<LikeC4DocumentProps, 'c4fqnIndex'>
-{}
+type LikeC4GrammarDocument = Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>
+
+export interface LikeC4LangiumDocument extends LikeC4GrammarDocument, LikeC4DocumentProps {}
+export interface FqnIndexedDocument extends SetRequired<LikeC4LangiumDocument, 'c4fqnIndex'> {}
 
-// export type ParsedLikeC4LangiumDocument = SetRequired<FqnIndexedDocument, keyof  LikeC4DocumentProps>
-export interface ParsedLikeC4LangiumDocument
-  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, Required<LikeC4DocumentProps>
-{}
+export interface ParsedLikeC4LangiumDocument extends LikeC4GrammarDocument, Required<LikeC4DocumentProps> {}
 
 export function cleanParsedModel(doc: LikeC4LangiumDocument) {
   const props: Required<Omit<LikeC4DocumentProps, 'c4fqnIndex' | 'diagnostics'>> = {
@@ -195,10 +228,13 @@ export function cleanParsedModel(doc: LikeC4LangiumDocument) {
       tags: new Set(),
       elements: {},
       relationships: {},
-      colors: {}
+      colors: {},
+      deployments: {}
     },
     c4Elements: [],
     c4Relations: [],
+    c4Deployments: [],
+    c4DeploymentRelations: [],
     c4Globals: {
       predicates: {},
       dynamicPredicates: {},
@@ -228,6 +264,8 @@ export function isParsedLikeC4LangiumDocument(
     && !!doc.c4Relations
     && !!doc.c4Views
     && !!doc.c4fqnIndex
+    && !!doc.c4Deployments
+    && !!doc.c4DeploymentRelations
   )
 }
 
@@ -252,29 +290,32 @@ const isValidatableAstNode = validatableAstNodeGuards([
   ast.isRelationExpression,
   ast.isDynamicViewParallelSteps,
   ast.isDynamicViewStep,
+  ast.isDeploymentViewRule,
+  ast.isDeploymentViewRulePredicate,
+  ast.isDeploymentExpression,
   ast.isViewProperty,
   ast.isStyleProperty,
+  ast.isPredicate,
   ast.isTags,
   ast.isViewRule,
   ast.isDynamicViewRule,
-  ast.isElementViewBody,
-  ast.isDynamicViewBody,
   ast.isLikeC4View,
-  ast.isRelationProperty,
-  ast.isRelationBody,
+  ast.isViewRuleStyleOrGlobalRef,
+  ast.isDeployedInstance,
+  ast.isDeploymentNode,
+  ast.isRelationshipStyleProperty,
   ast.isRelation,
   ast.isElementProperty,
-  ast.isElementBody,
+  ast.isStringProperty,
+  ast.isNavigateToProperty,
   ast.isElement,
-  ast.isExtendElementBody,
   ast.isExtendElement,
   ast.isSpecificationElementKind,
   ast.isSpecificationRelationshipKind,
+  ast.isSpecificationDeploymentNodeKind,
   ast.isSpecificationTag,
   ast.isSpecificationColor,
-  ast.isSpecificationRule,
-  ast.isModelViews,
-  ast.isModel
+  ast.isSpecificationRule
 ])
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>
 
@@ -291,12 +332,17 @@ const findInvalidContainer = (node: LikeC4AstNode): ValidatableAstNode | undefin
 
 export function checksFromDiagnostics(doc: LikeC4LangiumDocument) {
   const errors = doc.diagnostics?.filter(d => d.severity === DiagnosticSeverity.Error) ?? []
-  const invalidNodes = new WeakSet(
-    errors.flatMap(d => {
-      return findInvalidContainer(d.node) ?? []
-    })
-  )
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const invalidNodes = new WeakSet()
+  for (const { node } of errors) {
+    if (isNullish(node) || invalidNodes.has(node)) {
+      continue
+    }
+    invalidNodes.add(node)
+    const container = findInvalidContainer(node)
+    if (container) {
+      invalidNodes.add(container)
+    }
+  }
   const isValid = (n: ValidatableAstNode) => !invalidNodes.has(n)
   return {
     isValid,
@@ -311,11 +357,8 @@ export function* streamModel(doc: LikeC4LangiumDocument, isValid: IsValidFn) {
   const relations = [] as ast.Relation[]
   let el
   while ((el = traverseStack.shift())) {
-    if (!isValid(el)) {
-      continue
-    }
     if (ast.isRelation(el)) {
-      relations.push(el)
+      isValid(el) && relations.push(el)
       continue
     }
     if (ast.isExtendElement(el)) {
@@ -327,6 +370,9 @@ export function* streamModel(doc: LikeC4LangiumDocument, isValid: IsValidFn) {
     if (el.body && el.body.elements.length > 0) {
       traverseStack.push(...el.body.elements)
     }
+    if (!isValid(el)) {
+      continue
+    }
     yield el
   }
   for (const relation of relations) {
@@ -407,14 +453,13 @@ export function toElementStyle(props: Array<ast.StyleProperty> | undefined, isVa
         break
       }
       default:
-        // @ts-expect-error
-        nonexhaustive(prop.$type)
+        nonexhaustive(prop)
     }
   }
   return result
 }
 
-export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
+export function toRelationshipStyle(props: ast.RelationshipStyleProperty[] | undefined, isValid: IsValidFn) {
   const result = {} as {
     color?: c4.Color
     line?: c4.RelationshipLineType
@@ -425,42 +470,50 @@ export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
     return result
   }
   for (const prop of props) {
-    if (ast.isColorProperty(prop)) {
-      const color = toColor(prop)
-      if (isTruthy(color)) {
-        result.color = color
-      }
-      continue
-    }
-    if (ast.isLineProperty(prop)) {
-      result.line = prop.value
+    if (!isValid(prop)) {
       continue
     }
-    if (ast.isArrowProperty(prop)) {
-      switch (prop.key) {
-        case 'head': {
-          result.head = prop.value
-          break
-        }
-        case 'tail': {
-          result.tail = prop.value
-          break
+    switch (true) {
+      case ast.isColorProperty(prop): {
+        const color = toColor(prop)
+        if (isTruthy(color)) {
+          result.color = color
         }
-        default: {
-          nonexhaustive(prop)
+        break
+      }
+      case ast.isLineProperty(prop): {
+        result.line = prop.value
+        break
+      }
+      case ast.isArrowProperty(prop): {
+        switch (prop.key) {
+          case 'head': {
+            result.head = prop.value
+            break
+          }
+          case 'tail': {
+            result.tail = prop.value
+            break
+          }
+          default: {
+            nonexhaustive(prop)
+          }
         }
+        break
+      }
+      default: {
+        nonexhaustive(prop)
       }
-      continue
     }
-    nonexhaustive(prop)
   }
   return result
 }
 
 export function toRelationshipStyleExcludeDefaults(
-  props?: ast.SpecificationRelationshipKind['props']
+  props: ast.SpecificationRelationshipKind['props'] | undefined,
+  isValid: IsValidFn
 ) {
-  const { color, line, head, tail } = toRelationshipStyle(props?.filter(ast.isRelationshipStyleProperty))
+  const { color, line, head, tail } = toRelationshipStyle(props?.filter(ast.isRelationshipStyleProperty), isValid)
   return {
     ...(color && color !== DefaultRelationshipColor ? { color } : {}),
     ...(line && line !== DefaultLineStyle ? { line } : {}),