@likec4/language-server 1.42.1 → 1.43.0

package/dist/model/builder/MergedExtends.mjs

@@ -5,6 +5,21 @@ import {
 } from "remeda";
 export class MergedExtends {
   mergedData = /* @__PURE__ */ new Map();
+  mergeMetadata(existing, incoming) {
+    const result = { ...existing };
+    for (const [key, incomingValue] of Object.entries(incoming)) {
+      const existingValue = result[key];
+      if (existingValue === void 0) {
+        result[key] = incomingValue;
+        continue;
+      }
+      const existingArray = Array.isArray(existingValue) ? existingValue : [existingValue];
+      const incomingArray = Array.isArray(incomingValue) ? incomingValue : [incomingValue];
+      const merged = unique([...existingArray, ...incomingArray]);
+      result[key] = merged.length === 1 ? merged[0] : merged;
+    }
+    return result;
+  }
   merge(parsedExtends) {
     for (const parsedExtend of parsedExtends) {
       const { id, links, tags, metadata } = parsedExtend;
@@ -23,10 +38,7 @@ export class MergedExtends {
         ]);
       }
       if (metadata) {
-        existing.metadata = {
-          ...existing.metadata,
-          ...metadata
-        };
+        existing.metadata = this.mergeMetadata(existing.metadata, metadata);
       }
       this.mergedData.set(id, existing);
     }
