@likec4/language-server 1.38.1 → 1.39.1

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

@@ -28,11 +28,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         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): {
@@ -48,6 +44,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         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;

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

@@ -23,11 +23,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         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): {
@@ -43,6 +39,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         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;

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

@@ -52,11 +52,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         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): {
@@ -72,6 +68,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         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;

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

@@ -7,11 +7,7 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;
         readonly doc: import("../../ast").ParsedLikeC4LangiumDocument;
-        get project(): {
-            id: ProjectId;
-            folderUri: ProjectId;
-            config: Readonly<import("../../config").ProjectConfig>;
-        };
+        get project(): import("../../workspace").Project;
         resolveFqn(node: ast.FqnReferenceable): ProjectId;
         getAstNodePath(node: ProjectId): any;
         getMetadata(metadataAstNode: ast.MetadataProperty | undefined): {
@@ -27,6 +23,7 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         convertLinks(source?: ast.LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: ast.LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: ast.IconProperty | undefined): ProjectId | undefined;
+        parseImageAlias(value: string): string | undefined;
         parseColorLiteral(astNode: ast.ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;

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

@@ -29,11 +29,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         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): {
@@ -49,6 +45,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         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;

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

@@ -34,11 +34,7 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         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): {
@@ -54,6 +50,7 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         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;

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

@@ -13,11 +13,7 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         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): {
@@ -33,6 +29,7 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         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;

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

@@ -50,11 +50,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         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): {
@@ -70,6 +66,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         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;

package/dist/protocol.d.ts

@@ -1,7 +1,7 @@
+import type { LikeC4ProjectJsonConfig } from '@likec4/config';
 import type { ComputedLikeC4ModelData, ComputedView, DeploymentFqn, DiagramView, Fqn, LayoutedLikeC4ModelData, NonEmptyArray, ProjectId, RelationId, ViewChange, ViewId } from '@likec4/core';
 import { NotificationType, RequestType, RequestType0 } from 'vscode-jsonrpc';
 import type { DiagnosticSeverity, DocumentUri, Location, Position, Range, URI } from 'vscode-languageserver-types';
-import type { ProjectConfig } from './config';
 export declare namespace DidChangeModelNotification {
     const type: NotificationType<string>;
     type Type = typeof type;
@@ -139,7 +139,7 @@ export declare namespace FetchProjects {
         projects: {
             [projectId: ProjectId]: {
                 folder: URI;
-                config: ProjectConfig;
+                config: LikeC4ProjectJsonConfig;
                 docs: NonEmptyArray<DocumentUri>;
             };
         };
@@ -147,6 +147,20 @@ export declare namespace FetchProjects {
     const req: RequestType0<Res, void>;
     type Req = typeof req;
 }
+/**
+ * Request from the client to register a project.
+ */
+export declare namespace RegisterProject {
+    type Params = {
+        folderUri: URI;
+        config: LikeC4ProjectJsonConfig;
+    };
+    type Res = {
+        id: ProjectId;
+    };
+    const req: RequestType<Params, Res, void>;
+    type Req = typeof req;
+}
 /**
  * Request to build documents.
  */

package/dist/protocol.js

@@ -39,6 +39,10 @@ export var FetchProjects;
 ((FetchProjects2) => {
   FetchProjects2.req = new RequestType0("likec4/fetch-projects");
 })(FetchProjects || (FetchProjects = {}));
+export var RegisterProject;
+((RegisterProject2) => {
+  RegisterProject2.req = new RequestType("likec4/register-project");
+})(RegisterProject || (RegisterProject = {}));
 export var BuildDocuments;
 ((BuildDocuments2) => {
   BuildDocuments2.Req = new RequestType("likec4/build");

package/dist/test/testServices.d.ts

@@ -1,8 +1,12 @@
+import type { LikeC4ProjectJsonConfig } from '@likec4/config';
 import type { ComputedLikeC4ModelData } from '@likec4/core';
 import type { LiteralUnion } from 'type-fest';
 import { URI } from 'vscode-uri';
 import type { LikeC4LangiumDocument } from '../ast';
-export declare function createTestServices(workspace?: string): {
+export declare function createTestServices(options?: {
+    workspace?: string;
+    projectConfig?: Partial<LikeC4ProjectJsonConfig>;
+}): {
     services: any;
     addDocument: (input: string, uri?: string) => Promise<LikeC4LangiumDocument>;
     parse: (input: string, uri?: string) => Promise<LikeC4LangiumDocument>;

package/dist/test/testServices.js

@@ -6,7 +6,9 @@ import { DiagnosticSeverity } from "vscode-languageserver-types";
 import { URI, Utils } from "vscode-uri";
 import { NoopFileSystem } from "../filesystem/index.js";
 import { createLanguageServices } from "../module.js";
-export function createTestServices(workspace = "file:///test/workspace") {
+export function createTestServices(options) {
+  const workspace = options?.workspace ?? "file:///test/workspace";
+  const projectConfig = options?.projectConfig;
   const services = createLanguageServices(NoopFileSystem).likec4;
   const metaData = services.LanguageMetaData;
   const langiumDocuments = services.shared.workspace.LangiumDocuments;
@@ -15,7 +17,7 @@ export function createTestServices(workspace = "file:///test/workspace") {
   const workspaceUri = URI.parse(workspace);
   const formatter = services.lsp.Formatter;
   const workspaceFolder = {
-    name: "test",
+    name: projectConfig?.name || "test-project",
     uri: workspaceUri.toString()
   };
   let isInitialized = false;
@@ -34,6 +36,19 @@ export function createTestServices(workspace = "file:///test/workspace") {
         workspaceFolders: [workspaceFolder]
       });
       await services.shared.workspace.WorkspaceManager.initializeWorkspace([workspaceFolder]);
+      if (projectConfig) {
+        const projectFolderUri = Utils.resolvePath(workspaceUri, "src");
+        services.shared.workspace.ProjectsManager.registerProject({
+          config: {
+            name: projectConfig?.name || "test-project",
+            title: projectConfig?.title || "Test Project",
+            contactPerson: projectConfig?.contactPerson || "Unknown",
+            imageAliases: projectConfig?.imageAliases || {},
+            exclude: projectConfig?.exclude || ["node_modules"]
+          },
+          folderUri: projectFolderUri
+        });
+      }
     });
   }
   const addDocument = async (input, uri) => {
@@ -139,7 +154,7 @@ export async function createMultiProjectTestServices(data) {
     services,
     addDocument,
     validateAll
-  } = createTestServices(workspace);
+  } = createTestServices({ workspace });
   const projects = {};
   for (const [name, files] of entries(data)) {
     const folderUri = UriUtils.joinPath(URI.parse(workspace), "src", name);

package/dist/utils/disposable.d.ts

@@ -1,4 +1,4 @@
-import { Disposable } from 'langium';
+import type { Disposable } from 'langium';
 export declare abstract class ADisposable implements Disposable {
     protected toDispose: Disposable[];
     protected isDisposed: boolean;

package/dist/utils/stringHash.js

@@ -1,4 +1,4 @@
-import { stringHash as hash } from "@likec4/core";
+import { stringHash as hash } from "@likec4/core/utils";
 export function stringHash(...str) {
   var s = str.length > 1 ? str.join(":::") : str[0];
   return hash(s);

package/dist/view-utils/resolve-relative-paths.js

@@ -1,4 +1,4 @@
-import { compareNatural, invariant } from "@likec4/core";
+import { compareNatural, invariant } from "@likec4/core/utils";
 import { filter, hasAtLeast, isTruthy, map, pipe, unique } from "remeda";
 import { parsePath } from "ufo";
 function commonAncestorPath(views, sep = "/") {

package/dist/workspace/ProjectsManager.d.ts

@@ -1,8 +1,7 @@
+import { type LikeC4ProjectConfig } from '@likec4/config';
 import type { NonEmptyReadonlyArray, ProjectId } from '@likec4/core';
 import { type Cancellation, type FileSystemNode, type LangiumDocument, URI, WorkspaceCache } from 'langium';
-import picomatch from 'picomatch';
 import type { Tagged } from 'type-fest';
-import { ProjectConfig } from '../config';
 import type { LikeC4SharedServices } from '../module';
 /**
  * A tagged string that represents a project folder URI
@@ -12,24 +11,25 @@ export type ProjectFolder = Tagged<string, 'ProjectFolder'>;
 export declare function ProjectFolder(folder: URI | string): ProjectFolder;
 interface ProjectData {
     id: ProjectId;
-    config: ProjectConfig;
+    config: LikeC4ProjectConfig;
     folder: ProjectFolder;
     folderUri: URI;
-    exclude?: picomatch.Matcher;
+    exclude?: (path: string) => boolean;
 }
 export interface Project {
     id: ProjectId;
     folderUri: URI;
-    config: ProjectConfig;
+    config: LikeC4ProjectConfig;
 }
 export declare class ProjectsManager {
+    #private;
     protected services: LikeC4SharedServices;
     /**
      * The global project ID used for all documents
      * that are not part of a specific project.
      */
     static readonly DefaultProjectId: ProjectId;
-    static readonly ConfigFileNames: string[];
+    private static DefaultProject;
     /**
      * The mapping between project config files and project IDs.
      */
@@ -41,20 +41,30 @@ export declare class ProjectsManager {
      */
     private _projects;
     private excludedDocuments;
-    private defaultGlobalProject;
+    private get defaultGlobalProject();
     private reloadProjectsLimiter;
     constructor(services: LikeC4SharedServices);
     /**
      * Returns:
+     *  - configured default project ID if set
      *  - the default project ID if there are no projects.
      *  - the ID of the only project
      *  - undefined if there are multiple projects.
      */
     get defaultProjectId(): ProjectId | undefined;
+    set defaultProjectId(id: ProjectId | undefined);
     get all(): NonEmptyReadonlyArray<ProjectId>;
     getProject(arg: ProjectId | LangiumDocument): Project;
+    /**
+     * Validates and ensures the project ID.
+     * If no project ID is specified, returns default project ID
+     * If there are multiple projects and default project is not set, throws an error
+     */
     ensureProjectId(projectId?: ProjectId | undefined): ProjectId;
     hasMultipleProjects(): boolean;
+    /**
+     * Checks if the specified document should be excluded from processing.
+     */
     checkIfExcluded(document: LangiumDocument | URI | string): boolean;
     /**
      * Checks if it is a config file and it is not excluded by default exclude pattern
@@ -68,15 +78,19 @@ export declare class ProjectsManager {
      * @param entry The file system entry to check
      */
     loadConfigFile(entry: FileSystemNode): Promise<ProjectData | undefined>;
-    registerProject(configFile: URI): Promise<ProjectData>;
-    registerProject(opts: {
-        config: ProjectConfig;
+    /**
+     * Registers (or reloads) likec4 project by config file or config object.
+     * If there is some project registered at same folder, it will be reloaded.
+     */
+    registerProject(opts: URI | {
+        config: LikeC4ProjectConfig;
         folderUri: URI | string;
     }): Promise<ProjectData>;
     belongsTo(document: LangiumDocument | URI | string): ProjectId;
     reloadProjects(token?: Cancellation.CancellationToken): Promise<void>;
     protected uniqueProjectId(name: string): ProjectId;
     protected resetProjectIds(): void;
+    protected rebuidDocuments(): Promise<void>;
     protected findProjectForDocument(documentUri: string): any;
     protected get mappingsToProject(): WorkspaceCache<string, Pick<ProjectData, 'id' | 'config' | 'exclude'>>;
 }

package/dist/workspace/ProjectsManager.js

@@ -1,4 +1,5 @@
-import { BiMap, delay, invariant, memoizeProp, nonNullable } from "@likec4/core";
+import { isLikeC4Config, validateProjectConfig } from "@likec4/config";
+import { BiMap, delay, invariant, memoizeProp, nonNullable } from "@likec4/core/utils";
 import { loggable } from "@likec4/log";
 import { deepEqual } from "fast-equals";
 import {
@@ -15,7 +16,6 @@ import {
   withoutProtocol,
   withTrailingSlash
 } from "ufo";
-import { parseConfigJson, validateConfig } from "../config/index.js";
 import { logger as mainLogger } from "../logger.js";
 const logger = mainLogger.getChild("ProjectsManager");
 function normalizeUri(uri) {
@@ -41,11 +41,19 @@ export class ProjectsManager {
    * that are not part of a specific project.
    */
   static DefaultProjectId = "default";
-  static ConfigFileNames = [
-    ".likec4rc",
-    ".likec4.config.json",
-    "likec4.config.json"
-  ];
+  static DefaultProject = {
+    id: ProjectsManager.DefaultProjectId,
+    config: {
+      name: ProjectsManager.DefaultProjectId,
+      exclude: ["**/node_modules/**"]
+    },
+    exclude: picomatch("**/node_modules/**", { dot: true })
+  };
+  /**
+   * Configured default project ID.
+   * (it is used in CLI and Vite plugin)
+   */
+  #defaultProjectId = void 0;
   /**
    * The mapping between project config files and project IDs.
    */
@@ -57,36 +65,56 @@ export class ProjectsManager {
    */
   _projects = [];
   excludedDocuments = /* @__PURE__ */ new WeakMap();
-  defaultGlobalProject = {
-    id: ProjectsManager.DefaultProjectId,
-    config: {
-      name: ProjectsManager.DefaultProjectId,
-      exclude: ["**/node_modules/**"]
-    },
-    exclude: picomatch("**/node_modules/**", { dot: true })
-  };
+  get defaultGlobalProject() {
+    return ProjectsManager.DefaultProject;
+  }
   reloadProjectsLimiter = new PQueue({
     concurrency: 1,
     timeout: 2e4
   });
   /**
    * Returns:
+   *  - configured default project ID if set
    *  - the default project ID if there are no projects.
    *  - the ID of the only project
    *  - undefined if there are multiple projects.
    */
   get defaultProjectId() {
+    if (this.#defaultProjectId) {
+      return this.#defaultProjectId;
+    }
     if (this._projects.length > 1) {
       return void 0;
     }
     return this._projects[0]?.id ?? ProjectsManager.DefaultProjectId;
   }
+  set defaultProjectId(id) {
+    if (id === this.#defaultProjectId) {
+      return;
+    }
+    if (!id || id === ProjectsManager.DefaultProjectId) {
+      logger.debug`reset default project ID`;
+      this.#defaultProjectId = void 0;
+      return;
+    }
+    invariant(this._projects.find((p) => p.id === id), `Project "${id}" not found`);
+    logger.debug`set default project ID to ${id}`;
+    this.#defaultProjectId = id;
+  }
   get all() {
     if (hasAtLeast(this._projects, 1)) {
-      return [
+      const ids = [
         ...map(this._projects, prop("id")),
         ProjectsManager.DefaultProjectId
       ];
+      if (this.#defaultProjectId) {
+        const idx = ids.findIndex((p) => p === this.#defaultProjectId);
+        if (idx > 0) {
+          const [defaultProject] = ids.splice(idx, 1);
+          return [defaultProject, ...ids];
+        }
+      }
+      return ids;
     }
     return [ProjectsManager.DefaultProjectId];
   }
@@ -116,6 +144,11 @@ export class ProjectsManager {
       config
     };
   }
+  /**
+   * Validates and ensures the project ID.
+   * If no project ID is specified, returns default project ID
+   * If there are multiple projects and default project is not set, throws an error
+   */
   ensureProjectId(projectId) {
     if (projectId === ProjectsManager.DefaultProjectId) {
       return this.defaultProjectId ?? ProjectsManager.DefaultProjectId;
@@ -132,6 +165,9 @@ export class ProjectsManager {
   hasMultipleProjects() {
     return this._projects.length > 1;
   }
+  /**
+   * Checks if the specified document should be excluded from processing.
+   */
   checkIfExcluded(document) {
     if (typeof document === "string" || URI.isUri(document)) {
       let docUriAsString = normalizeUri(document);
@@ -152,7 +188,7 @@ export class ProjectsManager {
    */
   isConfigFile(entry) {
     const filename = parseFilename(entry.toString(), { strict: false })?.toLowerCase();
-    const isConfigFile = !!filename && ProjectsManager.ConfigFileNames.includes(filename);
+    const isConfigFile = !!filename && isLikeC4Config(filename);
     if (isConfigFile) {
       if (this.defaultGlobalProject.exclude(entry.path)) {
         logger.debug`exclude config file ${entry.path}`;
@@ -179,22 +215,25 @@ export class ProjectsManager {
 
 ${loggable(error)}`
         );
-        logger.error("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
+        logger.warn("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
         return void 0;
       }
     }
     return void 0;
   }
+  /**
+   * Registers (or reloads) likec4 project by config file or config object.
+   * If there is some project registered at same folder, it will be reloaded.
+   */
   async registerProject(opts) {
     if (URI.isUri(opts)) {
       const configFile = opts;
-      const cfg = await this.services.workspace.FileSystemProvider.readFile(configFile);
-      const config2 = parseConfigJson(cfg);
+      const config2 = await this.services.workspace.FileSystemProvider.loadProjectConfig(configFile);
       const path = joinRelativeURL(configFile.path, "..");
       const folderUri2 = configFile.with({ path });
       return await this.registerProject({ config: config2, folderUri: folderUri2 });
     }
-    const config = pickBy(validateConfig(opts.config), isTruthy);
+    const config = pickBy(validateProjectConfig(opts.config), isTruthy);
     const { folderUri } = opts;
     const folder = ProjectFolder(folderUri);
     let project = this._projects.find((p) => p.folder === folder);
@@ -278,7 +317,7 @@ ${loggable(error)}`
             }
           }
         } catch (error) {
-          logger.error("Failed to load config file", { error });
+          logger.error("Failed to scanProjectFiles, {folder}", { folder: folder.uri, error });
         }
       }
       if (configFiles.length === 0 && this._projects.length !== 0) {
@@ -288,15 +327,13 @@ ${loggable(error)}`
       this.projectIdToFolder.clear();
       for (const entry of configFiles) {
         try {
-          await this.registerProject(entry.uri);
+          await this.loadConfigFile(entry);
         } catch (error) {
-          logger.error("Failed to load config file", { error });
+          logger.error("Failed to load config file {uri}", { uri: entry.uri.toString(), error });
         }
       }
       this.resetProjectIds();
-      const docs = this.services.workspace.LangiumDocuments.all.map((d) => d.uri).toArray();
-      logger.info("invalidate and rebuild documents {docs}", { docs: docs.length });
-      await this.services.workspace.DocumentBuilder.update(docs, []);
+      await this.rebuidDocuments();
     });
   }
   uniqueProjectId(name) {
@@ -308,10 +345,18 @@ ${loggable(error)}`
     return id;
   }
   resetProjectIds() {
+    if (this.#defaultProjectId && !this.projectIdToFolder.has(this.#defaultProjectId)) {
+      this.#defaultProjectId = void 0;
+    }
     this.mappingsToProject.clear();
     this.excludedDocuments = /* @__PURE__ */ new WeakMap();
     this.services.workspace.LangiumDocuments.resetProjectIds();
   }
+  async rebuidDocuments() {
+    const docs = this.services.workspace.LangiumDocuments.all.map((d) => d.uri).toArray();
+    logger.info("invalidate and rebuild all {docs} documents", { docs: docs.length });
+    await this.services.workspace.DocumentBuilder.update(docs, []);
+  }
   findProjectForDocument(documentUri) {
     return this.mappingsToProject.get(documentUri, () => {
       const project = this._projects.find(({ folder }) => documentUri.startsWith(folder));

package/dist/workspace/WorkspaceManager.js

@@ -1,8 +1,9 @@
-import { hasAtLeast, invariant } from "@likec4/core";
+import { invariant } from "@likec4/core";
 import { DefaultWorkspaceManager } from "langium";
+import { hasAtLeast } from "remeda";
 import { URI } from "vscode-uri";
 import * as BuiltIn from "../likec4lib.js";
-import { logError } from "../logger.js";
+import { logWarnError } from "../logger.js";
 export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
   constructor(services) {
     super(services);
@@ -29,7 +30,7 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
         configFiles.push(...found);
         this.services.workspace.FileSystemWatcher.watch(uri.fsPath);
       } catch (error) {
-        logError(error);
+        logWarnError(error);
       }
     }
     const projects = this.services.workspace.ProjectsManager;
@@ -37,7 +38,7 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
       try {
         await projects.loadConfigFile(entry);
       } catch (error) {
-        logError(error);
+        logWarnError(error);
       }
     }
     return await super.performStartup(folders);