@likec4/language-server 1.8.1 → 1.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -21,30 +21,37 @@
     "directory": "packages/language-server"
   },
   "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
     },
     "./likec4lib": {
       "types": "./dist/likec4lib.d.ts",
-      "default": "./dist/likec4lib.js"
+      "import": "./dist/likec4lib.mjs",
+      "require": "./dist/likec4lib.cjs"
     },
     "./browser": {
       "types": "./dist/browser.d.ts",
-      "default": "./dist/browser.js"
+      "import": "./dist/browser.mjs",
+      "require": "./dist/browser.cjs"
     },
     "./protocol": {
       "types": "./dist/protocol.d.ts",
-      "default": "./dist/protocol.js"
+      "import": "./dist/protocol.mjs",
+      "require": "./dist/protocol.cjs"
     },
     "./node": {
       "types": "./dist/node.d.ts",
-      "default": "./dist/node.js"
+      "import": "./dist/node.mjs",
+      "require": "./dist/node.cjs"
     },
     "./model-graph": {
       "types": "./dist/model-graph/index.d.ts",
-      "default": "./dist/model-graph/index.js"
+      "import": "./dist/model-graph/index.mjs",
+      "require": "./dist/model-graph/index.cjs"
     }
   },
   "publishConfig": {
@@ -53,32 +60,40 @@
     "exports": {
       ".": {
         "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.cjs"
       },
       "./likec4lib": {
         "types": "./dist/likec4lib.d.ts",
-        "default": "./dist/likec4lib.js"
+        "import": "./dist/likec4lib.mjs",
+        "require": "./dist/likec4lib.cjs"
       },
       "./browser": {
         "types": "./dist/browser.d.ts",
-        "default": "./dist/browser.js"
+        "import": "./dist/browser.mjs",
+        "require": "./dist/browser.cjs"
       },
       "./protocol": {
         "types": "./dist/protocol.d.ts",
-        "default": "./dist/protocol.js"
+        "import": "./dist/protocol.mjs",
+        "require": "./dist/protocol.cjs"
       },
       "./node": {
         "types": "./dist/node.d.ts",
-        "default": "./dist/node.js"
+        "import": "./dist/node.mjs",
+        "require": "./dist/node.cjs"
       },
       "./model-graph": {
         "types": "./dist/model-graph/index.d.ts",
-        "default": "./dist/model-graph/index.js"
+        "import": "./dist/model-graph/index.mjs",
+        "require": "./dist/model-graph/index.cjs"
       }
     }
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
+    "prepack": "turbo run build",
+    "build": "unbuild",
     "pregenerate": "rm -f src/generated/*",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
@@ -92,11 +107,10 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.8.1",
-    "@likec4/log": "1.8.1",
+    "@likec4/core": "1.9.0",
+    "@likec4/log": "1.9.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
-    "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
@@ -106,7 +120,7 @@
     "remeda": "^2.11.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.21.0",
+    "type-fest": "^4.26.0",
     "ufo": "^1.5.4",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
@@ -114,17 +128,18 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.8.1",
-    "@likec4/tsconfig": "1.8.1",
+    "@likec4/icons": "1.9.0",
+    "@likec4/tsconfig": "1.9.0",
     "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
     "execa": "^9.3.1",
-    "glob": "^11.0.0",
     "langium-cli": "3.1.1",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
+    "turbo": "^2.1.1",
     "typescript": "^5.5.4",
+    "unbuild": "^3.0.0-rc.7",
     "vitest": "~2.0.5"
   },
   "packageManager": "yarn@4.3.1"

package/src/ast.ts

@@ -1,11 +1,5 @@
-import {
-  type c4,
-  DefaultArrowType,
-  DefaultLineStyle,
-  DefaultRelationshipColor,
-  nonexhaustive,
-  RelationRefError
-} from '@likec4/core'
+import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { DocumentState } from 'langium'
 import { clamp, isDefined, isNullish, isTruthy } from 'remeda'
