@likec4/language-server 1.44.0 → 1.46.0

package/dist/mcp/tools/read-deployment.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright (c) 2023-2025 Denis Davydkov
+// Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Portions of this file have been modified by NVIDIA CORPORATION & AFFILIATES.
 import { invariant } from '@likec4/core';
 import * as z from 'zod/v3';
 import { likec4Tool } from '../utils';
@@ -25,6 +31,7 @@ Output fields:
 - tags: string[] — Tags assigned to this entity
 - project: string — Project id
 - metadata: Record<string, string>
+- links: Array<{ title: string|null, url: string, relative: string|null }> — external links associated with this deployment entity
 - shape: string — Rendered shape
 - color: string — Rendered color
 - children: string[] — Child deployment ids (empty for instances)
@@ -55,6 +62,7 @@ Example response (deployed instance):
   "tags": ["prod"],
   "project": "default",
   "metadata": {},
+  "links": [],
   "shape": "rectangle",
   "color": "#2F80ED",
   "children": [],
@@ -88,6 +96,11 @@ Example response (deployed instance):
         tags: z.array(z.string()),
         project: z.string(),
         metadata: z.record(z.union([z.string(), z.array(z.string())])),
+        links: z.array(z.object({
+            title: z.string().nullable().describe('Optional link title'),
+            url: z.string().describe('Link URL'),
+            relative: z.string().nullable().describe('Relative path (if URL is relative to workspace root)'),
+        })).describe('External links associated with this deployment entity'),
         shape: z.string(),
         color: z.string(),
         children: z.array(z.string()).describe('Children of this deployment node (Array of Deployment ids)'),
@@ -116,6 +129,11 @@ Example response (deployed instance):
         tags: [...element.tags],
         project: projectId,
         metadata: element.getMetadata(),
+        links: (element.links ?? []).map(link => ({
+            title: link.title ?? null,
+            url: link.url,
+            relative: link.relative ?? null,
+        })),
         shape: element.shape,
         color: element.color,
         children: element.isInstance() ? [] : [...element.children()].map(c => c.id),

package/dist/mcp/tools/read-element.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright (c) 2023-2025 Denis Davydkov
+// Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Portions of this file have been modified by NVIDIA CORPORATION & AFFILIATES.
 import { invariant } from '@likec4/core';
 import * as z from 'zod/v3';
 import { likec4Tool } from '../utils';
@@ -21,6 +27,7 @@ Response (JSON object):
 - tags: string[] — assigned tags
 - project: string — project id this element belongs to
 - metadata: Record<string, string> — element metadata
+- links: Array<{ title: string|null, url: string, relative: string|null }> — external links associated with this element
 - shape: string — rendered shape
 - color: string — rendered color
 - children: string[] — ids (FQNs) of direct child elements
@@ -52,6 +59,13 @@ Example response:
   "tags": ["public"],
   "project": "default",
   "metadata": { "owner": "web" },
+  "links": [
+    {
+      "title": "Documentation",
+      "url": "https://docs.example.com/frontend",
+      "relative": null
+    }
+  ],
   "shape": "rounded-rectangle",
   "color": "#2F80ED",
   "children": ["shop.frontend.auth"],
@@ -103,6 +117,11 @@ Example response:
         tags: z.array(z.string()),
         project: z.string(),
         metadata: z.record(z.union([z.string(), z.array(z.string())])),
+        links: z.array(z.object({
+            title: z.string().nullable().describe('Optional link title'),
+            url: z.string().describe('Link URL'),
+            relative: z.string().nullable().describe('Relative path (if URL is relative to workspace root)'),
+        })).describe('External links associated with this element'),
         shape: z.string(),
         color: z.string(),
         children: z.array(z.string()).describe('Children of this element (Array of FQNs)'),
@@ -155,6 +174,11 @@ Example response:
         tags: [...element.tags],
         project: projectId,
         metadata: element.getMetadata(),
+        links: (element.links ?? []).map(link => ({
+            title: link.title ?? null,
+            url: link.url,
+            relative: link.relative ?? null,
+        })),
         shape: element.shape,
         color: element.color,
         children: [...element.children()].map(c => c.id),

package/dist/mcp/tools/search-element.js

