@likec4/language-server 1.18.0 → 1.19.0

package/src/ast.ts

@@ -1,15 +1,15 @@
 import type * as c4 from '@likec4/core'
-import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from '@likec4/core'
+import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, LinkedList, 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 { ConditionalPick, SetRequired, ValueOf, Writable } from 'type-fest'
 import type { Diagnostic } from 'vscode-languageserver-types'
-import { DiagnosticSeverity } from 'vscode-languageserver-types'
 import type { LikeC4Grammar } from './generated/ast'
 import * as ast from './generated/ast'
 import { LikeC4LanguageMetaData } from './generated/module'
 import { elementRef } from './utils/elementRef'
+import type { IsValidFn } from './validation'
 
 export { ast }
 
@@ -113,13 +113,8 @@ 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>>
-//   styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>
-// }
 // Alias for refactoring
-export type ParsedAstGlobals = c4.ModelGlobals
+export type ParsedAstGlobals = Writable<c4.ModelGlobals>
 
 export interface ParsedAstElementView {
   __: 'element'
@@ -167,7 +162,7 @@ export const ViewOps = {
   },
   readId(node: ast.LikeC4View): c4.ViewId | undefined {
     return node[idattr]
-  }
+  },
 }
 
 export interface ParsedLink {
@@ -186,7 +181,7 @@ export const ElementOps = {
   },
   readId(node: ast.Element | ast.DeploymentElement) {
     return node[idattr]
-  }
+  },
 }
 
 export interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
@@ -222,29 +217,6 @@ export interface FqnIndexedDocument extends SetRequired<LikeC4LangiumDocument, '
 
 export interface ParsedLikeC4LangiumDocument extends LikeC4GrammarDocument, Required<LikeC4DocumentProps> {}
 
-export function cleanParsedModel(doc: LikeC4LangiumDocument) {
-  const props: Required<Omit<LikeC4DocumentProps, 'c4fqnIndex' | 'diagnostics'>> = {
-    c4Specification: {
-      tags: new Set(),
-      elements: {},
-      relationships: {},
-      colors: {},
-      deployments: {}
-    },
-    c4Elements: [],
-    c4Relations: [],
-    c4Deployments: [],
-    c4DeploymentRelations: [],
-    c4Globals: {
-      predicates: {},
-      dynamicPredicates: {},
-      styles: {}
-    },
-    c4Views: []
-  }
-  return Object.assign(doc, props) as ParsedLikeC4LangiumDocument
-}
-
 export function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument {
   return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId
 }