@@ -36,13 +30,14 @@ declare module './generated/ast' {
 type ParsedElementStyle = {
   shape?: c4.ElementShape
   icon?: c4.IconUrl
-  color?: c4.ThemeColor
+  color?: c4.Color
   border?: c4.BorderStyle
   opacity?: number
 }
 
 export interface ParsedAstSpecification {
-  kinds: Record<c4.ElementKind, {
+  tags: Set<c4.Tag>
+  elements: Record<c4.ElementKind, {
     technology?: string
     notation?: string
     style: ParsedElementStyle
@@ -52,12 +47,18 @@ export interface ParsedAstSpecification {
     {
       technology?: string
       notation?: string
-      color?: c4.ThemeColor
+      color?: c4.Color
       line?: c4.RelationshipLineType
       head?: c4.RelationshipArrowType
       tail?: c4.RelationshipArrowType
     }
   >
+  colors: Record<
+    c4.CustomColor,
+    {
+      color: c4.HexColorLiteral
+    }
+  >
 }
 
 export interface ParsedAstElement {
@@ -83,7 +84,7 @@ export interface ParsedAstRelation {
   title: string
   description?: string
   technology?: string
-  color?: c4.ThemeColor
+  color?: c4.Color
   line?: c4.RelationshipLineType
   head?: c4.RelationshipArrowType
   tail?: c4.RelationshipArrowType
@@ -181,8 +182,10 @@ export interface ParsedLikeC4LangiumDocument
 export function cleanParsedModel(doc: LikeC4LangiumDocument) {
   const props: Required<Omit<LikeC4DocumentProps, 'c4fqnIndex' | 'diagnostics'>> = {
     c4Specification: {
-      kinds: {},
-      relationships: {}
+      tags: new Set(),
+      elements: {},
+      relationships: {},
+      colors: {}
     },
     c4Elements: [],
     c4Relations: [],
@@ -247,6 +250,7 @@ const isValidatableAstNode = validatableAstNodeGuards([
   ast.isSpecificationElementKind,
   ast.isSpecificationRelationshipKind,
   ast.isSpecificationTag,
+  ast.isSpecificationColor,
   ast.isSpecificationRule,
   ast.isModelViews,
   ast.isModel
@@ -279,8 +283,9 @@ export function checksFromDiagnostics(doc: LikeC4LangiumDocument) {
   }
 }
 export type ChecksFromDiagnostics = ReturnType<typeof checksFromDiagnostics>
+export type IsValidFn = ChecksFromDiagnostics['isValid']
 
-export function* streamModel(doc: LikeC4LangiumDocument, isValid: ChecksFromDiagnostics['isValid']) {
+export function* streamModel(doc: LikeC4LangiumDocument, isValid: IsValidFn) {
   const traverseStack = doc.parseResult.value.models.flatMap(m => (isValid(m) ? m.elements : []))
   const relations = [] as ast.Relation[]
   let el
@@ -299,13 +304,7 @@ export function* streamModel(doc: LikeC4LangiumDocument, isValid: ChecksFromDiag
       continue
     }
     if (el.body && el.body.elements.length > 0) {
-      for (const nested of el.body.elements) {
-        if (ast.isRelation(nested)) {
-          relations.push(nested)
-        } else {
-          traverseStack.push(nested)
-        }
-      }
+      traverseStack.push(...el.body.elements)
     }
     yield el
   }
@@ -320,12 +319,12 @@ export function resolveRelationPoints(node: ast.Relation): {
 } {
   const target = elementRef(node.target)
   if (!target) {
-    throw new RelationRefError('Invalid reference to target')
+    throw new Error('RelationRefError: Invalid reference to target')
   }
   if (isDefined(node.source)) {
     const source = elementRef(node.source)
     if (!source) {
-      throw new RelationRefError('Invalid reference to source')
+      throw new Error('RelationRefError: Invalid reference to source')
     }
     return {
       source,
@@ -333,7 +332,7 @@ export function resolveRelationPoints(node: ast.Relation): {
     }
   }
   if (!ast.isElementBody(node.$container)) {
-    throw new RelationRefError('Invalid container for sourceless relation')
+    throw new Error('RelationRefError: Invalid container for sourceless relation')
   }
   return {
     source: node.$container.$container,
@@ -346,12 +345,15 @@ export function parseAstOpacityProperty({ value }: ast.OpacityProperty): number
   return isNaN(opacity) ? 100 : clamp(opacity, { min: 0, max: 100 })
 }
 
-export function toElementStyle(props?: Array<ast.StyleProperty>) {
+export function toElementStyle(props: Array<ast.StyleProperty> | undefined, isValid: IsValidFn) {
   const result = {} as ParsedElementStyle
   if (!props || props.length === 0) {
     return result
   }
   for (const prop of props) {
+    if (!isValid(prop)) {
+      continue
+    }
     switch (true) {
       case ast.isBorderProperty(prop): {
         if (isTruthy(prop.value)) {
@@ -360,8 +362,9 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
         break
       }
       case ast.isColorProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.color = prop.value
+        const color = toColor(prop)
+        if (isTruthy(color)) {
+          result.color = color
         }
         break
       }
@@ -392,7 +395,7 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
 
 export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
   const result = {} as {
-    color?: c4.ThemeColor
+    color?: c4.Color
     line?: c4.RelationshipLineType
     head?: c4.RelationshipArrowType
     tail?: c4.RelationshipArrowType
@@ -402,7 +405,10 @@ export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
   }
   for (const prop of props) {
     if (ast.isColorProperty(prop)) {
-      result.color = prop.value
+      const color = toColor(prop)
+      if (isTruthy(color)) {
+        result.color = color
+      }
       continue
     }
     if (ast.isLineProperty(prop)) {
@@ -442,6 +448,10 @@ export function toRelationshipStyleExcludeDefaults(
   }
 }
 
+export function toColor(astNode: ast.ColorProperty): c4.Color | undefined {
+  return astNode?.themeColor ?? (astNode?.customColor?.$refText as (c4.HexColorLiteral | undefined))
+}
+
 export function toAutoLayout(
   direction: ast.ViewLayoutDirection
 ): c4.ViewRuleAutoLayout['autoLayout'] {

package/src/browser.ts

@@ -1,6 +1,5 @@
 import { startLanguageServer as startLanguim } from 'langium/lsp'
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser'
-import { logToLspConnection } from './logger'
 import { createLanguageServices } from './module'
 
 // This is an example copied as is from here:
@@ -22,8 +21,6 @@ export function startLanguageServer() {
   // Start the language server with the shared services
   startLanguim(services.shared)
 
-  logToLspConnection(connection)
-
   return {
     ...services,
     connection,

package/src/elementRef.ts

@@ -1,4 +1,4 @@
-import { type c4 } from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import type { ast } from './ast'
 /**
  * Returns referenced AST Element

package/src/generated/ast.ts

@@ -24,6 +24,7 @@ export const LikeC4Terminals = {
     Percent: /\b\d+%/,
     String: /"[^"]*"|'[^']*'/,
     IdTerminal: /[_]*[a-zA-Z][-\w]*/,
+    Hex: /[a-zA-Z0-9]+/,
 };
 
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
@@ -38,6 +39,18 @@ export function isBorderStyleValue(item: unknown): item is BorderStyleValue {
     return isLineOptions(item) || item === 'none';
 }
 
+export type CustomColorId = 'element' | 'model' | ArrowType | ElementShape | LineOptions | string;
+
+export function isCustomColorId(item: unknown): item is CustomColorId {
+    return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
+}
+
+export type CustomColorValue = string;
+
+export function isCustomColorValue(item: unknown): item is CustomColorValue {
+    return typeof item === 'string';
+}
+
 export type DotId = string;
 
 export function isDotId(item: unknown): item is DotId {
@@ -321,8 +334,9 @@ export function isBorderProperty(item: unknown): item is BorderProperty {
 export interface ColorProperty extends AstNode {
     readonly $container: CustomElementProperties | CustomRelationProperties | ElementStyleProperty | RelationStyleProperty | SpecificationRelationshipKind | ViewRuleStyle;
     readonly $type: 'ColorProperty';
+    customColor?: Reference<CustomColor>;
     key: 'color';
-    value: ThemeColor;
+    themeColor?: ThemeColor;
 }
 
 export const ColorProperty = 'ColorProperty';
@@ -331,6 +345,18 @@ export function isColorProperty(item: unknown): item is ColorProperty {
     return reflection.isInstance(item, ColorProperty);
 }
 
+export interface CustomColor extends AstNode {
+    readonly $container: SpecificationColor;
+    readonly $type: 'CustomColor';
+    name: CustomColorId;
+}
+
+export const CustomColor = 'CustomColor';
+
+export function isCustomColor(item: unknown): item is CustomColor {
+    return reflection.isInstance(item, CustomColor);
+}
+
 export interface CustomElementProperties extends AstNode {
     readonly $container: ElementPredicateWith;
     readonly $type: 'CustomElementProperties';
@@ -1038,6 +1064,19 @@ export function isShapeProperty(item: unknown): item is ShapeProperty {
     return reflection.isInstance(item, ShapeProperty);
 }
 
+export interface SpecificationColor extends AstNode {
+    readonly $container: SpecificationRule;
+    readonly $type: 'SpecificationColor';
+    color: CustomColorValue;
+    name: CustomColor;
+}
+
+export const SpecificationColor = 'SpecificationColor';
+
+export function isSpecificationColor(item: unknown): item is SpecificationColor {
+    return reflection.isInstance(item, SpecificationColor);
+}
+
 export interface SpecificationElementKind extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationElementKind';
@@ -1093,6 +1132,7 @@ export function isSpecificationRelationshipStringProperty(item: unknown): item i
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'SpecificationRule';
+    colors: Array<SpecificationColor>;
     elements: Array<SpecificationElementKind>;
     name: 'specification';
     relationships: Array<SpecificationRelationshipKind>;
@@ -1302,6 +1342,7 @@ export type LikeC4AstType = {
     ArrowProperty: ArrowProperty
     BorderProperty: BorderProperty
     ColorProperty: ColorProperty
+    CustomColor: CustomColor
     CustomElementProperties: CustomElementProperties
     CustomRelationProperties: CustomRelationProperties
     DirectedRelationExpression: DirectedRelationExpression
@@ -1369,6 +1410,7 @@ export type LikeC4AstType = {
     RelationshipKind: RelationshipKind
     RelationshipStyleProperty: RelationshipStyleProperty
     ShapeProperty: ShapeProperty
+    SpecificationColor: SpecificationColor
     SpecificationElementKind: SpecificationElementKind
     SpecificationElementStringProperty: SpecificationElementStringProperty
     SpecificationRelationshipKind: SpecificationRelationshipKind
@@ -1406,7 +1448,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewIncludePredicate, DynamicViewPredicateIterator, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRuleStyle, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
+        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewIncludePredicate, DynamicViewPredicateIterator, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRuleStyle, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1544,6 +1586,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
     getReferenceType(refInfo: ReferenceInfo): string {
         const referenceId = `${refInfo.container.$type}:${refInfo.property}`;
         switch (referenceId) {
+            case 'ColorProperty:customColor': {
+                return CustomColor;
+            }
             case 'DynamicViewStep:kind':
             case 'OutgoingRelationExpression:kind':
             case 'Relation:kind':
@@ -1604,8 +1649,17 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ColorProperty,
                     properties: [
+                        { name: 'customColor' },
                         { name: 'key' },
-                        { name: 'value' }
+                        { name: 'themeColor' }
+                    ]
+                };
+            }
+            case CustomColor: {
+                return {
+                    name: CustomColor,
+                    properties: [
+                        { name: 'name' }
                     ]
                 };
             }
@@ -2101,6 +2155,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case SpecificationColor: {
+                return {
+                    name: SpecificationColor,
+                    properties: [
+                        { name: 'color' },
+                        { name: 'name' }
+                    ]
+                };
+            }
             case SpecificationElementKind: {
                 return {
                     name: SpecificationElementKind,
@@ -2141,6 +2204,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: SpecificationRule,
                     properties: [
+                        { name: 'colors', defaultValue: [] },
                         { name: 'elements', defaultValue: [] },
                         { name: 'name' },
                         { name: 'relationships', defaultValue: [] },