@likec4/language-server 1.38.1 → 1.39.1

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

@@ -14,6 +14,7 @@ const searchResultSchema = z.array(
       technology: z.string().nullable(),
       shape: z.string(),
       includedInViews: includedInViewsSchema,
+      metadata: z.record(z.string()),
       tags: z.array(z.string())
     }),
     z.object({
@@ -26,6 +27,7 @@ const searchResultSchema = z.array(
       technology: z.string().nullable(),
       shape: z.string(),
       includedInViews: includedInViewsSchema,
+      metadata: z.record(z.string()),
       tags: z.array(z.string())
     })
   ])
@@ -41,21 +43,22 @@ export const searchElement = likec4Tool({
 Search LikeC4 elements and deployment nodes across all projects.
 
 Query syntax (case-insensitive):
-- 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
+- Free text: matches id (FQN) or title
 
 Request:
 - search: string \u2014 at least 2 characters
 
 Response (JSON object):
-- found: Result[] - returns top 20 results
 - total: number - total number of results
+- found: Result[] - returns top 20 results
 
 Result (discriminated union by "type"):
-- type = "element": { id: string, name: string, kind: string, title: string, technology: string|null, shape: string, project: string, includedInViews: View[], tags: string[] }
-- type = "deployment-node": { id: string, name: string, kind: string, title: string, technology: string|null, shape: string, project: string, includedInViews: View[], tags: string[] }
+- type = "element": { id: string, name: string, kind: string, title: string, technology: string|null, shape: string, project: string, includedInViews: View[], tags: string[], metadata: Record<string, string> }
+- type = "deployment-node": { id: string, name: string, kind: string, title: string, technology: string|null, shape: string, project: string, includedInViews: View[], tags: string[], metadata: Record<string, string> }
 
 View (object) fields:
 - id: string \u2014 view identifier
@@ -68,6 +71,7 @@ Notes:
 
 Example response:
 {
+  "total": 1,
   "found": [
     {
       "type": "logical",
@@ -85,7 +89,8 @@ Example response:
           "type": "element"
         }
       ],
-      "tags": ["public"]
+      "tags": ["public"],
+      "metadata": {}
     }
   ]
 }
@@ -94,8 +99,8 @@ Example response:
     search: z.string().min(2, "Search must be at least 2 characters long")
   },
   outputSchema: {
-    found: searchResultSchema,
-    total: z.number()
+    total: z.number(),
+    found: searchResultSchema
   }
 }, async (languageServices, args) => {
   const projects = languageServices.projects();
@@ -104,14 +109,22 @@ Example response:
   let predicate;
   if (search.startsWith("kind:")) {
     search = search.slice(5);
-    predicate = (el) => el.kind.toLowerCase().includes(search);
+    logger.debug("search by kind: {search}", { search });
+    predicate = (el) => el.kind.toLowerCase() === search;
   } else if (search.startsWith("shape:")) {
     search = search.slice(6);
-    predicate = (el) => el.shape.toLowerCase().includes(search);
+    logger.debug("search by shape: {search}", { search });
+    predicate = (el) => el.shape.toLowerCase() === search;
+  } else if (search.startsWith("meta:")) {
+    search = search.slice(5);
+    logger.debug("search by metadata: {search}", { search });
+    predicate = (el) => !!el.getMetadata(search);
   } else if (search.startsWith("#")) {
     search = search.slice(1);
+    logger.debug("search by tag: {search}", { search });
     predicate = (el) => el.tags.some((tag) => tag.toLowerCase().includes(search));
   } else {
+    logger.debug("search by id/title: {search}", { search });
     predicate = (el) => el.id.toLowerCase().includes(search) || el.title.toLowerCase().includes(search);
   }
   for (const project of projects) {
@@ -128,6 +141,7 @@ Example response:
           technology: el.technology,
           shape: el.shape,
           tags: [...el.tags],
+          metadata: el.getMetadata(),
           includedInViews: includedInViews(el.views())
         });
       }
@@ -142,6 +156,7 @@ Example response:
           technology: el.technology,
           shape: el.shape,
           tags: [...el.tags],
+          metadata: el.getMetadata(),
           includedInViews: includedInViews(el.views())
         });
       }
@@ -150,7 +165,7 @@ Example response:
     }
   }
   return {
-    found: found.slice(0, 20),
-    total: found.length
+    total: found.length,
+    found: found.slice(0, 20)
   };
 });

package/dist/mcp/utils.js

@@ -14,7 +14,7 @@ export function likec4Tool(config, cb) {
 }
 function mkcallTool(name, languageServices, cb) {
   const tool = cb.bind(null, languageServices);
-  return async function callTool(args, extra) {
+  return (async function callTool(args, extra) {
     logger.debug("Calling tool {name}, args: {args}", { name, args });
     try {
       const result = await tool.call(null, args, extra);
@@ -43,5 +43,5 @@ function mkcallTool(name, languageServices, cb) {
         isError: true
       };
     }
-  };
+  });
 }