@@ -254,7 +226,7 @@ export function isFqnIndexedDocument(doc: LangiumDocument): doc is FqnIndexedDoc
 }
 
 export function isParsedLikeC4LangiumDocument(
-  doc: LangiumDocument
+  doc: LangiumDocument,
 ): doc is ParsedLikeC4LangiumDocument {
   return (
     isLikeC4LangiumDocument(doc)
@@ -269,115 +241,54 @@ export function isParsedLikeC4LangiumDocument(
   )
 }
 
-type Guard<N extends AstNode> = (n: AstNode) => n is N
-type Guarded<G> = G extends Guard<infer N> ? N : never
-
-function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
-  predicates: Predicates
-) {
-  return (n: AstNode): n is Guarded<Predicates[number]> => predicates.some(p => p(n))
-}
-const isValidatableAstNode = validatableAstNodeGuards([
-  ast.isGlobals,
-  ast.isGlobalPredicateGroup,
-  ast.isGlobalDynamicPredicateGroup,
-  ast.isGlobalStyle,
-  ast.isGlobalStyleGroup,
-  ast.isDynamicViewPredicateIterator,
-  ast.isElementPredicateWith,
-  ast.isRelationPredicateWith,
-  ast.isElementExpression,
-  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.isLikeC4View,
-  ast.isViewRuleStyleOrGlobalRef,
-  ast.isDeployedInstance,
-  ast.isDeploymentNode,
-  ast.isRelationshipStyleProperty,
-  ast.isRelation,
-  ast.isElementProperty,
-  ast.isStringProperty,
-  ast.isNavigateToProperty,
-  ast.isElement,
-  ast.isExtendElement,
-  ast.isSpecificationElementKind,
-  ast.isSpecificationRelationshipKind,
-  ast.isSpecificationDeploymentNodeKind,
-  ast.isSpecificationTag,
-  ast.isSpecificationColor,
-  ast.isSpecificationRule
-])
-type ValidatableAstNode = Guarded<typeof isValidatableAstNode>
-
-const findInvalidContainer = (node: LikeC4AstNode): ValidatableAstNode | undefined => {
-  let nd = node as LikeC4AstNode['$container']
-  while (nd) {
-    if (isValidatableAstNode(nd)) {
-      return nd
-    }
-    nd = nd.$container
-  }
-  return undefined
-}
-
-export function checksFromDiagnostics(doc: LikeC4LangiumDocument) {
-  const errors = doc.diagnostics?.filter(d => d.severity === DiagnosticSeverity.Error) ?? []
-  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,
-    invalidNodes
-  }
-}
-export type ChecksFromDiagnostics = ReturnType<typeof checksFromDiagnostics>
-export type IsValidFn = ChecksFromDiagnostics['isValid']
-
-export function* streamModel(doc: LikeC4LangiumDocument, isValid: IsValidFn) {
-  const traverseStack = doc.parseResult.value.models.flatMap(m => m.elements)
+export function* streamModel(doc: LikeC4LangiumDocument) {
+  const traverseStack = LinkedList.from(doc.parseResult.value.models.flatMap(m => m.elements))
   const relations = [] as ast.Relation[]
   let el
   while ((el = traverseStack.shift())) {
     if (ast.isRelation(el)) {
-      isValid(el) && relations.push(el)
+      relations.push(el)
       continue
     }
     if (ast.isExtendElement(el)) {
       if (el.body && el.body.elements.length > 0) {
-        traverseStack.push(...el.body.elements)
+        for (const child of el.body.elements) {
+          traverseStack.push(child)
+        }
       }
       continue
     }
     if (el.body && el.body.elements.length > 0) {
-      traverseStack.push(...el.body.elements)
+      for (const child of el.body.elements) {
+        traverseStack.push(child)
+      }
     }
-    if (!isValid(el)) {
+    yield el
+  }
+  yield* relations
+  return
+}
+
+export function* streamDeploymentModel(doc: LikeC4LangiumDocument) {
+  const traverseStack = LinkedList.from<ast.DeploymentRelation | ast.DeploymentElement>(
+    doc.parseResult.value.deployments.flatMap(m => m.elements),
+  )
+  const relations = [] as ast.DeploymentRelation[]
+  let el
+  while ((el = traverseStack.shift())) {
+    if (ast.isDeploymentRelation(el)) {
+      relations.push(el)
       continue
     }
+    if (ast.isDeploymentNode(el) && el.body && el.body.elements.length > 0) {
+      for (const child of el.body.elements) {
+        traverseStack.push(child)
+      }
+    }
     yield el
   }
-  for (const relation of relations) {
-    yield relation
-  }
+  yield* relations
+  return
 }
 
 export function resolveRelationPoints(node: ast.Relation): {
@@ -395,7 +306,7 @@ export function resolveRelationPoints(node: ast.Relation): {
     }
     return {
       source,
-      target
+      target,
     }
   }
   if (!ast.isElementBody(node.$container)) {
@@ -403,7 +314,7 @@ export function resolveRelationPoints(node: ast.Relation): {
   }
   return {
     source: node.$container.$container,
-    target
+    target,
   }
 }
 
@@ -511,14 +422,14 @@ export function toRelationshipStyle(props: ast.RelationshipStyleProperty[] | und
 
 export function toRelationshipStyleExcludeDefaults(
   props: ast.SpecificationRelationshipKind['props'] | undefined,
-  isValid: IsValidFn
+  isValid: IsValidFn,
 ) {
   const { color, line, head, tail } = toRelationshipStyle(props?.filter(ast.isRelationshipStyleProperty), isValid)
   return {
     ...(color && color !== DefaultRelationshipColor ? { color } : {}),
     ...(line && line !== DefaultLineStyle ? { line } : {}),
     ...(head && head !== DefaultArrowType ? { head } : {}),
-    ...(tail ? { tail } : {})
+    ...(tail ? { tail } : {}),
   }
 }
 
@@ -527,7 +438,7 @@ export function toColor(astNode: ast.ColorProperty): c4.Color | undefined {
 }
 
 export function toAutoLayout(
-  rule: ast.ViewRuleAutoLayout
+  rule: ast.ViewRuleAutoLayout,
 ): c4.ViewRuleAutoLayout {
   const rankSep = rule.rankSep
   const nodeSep = rule.nodeSep
@@ -557,7 +468,7 @@ export function toAutoLayout(
   return {
     direction,
     ...(nodeSep && { nodeSep }),
-    ...(rankSep && { rankSep })
+    ...(rankSep && { rankSep }),
   }
 }
 

package/src/browser.ts

@@ -1,18 +1,22 @@
 import { startLanguageServer as startLanguim } from 'langium/lsp'
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser'
-import { createLanguageServices } from './module'
+import { type LikeC4Services, type LikeC4SharedServices, createLanguageServices } from './module'
+
+export { logger as lspLogger, setLogLevel } from './logger'
+export type { DocumentParser, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from './model'
 
-export { setLogLevel } from './logger'
-export type * from './model'
-export type * from './module'
 export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
+export type { LikeC4Services, LikeC4SharedServices } from './module'
 
 // This is an example copied as is from here:
 // https://github.com/microsoft/vscode-extension-samples/blob/main/lsp-web-extension-sample/server/src/browserServerMain.ts
 // the only addition is the following line:
 declare const self: DedicatedWorkerGlobalScope
 
-export function startLanguageServer() {
+export function startLanguageServer(): {
+  shared: LikeC4SharedServices
+  likec4: LikeC4Services
+} {
   /* browser specific setup code */
 
   const messageReader = new BrowserMessageReader(self)
@@ -26,10 +30,5 @@ export function startLanguageServer() {
   // Start the language server with the shared services
   startLanguim(services.shared)
 
-  return {
-    ...services,
-    connection,
-    messageReader,
-    messageWriter
-  }
+  return services
 }