@@ -41,11 +41,11 @@ export const searchElement = likec4Tool({
 Search LikeC4 elements and deployment nodes across all projects.
 
 Query syntax (case-insensitive):
-- kind:<value>: filters by kind
-- shape:<value>: filters by shape
-- meta:<key>: filters by having metadata with the given key
-- #<value>: matches assigned tags
-- Free text: matches id (FQN) or title
+- kind:<value>  filters by kind
+- shape:<value> filters by shape
+- meta:<key>    filters by having metadata with the given key
+- #<value>      matches assigned tags
+- <value>       matches id (FQN) or title
 
 Request:
 - search: string — at least 2 characters

package/dist/mcp/utils.js

@@ -39,7 +39,7 @@ function mkcallTool(name, languageServices, cb) {
             return {
                 content: [{
                         type: 'text',
-                        text: err instanceof Error ? err.message : loggable(err),
+                        text: loggable(err),
                     }],
                 isError: true,
             };

package/dist/model/builder/buildModel.js

@@ -1,11 +1,18 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright (c) 2023-2025 Denis Davydkov
+// Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Portions of this file have been modified by NVIDIA CORPORATION & AFFILIATES.
 import { isDeploymentNode, isGlobalFqn, } from '@likec4/core';
 import { resolveRulesExtendedViews } from '@likec4/core/compute-view';
 import { computeColorValues } from '@likec4/core/styles';
 import { _stage, _type, exact, FqnRef, isExtendsElementView } from '@likec4/core/types';
 import { compareNatural, parentFqn, sortByFqnHierarchically, } from '@likec4/core/utils';
 import { UriUtils } from 'langium';
-import { filter, flatMap, forEach, indexBy, isDefined, isNullish, isTruthy, keys, map, mapValues, omitBy, pipe, prop, reduce, } from 'remeda';
+import { filter, flatMap, forEach, hasAtLeast, indexBy, isDefined, isEmpty, isNullish, isTruthy, keys, map, mapValues, omitBy, pipe, prop, reduce, unique, } from 'remeda';
 import { logger } from '../../logger';
+import { stringHash } from '../../utils/stringHash';
 import { MergedExtends } from './MergedExtends';
 import { MergedSpecification } from './MergedSpecification';
 /**
@@ -21,6 +28,9 @@ export function buildModelData(project, docs) {
     const metadataKeys = new Set();
     const elementExtends = new MergedExtends();
     const deploymentExtends = new MergedExtends();
+    // Collect all relation extends - we'll match them by comparing source/target/kind/title
+    const relationExtends = docs.flatMap(doc => doc.c4ExtendRelations);
+    const matchedExtendIds = new Set();
     const scanMetadataKeys = (obj) => {
         if (obj?.metadata) {
             keys(obj.metadata).forEach(key => metadataKeys.add(key));
@@ -54,6 +64,59 @@ export function buildModelData(project, docs) {
             return false;
         }
         return true;
+    }), map(rel => {
+        // Apply relation extends by matching source, target, kind, and title
+        // Generate a stable match key for this relation
+        const matchKey = stringHash('extend-relation', FqnRef.flatten(rel.source), FqnRef.flatten(rel.target), rel.kind ?? 'default', rel.title ?? '');
+        // Find all extends that match this relation
+        const relExtends = relationExtends.filter(ext => ext.id === matchKey);
+        if (relExtends.length === 0) {
+            return rel;
+        }
+        // Mark these extends as matched
+        relExtends.forEach(ext => matchedExtendIds.add(ext.astPath));
+        // Merge all extends for this relation
+        const tags = rel.tags ? [...rel.tags] : [];
+        const links = rel.links ? [...rel.links] : [];
+        let metadata = rel.metadata ? { ...rel.metadata } : {};
+        for (const ext of relExtends) {
+            if (ext.tags) {
+                tags.push(...ext.tags);
+            }
+            if (ext.links) {
+                // Ensure links are unique based on both URL and title
+                for (const incomingLink of ext.links) {
+                    const isDuplicate = links.some(existingLink => existingLink.url === incomingLink.url && (existingLink.title || '') === (incomingLink.title || ''));
+                    if (!isDuplicate) {
+                        links.push(incomingLink);
+                    }
+                }
+            }
+            if (ext.metadata) {
+                for (const [key, value] of Object.entries(ext.metadata)) {
+                    const existingValue = metadata[key];
+                    if (existingValue === undefined) {
+                        metadata[key] = value;
+                    }
+                    else {
+                        const existingArray = Array.isArray(existingValue) ? existingValue : [existingValue];
+                        const incomingArray = Array.isArray(value) ? value : [value];
+                        const merged = unique([...existingArray, ...incomingArray]);
+                        metadata[key] = merged.length === 1 ? merged[0] : merged;
+                    }
+                }
+            }
+        }
+        // Apply unique after accumulating all values
+        const uniqueTags = unique(tags);
+        // Links are already de-duplicated by URL and title in the loop above
+        const uniqueLinks = links;
+        return {
+            ...rel,
+            ...(hasAtLeast(uniqueTags, 1) && { tags: uniqueTags }),
+            ...(hasAtLeast(uniqueLinks, 1) && { links: uniqueLinks }),
+            ...(!isEmpty(metadata) && { metadata }),
+        };
     }), forEach(scanMetadataKeys), indexBy(prop('id')));
     const deploymentElements = pipe(docs, flatMap(d => {
         deploymentExtends.merge(d.c4ExtendDeployments);
@@ -139,6 +202,12 @@ export function buildModelData(project, docs) {
     if (parsedViews.some(isExtendsElementView)) {
         views = resolveRulesExtendedViews(views);
     }
+    // Warn about unmatched relation extends
+    for (const ext of relationExtends) {
+        if (!matchedExtendIds.has(ext.astPath)) {
+            logger.warn(`Relation extend at ${ext.astPath} does not match any relation in the model`);
+        }
+    }
     return {
         data: {
             [_stage]: 'parsed',

package/dist/model/deployments-index.js

@@ -9,7 +9,7 @@ export class DeploymentsIndex extends FqnIndex {
     services;
     Names;
     constructor(services) {
-        super(services, 'deployments-index');
+        super(services);
         this.services = services;
         this.Names = services.references.NameProvider;
     }
@@ -18,7 +18,7 @@ export class DeploymentsIndex extends FqnIndex {
         if (rootNodes.length === 0) {
             return DocumentFqnIndex.EMPTY;
         }
-        const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
+        const projectId = this.projects.belongsTo(document);
         const root = new Array();
         const children = new MultiMap();
         const descendants = new MultiMap();

package/dist/model/fqn-index.d.ts

@@ -7,12 +7,11 @@ import { ADisposable } from '../utils';
 import { type LangiumDocuments, ProjectsManager } from '../workspace';
 export declare class FqnIndex<AstNd = ast.Element> extends ADisposable {
     protected services: LikeC4Services;
-    private cachePrefix;
     protected projects: ProjectsManager;
     protected langiumDocuments: LangiumDocuments;
     protected documentCache: DefaultWeakMap<LikeC4LangiumDocument, DocumentFqnIndex>;
     protected workspaceCache: WorkspaceCache<string, AstNodeDescriptionWithFqn[]>;
-    constructor(services: LikeC4Services, cachePrefix?: string);
+    constructor(services: LikeC4Services);
     private documents;
     get(document: LikeC4LangiumDocument): DocumentFqnIndex;
     resolve(reference: ast.Referenceable): Fqn;

package/dist/model/fqn-index.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright (c) 2023-2025 Denis Davydkov
+// Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Portions of this file have been modified by NVIDIA CORPORATION & AFFILIATES.
 import { invariant, nonNullable } from '@likec4/core';
 import { Fqn } from '@likec4/core/types';
 import { ancestorsFqn, compareNatural, DefaultWeakMap, MultiMap, sortNaturalByFqn } from '@likec4/core/utils';
@@ -10,22 +16,20 @@ import { readStrictFqn } from '../utils/elementRef';
 import { ProjectsManager } from '../workspace';
 export class FqnIndex extends ADisposable {
     services;
-    cachePrefix;
     projects;
     langiumDocuments;
     documentCache;
     workspaceCache;
-    constructor(services, cachePrefix = 'fqn-index') {
+    constructor(services) {
         super();
         this.services = services;
-        this.cachePrefix = cachePrefix;
         this.langiumDocuments = services.shared.workspace.LangiumDocuments;
         this.projects = services.shared.workspace.ProjectsManager;
         this.documentCache = new DefaultWeakMap(doc => this.createDocumentIndex(doc));
         this.workspaceCache = new WorkspaceCache(services.shared, DocumentState.IndexedContent);
         this.onDispose(services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.IndexedContent, (doc) => {
             if (isLikeC4LangiumDocument(doc)) {
-                this.documentCache.set(doc, this.createDocumentIndex(doc));
+                this.documentCache.delete(doc);
             }
         }));
     }
@@ -57,23 +61,23 @@ export class FqnIndex extends ADisposable {
         // Document index is not yet created
         const doc = AstUtils.getDocument(el);
         invariant(isLikeC4LangiumDocument(doc));
-        logWarnError(`Document ${doc.uri.path} is not indexed, but getFqn was called`);
-        // This will create the document index
+        // Ensure the document is indexed
         this.get(doc);
+        // This will create the document index
         return nonNullable(ElementOps.readId(el), 'Element fqn must be set, invalid state');
     }
     byFqn(projectId, fqn) {
-        return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:fqn:${fqn}`, () => {
+        return stream(this.workspaceCache.get(`${projectId}:fqn:${fqn}`, () => {
             return this
                 .documents(projectId)
-                .toArray()
                 .flatMap(doc => {
                 return this.get(doc).byFqn(fqn);
-            });
+            })
+                .toArray();
         }));
     }
     rootElements(projectId) {
-        return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:rootElements`, () => {
+        return stream(this.workspaceCache.get(`${projectId}:rootElements`, () => {
             const allchildren = this.documents(projectId)
                 .reduce((map, doc) => {
                 this.get(doc).rootElements().forEach(desc => {
@@ -85,7 +89,7 @@ export class FqnIndex extends ADisposable {
         }));
     }
     directChildrenOf(projectId, parent) {
-        return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:directChildrenOf:${parent}`, () => {
+        return stream(this.workspaceCache.get(`${projectId}:directChildrenOf:${parent}`, () => {
             const allchildren = this.documents(projectId)
                 .reduce((map, doc) => {
                 this.get(doc).children(parent).forEach(desc => {
@@ -100,7 +104,7 @@ export class FqnIndex extends ADisposable {
      * Returns descedant elements with unique names in the scope
      */
     uniqueDescedants(projectId, parent) {
-        return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:uniqueDescedants:${parent}`, () => {
+        return stream(this.workspaceCache.get(`${projectId}:uniqueDescedants:${parent}`, () => {
             const { children, descendants } = this.documents(projectId)
                 .reduce((map, doc) => {
                 const docIndex = this.get(doc);
@@ -129,18 +133,17 @@ export class FqnIndex extends ADisposable {
         if (rootElements.length === 0) {
             return DocumentFqnIndex.EMPTY;
         }
-        const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
+        const projectId = document.likec4ProjectId ?? this.projects.belongsTo(document);
         const root = new Array();
         const children = new MultiMap();
         const descendants = new MultiMap();
         const byfqn = new MultiMap();
         const Descriptions = this.services.workspace.AstNodeDescriptionProvider;
         const createAndSaveDescription = (node, name, fqn) => {
-            const desc = {
-                ...Descriptions.createDescription(node, name, document),
+            const desc = Object.assign(Descriptions.createDescription(node, name, document), {
                 id: fqn,
                 likec4ProjectId: projectId,
-            };
+            });
             ElementOps.writeId(node, fqn);
             byfqn.set(fqn, desc);
             return desc;
@@ -163,7 +166,7 @@ export class FqnIndex extends ADisposable {
             let _nested = [];
             if (isDefined(el.body) && !isEmpty(el.body.elements)) {
                 for (const child of el.body.elements) {
-                    if (!ast.isRelation(child)) {
+                    if (!ast.isRelation(child) && !ast.isExtendRelation(child)) {
                         try {
                             _nested.push(...traverseNode(child, thisFqn));
                         }
@@ -192,7 +195,7 @@ export class FqnIndex extends ADisposable {
         };
         for (const node of rootElements) {
             try {
-                if (ast.isRelation(node)) {
+                if (ast.isRelation(node) || ast.isExtendRelation(node)) {
                     continue;
                 }
                 traverseNode(node, null);

package/dist/model/model-builder.js

@@ -132,7 +132,6 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     unsafeSyncComputeModel(projectId, manualLayouts) {
         const logger = builderLogger.getChild(projectId);
         const cache = this.cache;
-        const viewsCache = this.cache;
         const hasManualLayouts = !!manualLayouts && !isEmpty(manualLayouts);
         const key = computedModelCacheKey(projectId) + (hasManualLayouts ? '+manualLayouts' : '');
         if (cache.has(key)) {
@@ -163,7 +162,6 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
                 const previous = this.previousViews[key];
                 const view = previous && eq(v, previous) ? previous : v;
                 this.previousViews[key] = view;
-                viewsCache.set(key, view);
                 return [v.id, view];
             });
             const data = {

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

@@ -19,6 +19,7 @@ declare const DocumentParserFromMixins: {
         parseViewRuleGlobalPredicateRef(astRule: import("../generated/ast").ViewRuleGlobalPredicateRef | import("../generated/ast").DynamicViewGlobalPredicateRef): import("@likec4/core").ViewRuleGlobalPredicateRef;
         parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): import("@likec4/core").ViewRuleGlobalStyle | import("@likec4/core").ElementViewRuleStyle<import("@likec4/core").Any>;
         parseViewRuleGroup(astNode: import("../generated/ast").ViewRuleGroup): import("@likec4/core").ElementViewRuleGroup;
+        parseViewRuleRank(astRule: import("../generated/ast").ViewRuleRank): import("@likec4/core").ElementViewRuleRank;
         parseViewRuleStyle(astRule: import("../generated/ast").ViewRuleStyle | import("../generated/ast").GlobalStyle): import("@likec4/core").ElementViewRuleStyle;
         parseViewRuleGlobalStyle(astRule: import("../generated/ast").ViewRuleGlobalStyle): import("@likec4/core").ViewRuleGlobalStyle;
         parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: (import("@likec4/core").ViewRuleGlobalStyle | import("@likec4/core").ElementViewRuleStyle<import("@likec4/core").Any>)[]): import("../ast").ParsedAstDynamicView;
@@ -118,6 +119,7 @@ declare const DocumentParserFromMixins: {
         parseViewRuleGlobalPredicateRef(astRule: import("../generated/ast").ViewRuleGlobalPredicateRef | import("../generated/ast").DynamicViewGlobalPredicateRef): import("@likec4/core").ViewRuleGlobalPredicateRef;
         parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): import("@likec4/core").ViewRuleGlobalStyle | import("@likec4/core").ElementViewRuleStyle<import("@likec4/core").Any>;
         parseViewRuleGroup(astNode: import("../generated/ast").ViewRuleGroup): import("@likec4/core").ElementViewRuleGroup;
+        parseViewRuleRank(astRule: import("../generated/ast").ViewRuleRank): import("@likec4/core").ElementViewRuleRank;
         parseViewRuleStyle(astRule: import("../generated/ast").ViewRuleStyle | import("../generated/ast").GlobalStyle): import("@likec4/core").ElementViewRuleStyle;
         parseViewRuleGlobalStyle(astRule: import("../generated/ast").ViewRuleGlobalStyle): import("@likec4/core").ViewRuleGlobalStyle;
         parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: (import("@likec4/core").ViewRuleGlobalStyle | import("@likec4/core").ElementViewRuleStyle<import("@likec4/core").Any>)[]): import("../ast").ParsedAstDynamicView;
@@ -466,6 +468,7 @@ declare const DocumentParserFromMixins: {
         parseModel(): void;
         parseElement(astNode: import("../generated/ast").Element): import("../ast").ParsedAstElement;
         parseExtendElement(astNode: import("../generated/ast").ExtendElement): import("../ast").ParsedAstExtend | null;
+        parseExtendRelation(astNode: import("../generated/ast").ExtendRelation): import("../ast").ParsedAstExtendRelation | null;
         _resolveRelationSource(node: import("../generated/ast").Relation): import("@likec4/core").FqnRef.ModelRef | import("@likec4/core").FqnRef.ImportRef;
         parseRelation(astNode: import("../generated/ast").Relation): import("../ast").ParsedAstRelation;
         parseFqnRef(astNode: import("../generated/ast").FqnRef): import("@likec4/core").FqnRef;

package/dist/model/model-parser.js

@@ -1,11 +1,15 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright (c) 2023-2025 Denis Davydkov
+// Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Portions of this file have been modified by NVIDIA CORPORATION & AFFILIATES.
 import { DefaultWeakMap, invariant, MultiMap } from '@likec4/core/utils';
-import { loggable } from '@likec4/log';
 import { DocumentState, UriUtils } from 'langium';
 import { pipe } from 'remeda';
 import { DiagnosticSeverity } from 'vscode-languageserver-types';
 import { isLikeC4LangiumDocument } from '../ast';
-import { isLikeC4Builtin } from '../likec4lib';
-import { logger as rootLogger } from '../logger';
+import { logger as rootLogger, logWarnError } from '../logger';
 import { BaseParser } from './parser/Base';
 import { DeploymentModelParser } from './parser/DeploymentModelParser';
 import { DeploymentViewParser } from './parser/DeploymentViewParser';
@@ -25,24 +29,34 @@ export class LikeC4ModelParser {
     cachedParsers = new DefaultWeakMap((doc) => this.createParser(doc));
     constructor(services) {
         this.services = services;
-        services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.Linked, doc => {
-            try {
+        services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.Linked, async (doc) => {
+            if (this.cachedParsers.has(doc)) {
+                logger.trace('Linked: clear cached parser {projectId} document {doc}', {
+                    projectId: doc.likec4ProjectId,
+                    doc: UriUtils.basename(doc.uri),
+                });
+                this.cachedParsers.delete(doc);
+            }
+        });
+        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.Linked, async (docs) => {
+            for (const doc of docs) {
                 if (services.shared.workspace.ProjectsManager.isExcluded(doc)) {
-                    return;
+                    continue;
                 }
-                if (!isLikeC4Builtin(doc.uri)) {
-                    this.cachedParsers.set(doc, this.createParser(doc));
+                try {
+                    // Force create parser for linked document (if not yet created)
+                    this.parse(doc);
+                }
+                catch (error) {
+                    logWarnError(error);
                 }
-            }
-            catch (e) {
-                logger.warn(loggable(e));
             }
         });
         // We need to clean up cached parser when document is validated and has errors
         // Because after that parser takes into account validation results
-        services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.Validated, doc => {
+        services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.Validated, async (doc) => {
             if (doc.diagnostics?.some(d => d.severity === DiagnosticSeverity.Error) && this.cachedParsers.has(doc)) {
-                logger.debug('clear cached parser {projectId} document {doc}', {
+                logger.trace('Validated: clear cached parser {projectId} document {doc} because of errors', {
                     projectId: doc.likec4ProjectId,
                     doc: UriUtils.basename(doc.uri),
                 });
@@ -54,31 +68,30 @@ export class LikeC4ModelParser {
         return this.services.shared.workspace.LangiumDocuments.projectDocuments(projectId).map(d => this.parse(d));
     }
     parse(doc) {
-        try {
-            const parser = this.forDocument(doc);
-            return parser.doc;
-        }
-        catch (cause) {
-            throw new Error(`Error parsing document ${doc.uri.toString()}`, { cause });
-        }
+        const parser = this.forDocument(doc);
+        return parser.doc;
     }
     forDocument(doc) {
-        if (doc.state < DocumentState.Linked) {
-            logger.warn(`Document {doc} is not linked`, { doc: doc.uri.toString() });
-        }
         return this.cachedParsers.get(doc);
     }
     createParser(doc) {
         invariant(isLikeC4LangiumDocument(doc), `Document ${doc.uri.toString()} is not a LikeC4 document`);
+        const docbasename = UriUtils.basename(doc.uri);
         if (doc.likec4ProjectId) {
-            logger.debug(`create parser {projectId} document {doc}`, {
+            logger.trace(`create parser {projectId} document {doc}`, {
                 projectId: doc.likec4ProjectId,
-                doc: UriUtils.basename(doc.uri),
+                doc: docbasename,
             });
         }
         else {
             logger.warn(`create parser for document without project {doc}`, { doc: doc.uri.fsPath });
         }
+        if (doc.state < DocumentState.Linked) {
+            logger.warn(`Document {doc} is not linked, state is {state}`, {
+                doc: docbasename,
+                state: doc.state,
+            });
+        }
         const props = {
             c4Specification: {
                 tags: {},
@@ -90,6 +103,7 @@ export class LikeC4ModelParser {
             c4Elements: [],
             c4ExtendElements: [],
             c4ExtendDeployments: [],
+            c4ExtendRelations: [],
             c4Relations: [],
             c4Deployments: [],
             c4DeploymentRelations: [],
@@ -111,8 +125,8 @@ export class LikeC4ModelParser {
             parser.parseDeployment();
             parser.parseViews();
         }
-        catch (e) {
-            logger.error(`Error parsing document {doc}`, { doc: doc.uri.toString(), error: e });
+        catch (error) {
+            throw new Error(`Error parsing document ${doc.uri.fsPath}`, { cause: error });
         }
         return parser;
     }

package/dist/model/parser/Base.js

@@ -264,9 +264,14 @@ export class BaseParser {
         if (isArray(elementProps)) {
             const style = this.parseStyleProps(elementProps.find(ast.isElementStyleProperty)?.props);
             // Property on element has higher priority than from style
-            const iconProp = this.parseIconProperty(elementProps.find(ast.isIconProperty));
-            if (iconProp) {
-                style.icon = iconProp;
+            try {
+                const iconProp = this.parseIconProperty(elementProps.find(ast.isIconProperty));
+                if (iconProp) {
+                    style.icon = iconProp;
+                }
+            }
+            catch (err) {
+                logger.warn('Failed to parse icon property on element', { err });
             }
             return style;
         }

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

@@ -15,6 +15,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         parseViewRuleGlobalPredicateRef(astRule: ast.ViewRuleGlobalPredicateRef | ast.DynamicViewGlobalPredicateRef): c4.ViewRuleGlobalPredicateRef;
         parseViewRuleStyleOrGlobalRef(astRule: ast.ViewRuleStyleOrGlobalRef): c4.ViewRuleGlobalStyle | c4.ElementViewRuleStyle<c4.aux.Any>;
         parseViewRuleGroup(astNode: ast.ViewRuleGroup): c4.ElementViewRuleGroup;
+        parseViewRuleRank(astRule: ast.ViewRuleRank): c4.ElementViewRuleRank;
         parseViewRuleStyle(astRule: ast.ViewRuleStyle | ast.GlobalStyle): c4.ElementViewRuleStyle;
         parseViewRuleGlobalStyle(astRule: ast.ViewRuleGlobalStyle): c4.ViewRuleGlobalStyle;
         parseDynamicElementView(astNode: ast.DynamicView, additionalStyles: (c4.ViewRuleGlobalStyle | c4.ElementViewRuleStyle<c4.aux.Any>)[]): import("../../ast").ParsedAstDynamicView;

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

@@ -1,6 +1,6 @@
 import type * as c4 from '@likec4/core';
 import { FqnRef } from '@likec4/core/types';
-import { type ParsedAstElement, type ParsedAstExtend, type ParsedAstRelation, ast } from '../../ast';
+import { type ParsedAstElement, type ParsedAstExtend, type ParsedAstExtendRelation, type ParsedAstRelation, ast } from '../../ast';
 import type { WithExpressionV2 } from './FqnRefParser';
 export type WithModel = ReturnType<typeof ModelParser>;
 export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
@@ -8,6 +8,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         parseModel(): void;
         parseElement(astNode: ast.Element): ParsedAstElement;
         parseExtendElement(astNode: ast.ExtendElement): ParsedAstExtend | null;
+        parseExtendRelation(astNode: ast.ExtendRelation): ParsedAstExtendRelation | null;
         _resolveRelationSource(node: ast.Relation): FqnRef.ModelRef | FqnRef.ImportRef;
         parseRelation(astNode: ast.Relation): ParsedAstRelation;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;