@likec4/language-server 1.38.0 → 1.39.0

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/LangiumDocuments.d.ts

@@ -1,10 +1,13 @@
 import type { NonEmptyArray, ProjectId } from '@likec4/core';
-import { type Stream, DefaultLangiumDocuments } from 'langium';
+import type { LangiumDocument, Stream } from 'langium';
+import { DefaultLangiumDocuments } from 'langium';
 import { type LikeC4LangiumDocument } from '../ast';
 import type { LikeC4SharedServices } from '../module';
 export declare class LangiumDocuments extends DefaultLangiumDocuments {
     protected services: LikeC4SharedServices;
+    protected compare: any;
     constructor(services: LikeC4SharedServices);
+    addDocument(document: LangiumDocument): void;
     /**
      * Returns all user documents, excluding built-in documents.
      */

package/dist/workspace/LangiumDocuments.js

@@ -1,12 +1,27 @@
+import { compareNaturalHierarchically } from "@likec4/core/utils";
 import { DefaultLangiumDocuments } from "langium";
 import { groupBy, prop } from "remeda";
 import { isLikeC4LangiumDocument } from "../ast.js";
 import { isLikeC4Builtin } from "../likec4lib.js";
+const compare = compareNaturalHierarchically("/", true);
+const ensureOrder = (a, b) => compare(a.uri.path, b.uri.path);
 export class LangiumDocuments extends DefaultLangiumDocuments {
   constructor(services) {
     super(services);
     this.services = services;
   }
+  compare = compareNaturalHierarchically("/", true);
+  addDocument(document) {
+    const uriString = document.uri.toString();
+    if (this.documentMap.has(uriString)) {
+      throw new Error(`A document with the URI '${uriString}' is already present.`);
+    }
+    const docs = [...this.documentMap.values(), document].sort(ensureOrder);
+    this.documentMap.clear();
+    for (const doc of docs) {
+      this.documentMap.set(doc.uri.toString(), doc);
+    }
+  }
   /**
    * Returns all user documents, excluding built-in documents.
    */

package/dist/workspace/ProjectsManager.d.ts

@@ -1,35 +1,35 @@
+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.
+ * A tagged string that represents a project folder URI
  * Always has trailing slash.
  */
 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'>>;
 }