package/dist/model/builder/MergedSpecification.d.ts

@@ -1,5 +1,5 @@
-import * as c4 from '@likec4/core';
-import { MultiMap } from '@likec4/core';
+import type * as c4 from '@likec4/core';
+import { MultiMap } from '@likec4/core/utils';
 import type { ParsedAstDeployment, ParsedAstDeploymentRelation, ParsedAstElement, ParsedAstRelation, ParsedAstSpecification, ParsedLikeC4LangiumDocument } from '../../ast';
 /**
  * The `MergedSpecification` class is responsible for merging multiple parsed

package/dist/model/builder/MergedSpecification.js

@@ -1,8 +1,5 @@
-import * as c4 from "@likec4/core";
-import { MultiMap } from "@likec4/core";
-import {
-  FqnRef
-} from "@likec4/core/types";
+import { FqnRef } from "@likec4/core/types";
+import { MultiMap, nameFromFqn } from "@likec4/core/utils";
 import {
   isBoolean,
   isEmpty,
@@ -89,7 +86,7 @@ export class MergedSpecification {
       textSize ??= __kind.style.textSize;
       description ??= __kind.description;
       links ??= __kind.links;
-      title = title === c4.nameFromFqn(id) && __kind.title ? __kind.title : title;
+      title = title === nameFromFqn(id) && __kind.title ? __kind.title : title;
       return {
         ...color && { color },
         ...shape && { shape },
@@ -177,7 +174,7 @@ export class MergedSpecification {
         ...rest
       } = parsed;
       description ??= __kind.description;
-      title = title === c4.nameFromFqn(parsed.id) && __kind.title ? __kind.title : title;
+      title = title === nameFromFqn(parsed.id) && __kind.title ? __kind.title : title;
       return {
         ...rest,
         ...{ title },

package/dist/model/builder/assignTagColors.js

@@ -1,4 +1,4 @@
-import { compareNatural, nonNullable } from "@likec4/core";
+import { compareNatural, nonNullable } from "@likec4/core/utils";
 import { concat, entries, isTruthy, map, pipe, prop, pullObject, sort } from "remeda";
 export const radixColors = [
   "tomato",

package/dist/model/builder/buildModel.d.ts

@@ -1,8 +1,7 @@
-import * as c4 from '@likec4/core';
+import type * as c4 from '@likec4/core';
 import { type MultiMap } from '@likec4/core';
-import type { URI } from 'langium';
 import type { ParsedLikeC4LangiumDocument } from '../../ast';
-import type { ProjectConfig } from '../../config';
+import type { Project } from '../../workspace/ProjectsManager';
 export type BuildModelData = {
     data: c4.ParsedLikeC4ModelData;
     imports: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
@@ -14,8 +13,4 @@ export type BuildModelData = {
  * This function builds a model from all documents, merging the specifications
  * and globals, and applying the extends to the elements.
  */
-export declare function buildModelData(project: {
-    id: c4.ProjectId;
-    folderUri: URI;
-    config: Readonly<ProjectConfig>;
-}, docs: ReadonlyArray<ParsedLikeC4LangiumDocument>): BuildModelData;
+export declare function buildModelData(project: Project, docs: ReadonlyArray<ParsedLikeC4LangiumDocument>): BuildModelData;

package/dist/model/builder/buildModel.js

@@ -1,12 +1,15 @@
-import * as c4 from "@likec4/core";
 import {
   computeColorValues,
   isDeploymentNode,
-  isGlobalFqn,
-  parentFqn,
-  sortByFqnHierarchically
+  isGlobalFqn
 } from "@likec4/core";
 import { resolveRulesExtendedViews } from "@likec4/core/compute-view";