@@ -52,10 +64,7 @@ export class MergedExtends {
     }
     let metadata = extendData.metadata;
     if (el.metadata) {
-      metadata = {
-        ...el.metadata,
-        ...extendData.metadata
-      };
+      metadata = this.mergeMetadata(el.metadata, extendData.metadata);
     }
     return {
       ...el,

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

@@ -65,7 +65,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -164,7 +164,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -219,7 +219,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -289,7 +289,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -352,7 +352,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -423,7 +423,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -487,7 +487,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -530,7 +530,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {
@@ -589,7 +589,7 @@ declare const DocumentParserFromMixins: {
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: import("../generated/ast").MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {

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

@@ -27,7 +27,7 @@ export declare class BaseParser {
     resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
     getAstNodePath(node: AstNode): any;
     getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-        [key: string]: string;
+        [key: string]: string | string[];
     } | undefined;
     parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
     convertTags<E extends {

package/dist/model/parser/Base.mjs

@@ -8,14 +8,14 @@ import {
 import {
   filter,
   flatMap,
-  fromEntries,
+  groupBy,
   isArray,
   isBoolean,
   isEmpty,
   isNumber,
   isString,
   isTruthy,
-  map,
+  mapValues,
   pipe,
   unique
 } from "remeda";
@@ -107,13 +107,47 @@ export class BaseParser {
     if (!metadataAstNode || !this.isValid(metadataAstNode) || isEmpty(metadataAstNode.props)) {
       return void 0;
     }
-    const data = pipe(
+    const extractValues = (value) => {
+      if (ast.isMarkdownOrString(value)) {
+        const mdOrStr = removeIndent(value);
+        if (!mdOrStr) return [];
+        if (typeof mdOrStr === "string") {
+          return isTruthy(mdOrStr) ? [mdOrStr] : [];
+        } else {
+          const strValue = mdOrStr.md || mdOrStr.txt;
+          return isTruthy(strValue) ? [strValue] : [];
+        }
+      } else if (ast.isMetadataArray(value)) {
+        return value.values.map((v) => removeIndent(v)).map((v) => {
+          if (typeof v === "string") {
+            return v;
+          } else {
+            return v.md || v.txt;
+          }
+        }).filter(isTruthy);
+      }
+      return [];
+    };
+    const keyValuePairs = pipe(
       metadataAstNode.props,
-      map((p) => [p.key, removeIndent(p.value)]),
-      map(([key, value]) => [key, value.md || value.txt]),
+      flatMap((p) => extractValues(p.value).map((v) => [p.key, v])),
       filter(([_, value]) => isTruthy(value))
     );
-    return data.length > 0 ? fromEntries(data) : void 0;
+    if (isEmpty(keyValuePairs)) {
+      return void 0;
+    }
+    const groupedData = pipe(
+      keyValuePairs,
+      groupBy(([key]) => key),
+      mapValues((pairs) => pairs.map(([_, value]) => value))
+    );
+    const data = {};
+    for (const [key, values] of Object.entries(groupedData)) {
+      if (values && values.length > 0) {
+        data[key] = values.length === 1 ? values[0] : values;
+      }
+    }
+    return isEmpty(data) ? void 0 : data;
   }
   parseMarkdownOrString(markdownOrString) {
     if (ast.isMarkdownOrString(markdownOrString)) {

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

@@ -35,7 +35,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -33,7 +33,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -30,7 +30,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: AstNode): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -62,7 +62,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -11,7 +11,7 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         resolveFqn(node: ast.FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): ProjectId | undefined;
         convertTags<E extends {

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

@@ -34,7 +34,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -39,7 +39,7 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -17,7 +17,7 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

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

@@ -64,7 +64,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
-            [key: string]: string;
+            [key: string]: string | string[];
         } | undefined;
         parseMarkdownOrString(markdownOrString: ast.MarkdownOrString | undefined): c4.MarkdownOrString | undefined;
         convertTags<E extends {

package/dist/validation/index.d.ts

@@ -4,7 +4,7 @@ import type { LikeC4Services } from '../module';
 export { LikeC4DocumentValidator } from './DocumentValidator';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewDisplayVariantProperty | ast.LinkProperty | ast.ViewStringProperty | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.DynamicStepChain | ast.DynamicStepSingle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.DynamicViewParallelSteps | ast.ElementRef | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.DynamicViewDisplayVariantProperty | ast.LinkProperty | ast.ViewStringProperty | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.MetadataBody | ast.RelationStringProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.DynamicStepChain | ast.DynamicStepSingle | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.DynamicViewParallelSteps | ast.ElementRef | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.42.1",
+  "version": "1.43.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -78,42 +78,42 @@
   "dependencies": {
     "@hpcc-js/wasm-graphviz": "1.12.0",
     "bundle-require": "^5.1.0",
-    "esbuild": "0.25.9"
+    "esbuild": "0.25.11"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.3",
+    "@hono/node-server": "^1.19.5",
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.0.0",
     "@types/natural-compare-lite": "^1.4.2",
-    "@types/node": "~20.19.11",
+    "@types/node": "~20.19.22",
     "@types/picomatch": "^4.0.2",
     "@types/vscode": "^1.84.0",
     "@types/which": "^3.0.4",
     "chokidar": "^4.0.3",
     "defu": "^6.1.4",
     "esm-env": "^1.2.2",
-    "fast-equals": "^5.2.2",
+    "fast-equals": "^5.3.2",
     "fdir": "6.4.0",
     "fetch-to-node": "^2.1.0",
-    "hono": "^4.9.8",
+    "hono": "^4.10.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
     "langium": "3.5.0",
     "langium-cli": "3.5.2",
     "natural-compare-lite": "^1.4.0",
-    "oxlint": "1.18.0",
+    "oxlint": "1.24.0",
     "p-debounce": "4.0.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
     "pretty-ms": "^9.2.0",
-    "remeda": "^2.31.1",
-    "strip-indent": "^4.0.0",
+    "remeda": "^2.32.0",
+    "strip-indent": "^4.1.1",
     "tsx": "4.20.6",
     "turbo": "2.5.8",
     "type-fest": "^4.41.0",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "ufo": "1.6.1",
     "unbuild": "3.5.0",
     "vitest": "3.2.4",
@@ -124,12 +124,12 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "^3.25.76",
-    "@likec4/core": "1.42.1",
-    "@likec4/config": "1.42.1",
-    "@likec4/icons": "1.42.1",
-    "@likec4/log": "1.42.1",
-    "@likec4/layouts": "1.42.1",
-    "@likec4/tsconfig": "1.42.1",
+    "@likec4/core": "1.43.0",
+    "@likec4/config": "1.43.0",
+    "@likec4/icons": "1.43.0",
+    "@likec4/layouts": "1.43.0",
+    "@likec4/log": "1.43.0",
+    "@likec4/tsconfig": "1.43.0",
     "@likec4/devops": "1.42.0"
   },
   "scripts": {