@likec4/language-server 1.32.2 → 1.33.0

package/dist/lsp/SemanticTokenProvider.js

@@ -272,7 +272,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         });
         return "prune";
       }
-      if ("value" in node && node.value) {
+      if ("value" in node && node.value && !ast.isStringProperty(node)) {
         acceptor({
           node,
           property: "value",

package/dist/mcp/LikeC4MCPTools.js

@@ -1,4 +1,4 @@
-import { _type } from "@likec4/core";
+import { _type, RichText } from "@likec4/core";
 import { loggable } from "@likec4/log";
 import { flatMap } from "remeda";
 import stripIndent from "strip-indent";
@@ -9,7 +9,10 @@ import { ProjectsManager } from "../workspace/ProjectsManager.js";
 import { elementResource, modelViewResource } from "./utils.js";
 const logger = mainLogger.getChild("LikeC4MCPServices");
 function singleLine(str) {
-  const res = toSingleLine(str)?.replaceAll('"', "'");
+  if (str === null || str === void 0) {
+    return "null";
+  }
+  const res = toSingleLine(RichText.from(str).text)?.replaceAll('"', "'");
   return res ? `"${res}"` : "null";
 }
 function outputEach(iterator, ifEmpty, output) {

package/dist/model/builder/MergedSpecification.js

@@ -102,8 +102,8 @@ export class MergedSpecification {
         },
         links: links ?? null,
         tags: tags ?? [],
-        technology: technology ?? null,
-        description: description ?? null,
+        ...technology && { technology },
+        ...description && { description },
         title,
         kind,
         id
@@ -155,6 +155,7 @@ export class MergedSpecification {
       };
     }
     if ("element" in parsed) {
+      logger.warn`Invalid ParsedAstDeployment ${parsed.id}, has both element and kind properties`;
       return null;
     }
     try {
@@ -166,10 +167,13 @@ export class MergedSpecification {
       let {
         technology = __kind.technology,
         notation = __kind.notation,
-        style
+        style,
+        description,
+        ...rest
       } = parsed;
       return {
-        ...parsed,
+        ...rest,
+        ...description && { description },
         ...notation && { notation },
         ...technology && { technology },
         style: {

package/dist/model/index.d.ts

@@ -3,3 +3,4 @@ export * from './fqn-index';
 export * from './model-builder';
 export * from './model-locator';
 export * from './model-parser';
+export * from './parser/ValueConverter';

package/dist/model/index.js

@@ -3,3 +3,4 @@ export * from "./fqn-index.js";
 export * from "./model-builder.js";
 export * from "./model-locator.js";
 export * from "./model-parser.js";
+export * from "./parser/ValueConverter.js";

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

@@ -63,6 +63,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -75,6 +76,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
         parseDeploymentView(astNode: import("../generated/ast").DeploymentView): import("../ast").ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: import("../generated/ast").DeploymentViewRule): ProjectId;
         parseDeploymentViewRulePredicate(astRule: import("../generated/ast").DeploymentViewRulePredicate): ProjectId;
@@ -140,6 +154,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -152,6 +167,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
         parseDeploymentView(astNode: import("../generated/ast").DeploymentView): import("../ast").ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: import("../generated/ast").DeploymentViewRule): ProjectId;
         parseDeploymentViewRulePredicate(astRule: import("../generated/ast").DeploymentViewRulePredicate): ProjectId;
@@ -181,6 +209,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -193,6 +222,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & {
     new (...args: any[]): {
@@ -234,6 +276,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -246,6 +289,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & {
     new (...args: any[]): {
@@ -280,6 +336,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -292,6 +349,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
         parseDeployment(): void;
         parseDeploymentNode(astNode: import("../generated/ast").DeploymentNode): import("../ast").ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: import("../generated/ast").DeployedInstance): import("../ast").ParsedAstDeployment.Instance;
@@ -334,6 +404,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -346,6 +417,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & {
     new (...args: any[]): {
@@ -381,6 +465,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -393,6 +478,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & {
     new (...args: any[]): {
@@ -410,6 +508,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -422,6 +521,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & {
     new (...args: any[]): {
@@ -452,6 +564,7 @@ declare const DocumentParserFromMixins: {
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
             [key: string]: string;
         } | undefined;
+        parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
             tags?: import("../generated/ast").Tags;
         }>(withTags?: E | undefined): any;
@@ -464,6 +577,19 @@ declare const DocumentParserFromMixins: {
         parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
+        parseTitleDescriptionTechnology(inlineProps: {
+            title?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
+        }, bodyProps: {
+            title?: import("../generated/ast").MarkdownOrString | undefined;
+            description?: import("../generated/ast").MarkdownOrString | undefined;
+            technology?: import("../generated/ast").MarkdownOrString | undefined;
+        }): {
+            title?: string;
+            description?: ProjectId;
+            technology?: string;
+        };
     };
 } & typeof BaseParser;
 export declare class DocumentParser extends DocumentParserFromMixins {

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

@@ -1,12 +1,22 @@
 import type * as c4 from '@likec4/core';
+import { type MarkdownOrString } from '@likec4/core';
 import type { AstNode, URI } from 'langium';
 import { type ParsedElementStyle, type ParsedLikeC4LangiumDocument, ast } from '../../ast';
 import type { ProjectConfig } from '../../config';
 import type { LikeC4Services } from '../../module';
 import { type IsValidFn } from '../../validation';
 export type GConstructor<T = {}> = new (...args: any[]) => T;
-export declare function toSingleLine<T extends string | undefined | null>(str: T): T;
-export declare function removeIndent<T extends string | undefined | null>(str: T): T;
+export declare function toSingleLine(str: string): string;
+export declare function toSingleLine(str: string | undefined | null): string | undefined;
+export declare function toSingleLine(str: ast.MarkdownOrString): MarkdownOrString;
+export declare function toSingleLine(str: ast.MarkdownOrString | undefined | null): MarkdownOrString | undefined;
+export declare function toSingleLine(str: ast.MarkdownOrString | string): MarkdownOrString | string;
+export declare function toSingleLine(str: ast.MarkdownOrString | string | undefined | null): MarkdownOrString | string | undefined;
+export declare function removeIndent(str: string): string;
+export declare function removeIndent(str: string | undefined): string | undefined;
+export declare function removeIndent(str: ast.MarkdownOrString): MarkdownOrString;
+export declare function removeIndent(str: ast.MarkdownOrString | undefined): MarkdownOrString | undefined;
+export declare function removeIndent(str: ast.MarkdownOrString | string): MarkdownOrString | string;
 export type Base = GConstructor<BaseParser>;
 export declare class BaseParser {
     readonly services: LikeC4Services;
@@ -23,6 +33,7 @@ export declare class BaseParser {
     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): any;
@@ -35,4 +46,21 @@ export declare class BaseParser {
     parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
     parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): ParsedElementStyle;
     parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): ParsedElementStyle;
+    /**
+     * Parses title, description and technology
+     * Inline properties (right on node) have higher priority than body properties (inside '{...}')
+     */
+    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;
+    };
 }

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
       };
     }
@@ -168,7 +170,7 @@ export function DeploymentModelParser(B) {
         astNode.body?.props ?? [],
         filter(ast.isRelationStringProperty),
         filter((p) => isTruthy(p.value)),
-        mapToObj((p) => [p.key, p.value || void 0])
+        mapToObj((p) => [p.key, p.value])
       );
       const navigateTo = pipe(
         astNode.body?.props ?? [],
@@ -177,9 +179,12 @@ export function DeploymentModelParser(B) {
         filter(isTruthy),
         first()
       );
-      const title = removeIndent(astNode.title ?? bodyProps.title) ?? "";
-      const description = removeIndent(astNode.description ?? 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",
@@ -191,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;