+import { _stage, _type, FqnRef } from "@likec4/core/types";
+import {
+  compareNatural,
+  parentFqn,
+  sortByFqnHierarchically
+} from "@likec4/core/utils";
 import {
   filter,
   flatMap,
@@ -69,7 +72,7 @@ export function buildModelData(project, docs) {
     flatMap((d) => map(d.c4Relations, c4Specification.toModelRelation)),
     filter((rel) => {
       if (!rel) return false;
-      const source = c4.FqnRef.flatten(rel.source), target = c4.FqnRef.flatten(rel.target);
+      const source = FqnRef.flatten(rel.source), target = FqnRef.flatten(rel.target);
       if (isNullish(elements[source]) && !isGlobalFqn(source) || isNullish(elements[target]) && !isGlobalFqn(target)) {
         logger.debug`Invalid relation ${rel.id}
   source: ${source} resolved: ${!!elements[source]}
@@ -143,7 +146,7 @@ export function buildModelData(project, docs) {
         // model should include discriminant __
         ...model
       } = parsedAstView;
-      if (parsedAstView[c4._type] === "element" && isNullish(title) && "viewOf" in parsedAstView) {
+      if (parsedAstView[_type] === "element" && isNullish(title) && "viewOf" in parsedAstView) {
         title = elements[parsedAstView.viewOf]?.title ?? null;
       }
       if (isNullish(title) && id === "index") {
@@ -151,7 +154,7 @@ export function buildModelData(project, docs) {
       }
       return {
         ...model,
-        [c4._stage]: "parsed",
+        [_stage]: "parsed",
         docUri,
         description,
         title,
@@ -167,8 +170,8 @@ export function buildModelData(project, docs) {
   );
   if (!parsedViews.some((v) => v.id === "index")) {
     parsedViews.unshift({
-      [c4._stage]: "parsed",
-      [c4._type]: "element",
+      [_stage]: "parsed",
+      [_type]: "element",
       id: "index",
       title: "Landscape view",
       description: null,
@@ -192,7 +195,7 @@ export function buildModelData(project, docs) {
   );
   return {
     data: {
-      [c4._stage]: "parsed",
+      [_stage]: "parsed",
       projectId: project.id,
       project: {
         id: project.id,
@@ -207,7 +210,7 @@ export function buildModelData(project, docs) {
           style
         })),
         deployments: c4Specification.specs.deployments,
-        ...metadataKeys.size > 0 && { metadataKeys: [...metadataKeys].sort(c4.compareNatural) },
+        ...metadataKeys.size > 0 && { metadataKeys: [...metadataKeys].sort(compareNatural) },
         customColors
       },
       elements,

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

@@ -6,7 +6,7 @@ import { CancellationToken } from 'vscode-jsonrpc';
 import type { LikeC4Services } from '../module';
 import { ADisposable } from '../utils';
 type ModelParsedListener = (docs: URI[]) => void;
-export interface LikeC4ModelBuilder {
+export interface LikeC4ModelBuilder extends Disposable {
     parseModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Parsed | null>;
     unsafeSyncBuildModel(projectId: c4.ProjectId): LikeC4Model.Computed;
     buildLikeC4Model(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Computed>;

package/dist/model/model-locator.js

@@ -1,4 +1,5 @@
-import { ifilter, invariant, splitGlobalFqn, toArray } from "@likec4/core";
+import { splitGlobalFqn } from "@likec4/core";
+import { ifilter, invariant, toArray } from "@likec4/core/utils";
 import { loggable } from "@likec4/log";
 import { AstUtils, DocumentState, GrammarUtils } from "langium";
 import { flatMap, isString, pipe } from "remeda";

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

@@ -1,6 +1,6 @@
 import type { ProjectId } from '@likec4/core';
 import { type LangiumDocument, type Stream } from 'langium';
-import type { ParsedLikeC4LangiumDocument } from '../ast';
+import { type ParsedLikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
 import { BaseParser } from './parser/Base';
 export type ModelParsedListener = () => void;
@@ -55,11 +55,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -75,6 +71,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -148,11 +145,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -168,6 +161,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -203,11 +197,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -223,6 +213,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -272,11 +263,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -292,6 +279,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -334,11 +322,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -354,6 +338,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -404,11 +389,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -424,6 +405,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -467,11 +449,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -487,6 +465,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -510,11 +489,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -530,6 +505,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;
@@ -568,11 +544,7 @@ declare const DocumentParserFromMixins: {
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../config").ProjectConfig>;
-        };
+        get project(): import("../workspace").Project;
         resolveFqn(node: import("../generated/ast").FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: import("../generated/ast").MetadataProperty | undefined): {
@@ -588,6 +560,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;

package/dist/model/model-parser.js

@@ -1,8 +1,9 @@
-import { DefaultWeakMap, MultiMap } from "@likec4/core/utils";
+import { DefaultWeakMap, invariant, MultiMap } from "@likec4/core/utils";
 import { loggable } from "@likec4/log";
 import { DocumentState } from "langium";
 import { pipe } from "remeda";
 import { DiagnosticSeverity } from "vscode-languageserver-types";
+import { isLikeC4LangiumDocument } from "../ast.js";
 import { isLikeC4Builtin } from "../likec4lib.js";
 import { logger as rootLogger } from "../logger.js";
 import { BaseParser } from "./parser/Base.js";
@@ -73,11 +74,20 @@ export class LikeC4ModelParser {
   }
   forDocument(doc) {
     if (doc.state < DocumentState.Linked) {
-      logger.warn(`Document ${doc.uri.toString()} is not 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`);
+    if (doc.likec4ProjectId) {
+      logger.debug(`create parser {projectId} document {doc}`, {
+        projectId: doc.likec4ProjectId,
+        doc: doc.uri.toString()
+      });
+    } else {
+      logger.warn(`create parser for document without project {doc}`, { doc: doc.uri.toString() });
+    }
     const props = {
       c4Specification: {
         tags: {},
@@ -110,7 +120,7 @@ export class LikeC4ModelParser {
       parser.parseDeployment();
       parser.parseViews();
     } catch (e) {
-      logger.error(`Error parsing document ${doc.uri.toString()}`, { cause: e });
+      logger.error(`Error parsing document {doc}`, { doc: doc.uri.toString(), error: e });
     }
     return parser;
   }

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

@@ -1,10 +1,10 @@
 import type * as c4 from '@likec4/core';
 import { type MarkdownOrString } from '@likec4/core';
-import type { AstNode, URI } from 'langium';
+import type { AstNode } 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';
+import type { Project } from '../../workspace/ProjectsManager';
 export type GConstructor<T = {}> = new (...args: any[]) => T;
 export declare function toSingleLine(str: string): string;
 export declare function toSingleLine(str: string | undefined | null): string | undefined;
@@ -23,11 +23,7 @@ export declare class BaseParser {
     readonly doc: ParsedLikeC4LangiumDocument;
     isValid: IsValidFn;
     constructor(services: LikeC4Services, doc: ParsedLikeC4LangiumDocument);
-    get project(): {
-        id: c4.ProjectId;
-        folderUri: URI;
-        config: Readonly<ProjectConfig>;
-    };
+    get project(): Project;
     resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
     getAstNodePath(node: AstNode): any;
     getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
@@ -43,6 +39,7 @@ export declare class BaseParser {
     convertLinks(source?: ast.LinkProperty['$container']): c4.Link[] | undefined;
     parseLinks(source?: ast.LinkProperty['$container']): c4.Link[] | undefined;
     parseIconProperty(prop: ast.IconProperty | undefined): c4.IconUrl | undefined;
+    parseImageAlias(value: string): string | undefined;
     parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
     parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): ParsedElementStyle;
     parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): ParsedElementStyle;

package/dist/model/parser/Base.js

@@ -23,6 +23,7 @@ import {
   parseMarkdownAsString,
   toColor
 } from "../../ast.js";
+import { logger } from "../../logger.js";
 import { projectIdFrom } from "../../utils/index.js";
 import { readStrictFqn } from "../../utils/elementRef.js";
 import { checksFromDiagnostics } from "../../validation/index.js";
@@ -179,10 +180,14 @@ export class BaseParser {
       }
       case (value && hasProtocol(value)): {
         if (value.startsWith("file:")) {
+          logger.warn(`Icon property '${value}' used the 'file' protocol which is not supported`);
           return void 0;
         }
         return value;
       }
+      case (value && value.startsWith("@")): {
+        return this.parseImageAlias(value);
+      }
       case (value && isRelative(value)): {
         return joinRelativeURL(this.doc.uri.toString(), "../", value);
       }
@@ -190,10 +195,24 @@ export class BaseParser {
         return joinURL(this.project.folderUri.toString(), value);
       }
       default: {
+        logger.warn(`Icon property '${value}' is not a valid URL, library icon, image alias or 'none'`);
         return void 0;
       }
     }
   }
+  parseImageAlias(value) {
+    const slashIndex = value.indexOf("/");
+    const aliasName = slashIndex > 0 ? value.substring(0, slashIndex) : value;
+    const remainingPath = slashIndex > 0 ? value.substring(slashIndex + 1) : "";
+    const imageAliases = { "@": "./images", ...this.project.config.imageAliases || {} };
+    const aliasPath = imageAliases[aliasName];
+    if (!aliasPath) {
+      logger.warn(`Image alias "${aliasName}" not found in project configuration`);
+      return void 0;
+    }
+    const fullPath = remainingPath ? joinURL(aliasPath, remainingPath) : aliasPath;
+    return joinURL(this.project.folderUri.toString(), fullPath);
+  }
   parseColorLiteral(astNode) {
     if (!this.isValid(astNode)) {
       return void 0;

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

@@ -30,11 +30,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;
         readonly doc: import("../../ast").ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: c4.ProjectId;
-            folderUri: c4;
-            config: Readonly<import("../../config").ProjectConfig>;
-        };
+        get project(): import("../../workspace").Project;
         resolveFqn(node: ast.FqnReferenceable): c4.Fqn;
         getAstNodePath(node: c4): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
@@ -50,6 +46,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         convertLinks(source?: ast.LinkProperty["$container"]): c4.Link[] | undefined;
         parseLinks(source?: ast.LinkProperty["$container"]): c4.Link[] | undefined;
         parseIconProperty(prop: ast.IconProperty | undefined): c4.IconUrl | undefined;
+        parseImageAlias(value: string): string | undefined;
         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;