@likec4/language-server 1.7.4 → 1.8.0

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|and|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|is|it|kind|likec4lib|line|link|mobile|model|muted|navigateTo|none|normal|not|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|where|with)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|and|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|is|it|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|none|normal|not|notation|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|where|with)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.7.4",
+  "version": "1.8.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -91,9 +91,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@dagrejs/graphlib": "^2.2.3",
-    "@likec4/core": "1.7.4",
-    "@likec4/log": "1.7.4",
+    "@dagrejs/graphlib": "^2.2.4",
+    "@likec4/core": "1.8.0",
+    "@likec4/log": "1.8.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "@total-typescript/ts-reset": "^0.5.1",
@@ -103,7 +103,7 @@
     "langium": "3.1.3",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.3.0",
+    "remeda": "^2.11.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
     "type-fest": "^4.21.0",
@@ -114,12 +114,12 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.7.4",
-    "@likec4/tsconfig": "1.7.4",
-    "@types/node": "^20.14.14",
+    "@likec4/icons": "1.8.0",
+    "@likec4/tsconfig": "1.8.0",
+    "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "execa": "^9.3.0",
+    "execa": "^9.3.1",
     "glob": "^11.0.0",
     "langium-cli": "3.1.1",
     "npm-run-all2": "^6.2.2",

package/src/ast.ts

@@ -4,6 +4,7 @@ import {
   DefaultLineStyle,
   DefaultRelationshipColor,
   nonexhaustive,
+  NullableError,
   RelationRefError
 } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
