@likec4/language-server 1.32.1 → 1.33.0

package/dist/model/parser/Base.js

@@ -6,7 +6,6 @@ import {
   isArray,
   isBoolean,
   isEmpty,
-  isNonNullish,
   isNumber,
   isString,
   isTruthy,
@@ -21,16 +20,47 @@ import {
   parseAstOpacityProperty,
   parseAstPercent,
   parseAstSizeValue,
+  parseMarkdownAsString,
   toColor
 } from "../../ast.js";
 import { projectIdFrom } from "../../utils/index.js";
 import { readStrictFqn } from "../../utils/elementRef.js";
 import { checksFromDiagnostics } from "../../validation/index.js";
 export function toSingleLine(str) {
-  return isNonNullish(str) ? removeIndent(str).split("\n").join(" ") : void 0;
+  if (str === null || str === void 0) {
+    return void 0;
+  }
+  const without = removeIndent(str);
+  if (isString(without)) {
+    return without.split("\n").join(" ");
+  }
+  if ("md" in without) {
+    return {
+      md: without.md.split("\n").join("  ")
+    };
+  }
+  return {
+    txt: without.txt.split("\n").join(" ")
+  };
 }
 export function removeIndent(str) {
-  return isNonNullish(str) ? stripIndent(str).trim() : void 0;
+  if (str === null || str === void 0) {
+    return void 0;
+  }
+  switch (true) {
+    case isString(str):
+      return stripIndent(str).trim();
+    case (ast.isMarkdownOrString(str) && isTruthy(str.markdown)):
+      return {
+        md: stripIndent(str.markdown).trim()
+      };
+    case (ast.isMarkdownOrString(str) && isTruthy(str.text)):
+      return {
+        txt: stripIndent(str.text).trim()
+      };
+    default:
+      return void 0;
+  }
 }
 export class BaseParser {
   constructor(services, doc) {
@@ -72,11 +102,18 @@ export class BaseParser {
     const data = pipe(
       metadataAstNode.props,
       map((p) => [p.key, removeIndent(p.value)]),
+      map(([key, value]) => [key, value.md || value.txt]),
       filter(([_, value]) => isTruthy(value)),
       fromEntries()
     );
     return isEmpty(data) ? void 0 : data;
   }
+  parseMarkdownOrString(markdownOrString) {
+    if (ast.isMarkdownOrString(markdownOrString)) {
+      return removeIndent(markdownOrString);
+    }
+    return void 0;
+  }
   convertTags(withTags) {
     return this.parseTags(withTags);
   }
@@ -258,4 +295,18 @@ export class BaseParser {
     }
     return result;
   }
+  /**
+   * Parses title, description and technology
+   * Inline properties (right on node) have higher priority than body properties (inside '{...}')
+   */
+  parseTitleDescriptionTechnology(inlineProps, bodyProps) {
+    const title = removeIndent(inlineProps.title ?? parseMarkdownAsString(bodyProps.title));
+    const description = inlineProps.description ? { txt: removeIndent(inlineProps.description) } : this.parseMarkdownOrString(bodyProps.description);
+    const technology = toSingleLine(inlineProps.technology) ?? removeIndent(parseMarkdownAsString(bodyProps.technology));
+    return {
+      ...isTruthy(title) && { title },
+      ...isTruthy(description) && { description },
+      ...isTruthy(technology) && { technology }
+    };
+  }
 }

package/dist/model/parser/DeploymentModelParser.d.ts

@@ -38,6 +38,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -50,5 +51,18 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/DeploymentModelParser.js

@@ -6,7 +6,6 @@ import {
 } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { stringHash } from "../../utils/stringHash.js";
-import { removeIndent, toSingleLine } from "./Base.js";
 function* streamDeploymentModel(doc) {
   const traverseStack = LinkedList.from(
     doc.parseResult.value.deployments.flatMap((m) => m.elements)
@@ -74,11 +73,14 @@ export function DeploymentModelParser(B) {
         astNode.body?.props ?? [],
         filter(isValid),
         filter(ast.isElementStringProperty),
-        mapToObj((p) => [p.key, p.value || void 0])
+        mapToObj((p) => [p.key, p.value])
+      );
+      const { title, ...descAndTech } = this.parseTitleDescriptionTechnology(
+        {
+          title: astNode.title
+        },
+        bodyProps
       );
-      const title = removeIndent(astNode.title ?? bodyProps.title);
-      const description = removeIndent(bodyProps.description);
-      const technology = toSingleLine(bodyProps.technology);
       const links = this.convertLinks(astNode.body);
       return {
         id,
@@ -87,8 +89,7 @@ export function DeploymentModelParser(B) {
         ...metadata && { metadata },
         ...tags && { tags },
         ...links && isNonEmptyArray(links) && { links },
-        ...isTruthy(technology) && { technology },
-        ...isTruthy(description) && { description },
+        ...descAndTech,
         style
       };
     }
@@ -104,21 +105,22 @@ export function DeploymentModelParser(B) {
         astNode.body?.props ?? [],
         filter(isValid),
         filter(ast.isElementStringProperty),
-        mapToObj((p) => [p.key, p.value || void 0])
+        mapToObj((p) => [p.key, p.value])
+      );
+      const titleDescAndTech = this.parseTitleDescriptionTechnology(
+        {
+          title: astNode.title
+        },
+        bodyProps
       );
-      const title = removeIndent(astNode.title ?? bodyProps.title);
-      const description = removeIndent(bodyProps.description);
-      const technology = toSingleLine(bodyProps.technology);
       const links = this.convertLinks(astNode.body);
       return {
         id,
         element: target,
         ...metadata && { metadata },
-        ...title && { title },
         ...tags && { tags },
         ...links && isNonEmptyArray(links) && { links },
-        ...isTruthy(technology) && { technology },
-        ...isTruthy(description) && { description },
+        ...titleDescAndTech,
         style
       };
     }
@@ -164,9 +166,11 @@ export function DeploymentModelParser(B) {
       const links = this.convertLinks(astNode.body);
       const kind = (astNode.kind ?? astNode.dotKind?.kind)?.ref?.name;
       const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty));
-      const bodyProps = mapToObj(
-        astNode.body?.props.filter(ast.isRelationStringProperty) ?? [],
-        (p) => [p.key, p.value]
+      const bodyProps = pipe(
+        astNode.body?.props ?? [],
+        filter(ast.isRelationStringProperty),
+        filter((p) => isTruthy(p.value)),
+        mapToObj((p) => [p.key, p.value])
       );
       const navigateTo = pipe(
         astNode.body?.props ?? [],
@@ -175,9 +179,12 @@ export function DeploymentModelParser(B) {
         filter(isTruthy),
         first()
       );
-      const title = removeIndent(astNode.title ?? bodyProps.title);
-      const description = removeIndent(bodyProps.description);
-      const technology = toSingleLine(astNode.technology) ?? removeIndent(bodyProps.technology);
+      const titleDescAndTech = this.parseTitleDescriptionTechnology(
+        {
+          title: astNode.title
+        },
+        bodyProps
+      );
       const styleProp = astNode.body?.props.find(ast.isRelationStyleProperty);
       const id = stringHash(
         "deployment",
@@ -189,10 +196,8 @@ export function DeploymentModelParser(B) {
         id,
         source,
         target,
-        ...title && { title },
+        ...titleDescAndTech,
         ...metadata && { metadata },
-        ...isTruthy(technology) && { technology },
-        ...isTruthy(description) && { description },
         ...kind && { kind },
         ...tags && { tags },
         ...isNonEmptyArray(links) && { links },

package/dist/model/parser/DeploymentViewParser.d.ts

@@ -36,6 +36,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -48,6 +49,19 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: ast.DeployedInstance): import("../../ast").ParsedAstDeployment.Instance;

package/dist/model/parser/DeploymentViewParser.js

@@ -1,11 +1,11 @@
 import * as c4 from "@likec4/core";
 import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
-import { isNonNullish } from "remeda";
-import { ast, toAutoLayout, ViewOps } from "../../ast.js";
+import { filter, isNonNullish, mapToObj, pipe } from "remeda";
+import { ast, parseMarkdownAsString, toAutoLayout, ViewOps } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { stringHash } from "../../utils/index.js";
 import { parseViewManualLayout } from "../../view-utils/manual-layout.js";
-import { removeIndent, toSingleLine } from "./Base.js";
+import { removeIndent } from "./Base.js";
 export function DeploymentViewParser(B) {
   return class DeploymentViewParser extends B {
     parseDeploymentView(astNode) {
@@ -20,8 +20,17 @@ export function DeploymentViewParser(B) {
           astPath
         );
       }
-      const title = toSingleLine(props.find((p) => p.key === "title")?.value) ?? null;
-      const description = removeIndent(props.find((p) => p.key === "description")?.value) ?? null;
+      const {
+        title = null,
+        description = null
+      } = this.parseTitleDescriptionTechnology(
+        {},
+        pipe(
+          props,
+          filter(ast.isViewStringProperty),
+          mapToObj((p) => [p.key, p.value])
+        )
+      );
       const tags = this.convertTags(body);
       const links = this.convertLinks(body);
       ViewOps.writeId(astNode, id);
@@ -75,7 +84,7 @@ export function DeploymentViewParser(B) {
     }
     parseDeploymentViewRuleStyle(astRule) {
       const style = this.parseStyleProps(astRule.props.filter(ast.isStyleProperty));
-      const notation = removeIndent(astRule.props.find(ast.isNotationProperty)?.value);
+      const notation = removeIndent(parseMarkdownAsString(astRule.props.find(ast.isNotationProperty)?.value));
       const targets = this.parseFqnExpressions(astRule.targets);
       return {
         targets,

package/dist/model/parser/FqnRefParser.d.ts

@@ -31,6 +31,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -43,5 +44,18 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/FqnRefParser.js

@@ -1,6 +1,6 @@
 import { invariant, nonexhaustive, nonNullable } from "@likec4/core";
 import { isBoolean, isDefined, isNonNullish, isTruthy } from "remeda";
-import { ast, parseAstOpacityProperty, parseAstSizeValue, toColor } from "../../ast.js";
+import { ast, parseAstOpacityProperty, parseAstSizeValue, parseMarkdownAsString, toColor } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { projectIdFrom } from "../../utils/index.js";
 import { importsRef, instanceRef } from "../../utils/fqnRef.js";
@@ -88,7 +88,7 @@ export function ExpressionV2Parser(B) {
           }
           if (ast.isElementStringProperty(prop)) {
             if (isDefined(prop.value)) {
-              acc.custom[prop.key] = removeIndent(prop.value) || "";
+              acc.custom[prop.key] = removeIndent(parseMarkdownAsString(prop.value)) || "";
             }
             return acc;
           }
@@ -125,8 +125,9 @@ export function ExpressionV2Parser(B) {
             return acc;
           }
           if (ast.isNotationProperty(prop)) {
-            if (isTruthy(prop.value)) {
-              acc.custom[prop.key] = removeIndent(prop.value);
+            const value = isTruthy(prop.value) ? removeIndent(parseMarkdownAsString(prop.value)) : void 0;
+            if (value) {
+              acc.custom[prop.key] = value;
             }
             return acc;
           }
@@ -261,8 +262,9 @@ export function ExpressionV2Parser(B) {
       return props.reduce(
         (acc, prop) => {
           if (ast.isRelationStringProperty(prop) || ast.isNotationProperty(prop) || ast.isNotesProperty(prop)) {
-            if (isDefined(prop.value)) {
-              acc.customRelation[prop.key] = removeIndent(prop.value) ?? "";
+            const value = isTruthy(prop.value) ? removeIndent(parseMarkdownAsString(prop.value)) : void 0;
+            if (value) {
+              acc.customRelation[prop.key] = value;
             }
             return acc;
           }

package/dist/model/parser/GlobalsParser.d.ts

@@ -60,6 +60,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -72,6 +73,19 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
         parseDeploymentView(astNode: ast.DeploymentView): import("../../ast").ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: ast.DeploymentViewRule): c4.DeploymentViewRule;
         parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewPredicate;

package/dist/model/parser/ImportsParser.d.ts

@@ -17,6 +17,7 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -29,5 +30,18 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         parseColorLiteral(astNode: ast.ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/ModelParser.d.ts

@@ -37,6 +37,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -49,5 +50,18 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/ModelParser.js

@@ -1,14 +1,13 @@
 import { invariant, isNonEmptyArray, LinkedList, nonexhaustive, nonNullable } from "@likec4/core";
 import { FqnRef } from "@likec4/core/types";
 import { loggable } from "@likec4/log";
-import { filter, first, isDefined, isEmpty, isNonNullish, isTruthy, map, mapToObj, pipe } from "remeda";
+import { filter, first, isDefined, isEmpty, isTruthy, map, mapToObj, pipe } from "remeda";
 import {
   ast,
   toRelationshipStyleExcludeDefaults
 } from "../../ast.js";
 import { logger as mainLogger } from "../../logger.js";
 import { stringHash } from "../../utils/stringHash.js";
-import { removeIndent, toSingleLine } from "./Base.js";
 const logger = mainLogger.getChild("ModelParser");
 function* streamModel(doc) {
   const traverseStack = LinkedList.from(doc.parseResult.value.models.flatMap((m) => m.elements));
@@ -76,16 +75,21 @@ ${error}`, {
       const style = this.parseElementStyle(astNode.body?.props);
       const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty));
       const astPath = this.getAstNodePath(astNode);
-      let [title, description, technology] = astNode.props ?? [];
+      let [_title, _description, _technology] = astNode.props ?? [];
       const bodyProps = pipe(
         astNode.body?.props ?? [],
         filter(isValid),
         filter(ast.isElementStringProperty),
-        mapToObj((p) => [p.key, p.value || void 0])
+        mapToObj((p) => [p.key, p.value])
+      );
+      const { title, ...descAndTech } = this.parseTitleDescriptionTechnology(
+        {
+          title: _title,
+          description: _description,
+          technology: _technology
+        },
+        bodyProps
       );
-      title = removeIndent(title ?? bodyProps.title);
-      description = removeIndent(bodyProps.description ?? description);
-      technology = toSingleLine(bodyProps.technology ?? technology);
       const links = this.parseLinks(astNode.body);
       return {
         id,
@@ -95,8 +99,7 @@ ${error}`, {
         ...metadata && { metadata },
         ...tags && { tags },
         ...links && isNonEmptyArray(links) && { links },
-        ...isTruthy(technology) && { technology },
-        ...isTruthy(description) && { description },
+        ...descAndTech,
         style
       };
     }
@@ -140,9 +143,11 @@ ${error}`, {
       const kind = (astNode.kind ?? astNode.dotKind?.kind)?.ref?.name;
       const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty));
       const astPath = this.getAstNodePath(astNode);
-      const bodyProps = mapToObj(
-        astNode.body?.props.filter(ast.isRelationStringProperty).filter((p) => isNonNullish(p.value)) ?? [],
-        (p) => [p.key, p.value]
+      const bodyProps = pipe(
+        astNode.body?.props ?? [],
+        filter(ast.isRelationStringProperty),
+        filter((p) => isTruthy(p.value)),
+        mapToObj((p) => [p.key, p.value])
       );
       const navigateTo = pipe(
         astNode.body?.props ?? [],
@@ -151,9 +156,15 @@ ${error}`, {
         filter(isTruthy),
         first()
       );
-      const title = removeIndent(astNode.title ?? bodyProps.title) ?? "";
-      const description = removeIndent(bodyProps.description);
-      const technology = toSingleLine(astNode.technology) ?? removeIndent(bodyProps.technology);
+      const { title = "", ...descAndTech } = this.parseTitleDescriptionTechnology(
+        // inline props
+        {
+          title: astNode.title,
+          description: astNode.description,
+          technology: astNode.technology
+        },
+        bodyProps
+      );
       const styleProp = astNode.body?.props.find(ast.isRelationStyleProperty);
       const id = stringHash(
         astPath,
@@ -167,8 +178,7 @@ ${error}`, {
         target,
         title,
         ...metadata && { metadata },
-        ...isTruthy(technology) && { technology },
-        ...isTruthy(description) && { description },
+        ...descAndTech,
         ...kind && { kind },
         ...tags && { tags },
         ...isNonEmptyArray(links) && { links },

package/dist/model/parser/PredicatesParser.d.ts

@@ -42,6 +42,7 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -54,5 +55,18 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/SpecificationParser.d.ts

@@ -23,6 +23,7 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {
             tags?: ast.Tags;
         }>(withTags?: E | undefined): any;
@@ -35,5 +36,18 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: ast.MarkdownOrString | undefined;
+            description?: ast.MarkdownOrString | undefined;
+            technology?: ast.MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: c4.MarkdownOrString;
+            technology?: string;
+        };
     };
 } & TBase;

package/dist/model/parser/SpecificationParser.js

@@ -1,6 +1,6 @@
 import { nonNullable } from "@likec4/core/utils";
-import { filter, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
-import { ast, toRelationshipStyleExcludeDefaults } from "../../ast.js";
+import { filter, isNonNullish, isNullish, isTruthy, mapToObj, omitBy, pipe } from "remeda";
+import { ast, parseMarkdownAsString, toRelationshipStyleExcludeDefaults } from "../../ast.js";
 import { logger, logWarnError } from "../../logger.js";
 import { removeIndent } from "./Base.js";
 export function SpecificationParser(B) {
@@ -43,7 +43,8 @@ export function SpecificationParser(B) {
           const bodyProps = pipe(
             props.filter(ast.isSpecificationRelationshipStringProperty) ?? [],
             filter((p) => this.isValid(p) && isNonNullish(p.value)),
-            mapToObj((p) => [p.key, removeIndent(p.value)])
+            mapToObj((p) => [p.key, removeIndent(parseMarkdownAsString(p.value))]),
+            omitBy(isNullish)
           );
           c4Specification.relationships[kindName] = {
             ...bodyProps,
@@ -55,14 +56,18 @@ export function SpecificationParser(B) {
       }
       const tags_specs = specifications.flatMap((s) => s.tags.filter(this.isValid));
       for (const tagSpec of tags_specs) {
-        const tag = tagSpec.tag.name;
-        const astPath = this.getAstNodePath(tagSpec.tag);
-        const color = tagSpec.color && this.parseColorLiteral(tagSpec.color);
-        if (isTruthy(tag)) {
-          c4Specification.tags[tag] = {
-            astPath,
-            ...color ? { color } : {}
-          };
+        try {
+          const tag = tagSpec.tag.name;
+          const astPath = this.getAstNodePath(tagSpec.tag);
+          const color = tagSpec.color && this.parseColorLiteral(tagSpec.color);
+          if (isTruthy(tag)) {
+            c4Specification.tags[tag] = {
+              astPath,
+              ...color ? { color } : {}
+            };
+          }
+        } catch (e) {
+          logWarnError(e);
         }
       }
       const colors_specs = specifications.flatMap((s) => s.colors.filter(isValid));

package/dist/model/parser/ValueConverter.d.ts

@@ -0,0 +1,4 @@
+import { type CstNode, type ValueType, DefaultValueConverter } from 'langium';
+export declare class LikeC4ValueConverter extends DefaultValueConverter {
+    protected runConverter(rule: any, input: string, cstNode: CstNode): ValueType;
+}