@@ -42,10 +43,16 @@ type ParsedElementStyle = {
 }
 
 export interface ParsedAstSpecification {
-  kinds: Record<c4.ElementKind, ParsedElementStyle>
+  kinds: Record<c4.ElementKind, {
+    technology?: string
+    notation?: string
+    style: ParsedElementStyle
+  }>
   relationships: Record<
     c4.RelationshipKind,
     {
+      technology?: string
+      notation?: string
       color?: c4.ThemeColor
       line?: c4.RelationshipLineType
       head?: c4.RelationshipArrowType
@@ -62,8 +69,9 @@ export interface ParsedAstElement {
   description?: string
   technology?: string
   tags?: c4.NonEmptyArray<c4.Tag>
-  links?: c4.NonEmptyArray<string>
+  links?: c4.NonEmptyArray<ParsedLink>
   style: ParsedElementStyle
+  metadata?: { [key: string]: string }
 }
 
 export interface ParsedAstRelation {
@@ -80,7 +88,8 @@ export interface ParsedAstRelation {
   line?: c4.RelationshipLineType
   head?: c4.RelationshipArrowType
   tail?: c4.RelationshipArrowType
-  links?: c4.NonEmptyArray<string>
+  links?: c4.NonEmptyArray<ParsedLink>
+  metadata?: { [key: string]: string }
 }
 
 export interface ParsedAstElementView {
@@ -92,7 +101,7 @@ export interface ParsedAstElementView {
   title: string | null
   description: string | null
   tags: c4.NonEmptyArray<c4.Tag> | null
-  links: c4.NonEmptyArray<string> | null
+  links: c4.NonEmptyArray<ParsedLink> | null
   rules: c4.ViewRule[]
   manualLayout?: c4.ViewManualLayout
 }
@@ -104,7 +113,7 @@ export interface ParsedAstDynamicView {
   title: string | null
   description: string | null
   tags: c4.NonEmptyArray<c4.Tag> | null
-  links: c4.NonEmptyArray<string> | null
+  links: c4.NonEmptyArray<ParsedLink> | null
   steps: c4.DynamicViewStep[]
   rules: Array<c4.DynamicViewRule>
   manualLayout?: c4.ViewManualLayout
@@ -121,6 +130,11 @@ export const ViewOps = {
   }
 }
 
+export interface ParsedLink {
+  title?: string
+  url: string
+}
+
 export const ElementOps = {
   writeId(node: ast.Element, id: c4.Fqn | null) {
     if (isNullish(id)) {
@@ -338,15 +352,21 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
   for (const prop of props) {
     switch (true) {
       case ast.isBorderProperty(prop): {
-        result.border = prop.value
+        if (isTruthy(prop.value)) {
+          result.border = prop.value
+        }
         break
       }
       case ast.isColorProperty(prop): {
-        result.color = prop.value
+        if (isTruthy(prop.value)) {
+          result.color = prop.value
+        }
         break
       }
       case ast.isShapeProperty(prop): {
-        result.shape = prop.value
+        if (isTruthy(prop.value)) {
+          result.shape = prop.value
+        }
         break
       }
       case ast.isIconProperty(prop): {
@@ -368,7 +388,7 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
   return result
 }
 
-export function toRelationshipStyle(props?: ast.SpecificationRelationshipKind['props']) {
+export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
   const result = {} as {
     color?: c4.ThemeColor
     line?: c4.RelationshipLineType
@@ -411,7 +431,7 @@ export function toRelationshipStyle(props?: ast.SpecificationRelationshipKind['p
 export function toRelationshipStyleExcludeDefaults(
   props?: ast.SpecificationRelationshipKind['props']
 ) {
-  const { color, line, head, tail } = toRelationshipStyle(props)
+  const { color, line, head, tail } = toRelationshipStyle(props?.filter(ast.isRelationshipStyleProperty))
   return {
     ...(color && color !== DefaultRelationshipColor ? { color } : {}),
     ...(line && line !== DefaultLineStyle ? { line } : {}),

package/src/generated/ast.ts

@@ -76,7 +76,7 @@ export function isElementPredicateOrWhere(item: unknown): item is ElementPredica
     return reflection.isInstance(item, ElementPredicateOrWhere);
 }
 
-export type ElementProperty = ElementStringProperty | IconProperty | LinkProperty | StyleProperties;
+export type ElementProperty = ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataProperty;
 
 export const ElementProperty = 'ElementProperty';
 
@@ -116,6 +116,14 @@ export function isLineOptions(item: unknown): item is LineOptions {
     return item === 'solid' || item === 'dashed' || item === 'dotted';
 }
 
+export type MetadataProperty = MetadataBody;
+
+export const MetadataProperty = 'MetadataProperty';
+
+export function isMetadataProperty(item: unknown): item is MetadataProperty {
+    return reflection.isInstance(item, MetadataProperty);
+}
+
 export type Predicate = ElementPredicate | RelationPredicate;
 
 export const Predicate = 'Predicate';
@@ -156,7 +164,7 @@ export function isRelationPredicateOrWhere(item: unknown): item is RelationPredi
     return reflection.isInstance(item, RelationPredicateOrWhere);
 }
 
-export type RelationProperty = LinkProperty | RelationStringProperty | RelationStyleProperty;
+export type RelationProperty = LinkProperty | MetadataProperty | RelationStringProperty | RelationStyleProperty;
 
 export const RelationProperty = 'RelationProperty';
 
@@ -172,7 +180,7 @@ export function isRelationshipStyleProperty(item: unknown): item is Relationship
     return reflection.isInstance(item, RelationshipStyleProperty);
 }
 
-export type StringProperty = ElementStringProperty | RelationStringProperty | ViewStringProperty;
+export type StringProperty = ElementStringProperty | MetadataAttribute | NotationProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
 
 export const StringProperty = 'StringProperty';
 
@@ -306,7 +314,7 @@ export function isArrowProperty(item: unknown): item is ArrowProperty {
 }
 
 export interface BorderProperty extends AstNode {
-    readonly $container: CustomElementProperties | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementStyleProperty | ViewRuleStyle;
     readonly $type: 'BorderProperty';
     key: 'border';
     value: BorderStyleValue;
@@ -319,7 +327,7 @@ export function isBorderProperty(item: unknown): item is BorderProperty {
 }
 
 export interface ColorProperty extends AstNode {
-    readonly $container: CustomElementProperties | CustomRelationProperties | RelationStyleProperty | SpecificationRelationshipKind | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementProperties | CustomRelationProperties | ElementStyleProperty | RelationStyleProperty | SpecificationRelationshipKind | ViewRuleStyle;
     readonly $type: 'ColorProperty';
     key: 'color';
     value: ThemeColor;
@@ -334,7 +342,7 @@ export function isColorProperty(item: unknown): item is ColorProperty {
 export interface CustomElementProperties extends AstNode {
     readonly $container: ElementPredicateWith;
     readonly $type: 'CustomElementProperties';
-    props: Array<ElementStringProperty | NavigateToProperty | StyleProperty>;
+    props: Array<ElementStringProperty | NavigateToProperty | NotationProperty | StyleProperty>;
 }
 
 export const CustomElementProperties = 'CustomElementProperties';
@@ -346,7 +354,7 @@ export function isCustomElementProperties(item: unknown): item is CustomElementP
 export interface CustomRelationProperties extends AstNode {
     readonly $container: DynamicViewStep | RelationPredicateWith;
     readonly $type: 'CustomRelationProperties';
-    props: Array<RelationStringProperty | RelationshipStyleProperty>;
+    props: Array<NotationProperty | RelationStringProperty | RelationshipStyleProperty>;
 }
 
 export const CustomRelationProperties = 'CustomRelationProperties';
@@ -569,6 +577,19 @@ export function isElementStringProperty(item: unknown): item is ElementStringPro
     return reflection.isInstance(item, ElementStringProperty);
 }
 
+export interface ElementStyleProperty extends AstNode {
+    readonly $container: ElementBody | SpecificationElementKind;
+    readonly $type: 'ElementStyleProperty';
+    key: 'style';
+    props: Array<StyleProperty>;
+}
+
+export const ElementStyleProperty = 'ElementStyleProperty';
+
+export function isElementStyleProperty(item: unknown): item is ElementStyleProperty {
+    return reflection.isInstance(item, ElementStyleProperty);
+}
+
 export interface ElementTagExpression extends AstNode {
     readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
     readonly $type: 'ElementTagExpression';
@@ -655,6 +676,7 @@ export interface ExplicitRelation extends AstNode {
     source: ElementRef;
     tags?: Tags;
     target: ElementRef;
+    technology?: string;
     title?: string;
 }
 
@@ -703,7 +725,7 @@ export function isFqnElementRef(item: unknown): item is FqnElementRef {
 }
 
 export interface IconProperty extends AstNode {
-    readonly $container: CustomElementProperties | ElementBody | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementBody | ElementStyleProperty | ViewRuleStyle;
     readonly $type: 'IconProperty';
     key: 'icon';
     libicon?: Reference<LibIcon>;
@@ -723,6 +745,7 @@ export interface ImplicitRelation extends AstNode {
     kind?: Reference<RelationshipKind>;
     tags?: Tags;
     target: ElementRef;
+    technology?: string;
     title?: string;
 }
 
@@ -823,6 +846,7 @@ export interface LinkProperty extends AstNode {
     readonly $container: DynamicViewBody | ElementBody | ElementViewBody | RelationBody;
     readonly $type: 'LinkProperty';
     key: 'link';
+    title?: string;
     value: Uri;
 }
 
@@ -832,6 +856,31 @@ export function isLinkProperty(item: unknown): item is LinkProperty {
     return reflection.isInstance(item, LinkProperty);
 }
 
+export interface MetadataAttribute extends AstNode {
+    readonly $container: MetadataBody;
+    readonly $type: 'MetadataAttribute';
+    key: string;
+    value: string;
+}
+
+export const MetadataAttribute = 'MetadataAttribute';
+
+export function isMetadataAttribute(item: unknown): item is MetadataAttribute {
+    return reflection.isInstance(item, MetadataAttribute);
+}
+
+export interface MetadataBody extends AstNode {
+    readonly $container: ElementBody | RelationBody;
+    readonly $type: 'MetadataBody';
+    props: Array<MetadataAttribute>;
+}
+
+export const MetadataBody = 'MetadataBody';
+
+export function isMetadataBody(item: unknown): item is MetadataBody {
+    return reflection.isInstance(item, MetadataBody);
+}
+
 export interface Model extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'Model';
@@ -871,8 +920,21 @@ export function isNavigateToProperty(item: unknown): item is NavigateToProperty
     return reflection.isInstance(item, NavigateToProperty);
 }
 
+export interface NotationProperty extends AstNode {
+    readonly $container: CustomElementProperties | CustomRelationProperties | ViewRuleStyle;
+    readonly $type: 'NotationProperty';
+    key: 'notation';
+    value: string;
+}
+
+export const NotationProperty = 'NotationProperty';
+
+export function isNotationProperty(item: unknown): item is NotationProperty {
+    return reflection.isInstance(item, NotationProperty);
+}
+
 export interface OpacityProperty extends AstNode {
-    readonly $container: CustomElementProperties | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementStyleProperty | ViewRuleStyle;
     readonly $type: 'OpacityProperty';
     key: 'opacity';
     value: string;
@@ -989,7 +1051,7 @@ export function isRelationStyleProperty(item: unknown): item is RelationStylePro
 }
 
 export interface ShapeProperty extends AstNode {
-    readonly $container: CustomElementProperties | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementStyleProperty | ViewRuleStyle;
     readonly $type: 'ShapeProperty';
     key: 'shape';
     value: ElementShape;
@@ -1005,7 +1067,7 @@ export interface SpecificationElementKind extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationElementKind';
     kind: ElementKind;
-    style?: StyleProperties;
+    props: Array<ElementStyleProperty | SpecificationElementStringProperty>;
 }
 
 export const SpecificationElementKind = 'SpecificationElementKind';
@@ -1014,11 +1076,24 @@ export function isSpecificationElementKind(item: unknown): item is Specification
     return reflection.isInstance(item, SpecificationElementKind);
 }
 
+export interface SpecificationElementStringProperty extends AstNode {
+    readonly $container: SpecificationElementKind;
+    readonly $type: 'SpecificationElementStringProperty';
+    key: 'notation' | 'technology';
+    value: string;
+}
+
+export const SpecificationElementStringProperty = 'SpecificationElementStringProperty';
+
+export function isSpecificationElementStringProperty(item: unknown): item is SpecificationElementStringProperty {
+    return reflection.isInstance(item, SpecificationElementStringProperty);
+}
+
 export interface SpecificationRelationshipKind extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationRelationshipKind';
     kind: RelationshipKind;
-    props: Array<RelationshipStyleProperty>;
+    props: Array<RelationshipStyleProperty | SpecificationRelationshipStringProperty>;
 }
 
 export const SpecificationRelationshipKind = 'SpecificationRelationshipKind';
@@ -1027,6 +1102,19 @@ export function isSpecificationRelationshipKind(item: unknown): item is Specific
     return reflection.isInstance(item, SpecificationRelationshipKind);
 }
 
+export interface SpecificationRelationshipStringProperty extends AstNode {
+    readonly $container: SpecificationRelationshipKind;
+    readonly $type: 'SpecificationRelationshipStringProperty';
+    key: 'notation' | 'technology';
+    value: string;
+}
+
+export const SpecificationRelationshipStringProperty = 'SpecificationRelationshipStringProperty';
+
+export function isSpecificationRelationshipStringProperty(item: unknown): item is SpecificationRelationshipStringProperty {
+    return reflection.isInstance(item, SpecificationRelationshipStringProperty);
+}
+
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'SpecificationRule';
@@ -1054,19 +1142,6 @@ export function isSpecificationTag(item: unknown): item is SpecificationTag {
     return reflection.isInstance(item, SpecificationTag);
 }
 
-export interface StyleProperties extends AstNode {
-    readonly $container: ElementBody | SpecificationElementKind;
-    readonly $type: 'StyleProperties';
-    key: 'style';
-    props: Array<StyleProperty>;
-}
-
-export const StyleProperties = 'StyleProperties';
-
-export function isStyleProperties(item: unknown): item is StyleProperties {
-    return reflection.isInstance(item, StyleProperties);
-}
-
 export interface Tag extends AstNode {
     readonly $container: SpecificationTag;
     readonly $type: 'Tag';
@@ -1119,7 +1194,7 @@ export function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout
 export interface ViewRuleStyle extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody;
     readonly $type: 'ViewRuleStyle';
-    props: Array<StyleProperty>;
+    props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
 }
 
@@ -1275,6 +1350,7 @@ export type LikeC4AstType = {
     ElementProperty: ElementProperty
     ElementRef: ElementRef
     ElementStringProperty: ElementStringProperty
+    ElementStyleProperty: ElementStyleProperty
     ElementTagExpression: ElementTagExpression
     ElementView: ElementView
     ElementViewBody: ElementViewBody
@@ -1296,9 +1372,13 @@ export type LikeC4AstType = {
     LikeC4View: LikeC4View
     LineProperty: LineProperty
     LinkProperty: LinkProperty
+    MetadataAttribute: MetadataAttribute
+    MetadataBody: MetadataBody
+    MetadataProperty: MetadataProperty
     Model: Model
     ModelViews: ModelViews
     NavigateToProperty: NavigateToProperty
+    NotationProperty: NotationProperty
     OpacityProperty: OpacityProperty
     OutgoingRelationExpression: OutgoingRelationExpression
     Predicate: Predicate
@@ -1317,11 +1397,12 @@ export type LikeC4AstType = {
     RelationshipStyleProperty: RelationshipStyleProperty
     ShapeProperty: ShapeProperty
     SpecificationElementKind: SpecificationElementKind
+    SpecificationElementStringProperty: SpecificationElementStringProperty
     SpecificationRelationshipKind: SpecificationRelationshipKind
+    SpecificationRelationshipStringProperty: SpecificationRelationshipStringProperty
     SpecificationRule: SpecificationRule
     SpecificationTag: SpecificationTag
     StringProperty: StringProperty
-    StyleProperties: StyleProperties
     StyleProperty: StyleProperty
     Tag: Tag
     Tags: Tags
@@ -1352,7 +1433,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, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExplicitRelation, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, ImplicitRelation, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, Model, ModelViews, NavigateToProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationRelationshipKind, SpecificationRule, SpecificationTag, StringProperty, StyleProperties, 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, 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, ExplicitRelation, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, ImplicitRelation, 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];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1405,6 +1486,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case ElementStringProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StringProperty, supertype);
             }
+            case ElementStyleProperty: {
+                return this.isSubtype(ElementProperty, supertype);
+            }
             case ExcludePredicate:
             case IncludePredicate: {
                 return this.isSubtype(ViewRulePredicate, supertype);
@@ -1419,6 +1503,18 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case LinkProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
             }
+            case MetadataAttribute:
+            case NotationProperty:
+            case SpecificationElementStringProperty:
+            case SpecificationRelationshipStringProperty: {
+                return this.isSubtype(StringProperty, supertype);
+            }
+            case MetadataBody: {
+                return this.isSubtype(MetadataProperty, supertype);
+            }
+            case MetadataProperty: {
+                return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
+            }
             case RelationExpression:
             case RelationPredicateWhere: {
                 return this.isSubtype(RelationPredicateOrWhere, supertype);
@@ -1433,9 +1529,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case RelationStyleProperty: {
                 return this.isSubtype(RelationProperty, supertype);
             }
-            case StyleProperties: {
-                return this.isSubtype(ElementProperty, supertype);
-            }
             case ViewRuleAutoLayout:
             case ViewRuleStyle: {
                 return this.isSubtype(DynamicViewRule, supertype) || this.isSubtype(ViewRule, supertype);
@@ -1714,6 +1807,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case ElementStyleProperty: {
+                return {
+                    name: ElementStyleProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'props', defaultValue: [] }
+                    ]
+                };
+            }
             case ElementTagExpression: {
                 return {
                     name: ElementTagExpression,
@@ -1777,6 +1879,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                         { name: 'source' },
                         { name: 'tags' },
                         { name: 'target' },
+                        { name: 'technology' },
                         { name: 'title' }
                     ]
                 };
@@ -1825,6 +1928,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                         { name: 'kind' },
                         { name: 'tags' },
                         { name: 'target' },
+                        { name: 'technology' },
                         { name: 'title' }
                     ]
                 };
@@ -1892,12 +1996,30 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case LinkProperty: {
                 return {
                     name: LinkProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'title' },
+                        { name: 'value' }
+                    ]
+                };
+            }
+            case MetadataAttribute: {
+                return {
+                    name: MetadataAttribute,
                     properties: [
                         { name: 'key' },
                         { name: 'value' }
                     ]
                 };
             }
+            case MetadataBody: {
+                return {
+                    name: MetadataBody,
+                    properties: [
+                        { name: 'props', defaultValue: [] }
+                    ]
+                };
+            }
             case Model: {
                 return {
                     name: Model,
@@ -1925,6 +2047,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case NotationProperty: {
+                return {
+                    name: NotationProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case OpacityProperty: {
                 return {
                     name: OpacityProperty,
@@ -2020,7 +2151,16 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     name: SpecificationElementKind,
                     properties: [
                         { name: 'kind' },
-                        { name: 'style' }
+                        { name: 'props', defaultValue: [] }
+                    ]
+                };
+            }
+            case SpecificationElementStringProperty: {
+                return {
+                    name: SpecificationElementStringProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
                     ]
                 };
             }
@@ -2033,6 +2173,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case SpecificationRelationshipStringProperty: {
+                return {
+                    name: SpecificationRelationshipStringProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case SpecificationRule: {
                 return {
                     name: SpecificationRule,
@@ -2052,15 +2201,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case StyleProperties: {
-                return {
-                    name: StyleProperties,
-                    properties: [
-                        { name: 'key' },
-                        { name: 'props', defaultValue: [] }
-                    ]
-                };
-            }
             case Tag: {
                 return {
                     name: Tag,