@likec4/language-server 1.38.0 → 1.39.0

package/dist/filesystem/ChokidarWatcher.js

@@ -1,8 +1,9 @@
+import { isLikeC4Config } from "@likec4/config/node";
 import { loggable } from "@likec4/log";
 import chokidar from "chokidar";
 import { URI } from "langium";
 import { logger as mainLogger } from "../logger.js";
-import { isAnyLikeC4File, isLikeC4ProjectFile } from "./LikeC4FileSystem.js";
+import { isAnyLikeC4File } from "./LikeC4FileSystem.js";
 const logger = mainLogger.getChild("chokidar");
 export const chokidarFileSystemWatcher = {
   fileSystemWatcher: (services) => new ChokidarFileSystemWatcher(services)
@@ -18,7 +19,7 @@ export class ChokidarFileSystemWatcher {
     } else {
       this.watcher = this.createWatcher(folder);
     }
-    logger.debug(`watching folder: ${folder}`);
+    logger.debug`watching folder: ${folder}`;
   }
   async dispose() {
     if (this.watcher) {
@@ -29,16 +30,18 @@ export class ChokidarFileSystemWatcher {
   }
   createWatcher(folder) {
     let watcher = chokidar.watch(folder, {
-      ignored: (path, stats) => path.includes("node_modules") || !!stats && stats.isFile() && !isAnyLikeC4File(path),
+      ignored: (path, stats) => {
+        return path.includes("node_modules") || !!stats && stats.isFile() && !isAnyLikeC4File(path);
+      },
       ignoreInitial: true
     });
     const onAddOrChange = async (path) => {
       try {
-        if (isLikeC4ProjectFile(path)) {
-          logger.debug(`project file changed: ${path}`);
+        if (isLikeC4Config(path)) {
+          logger.debug`project file changed: ${path}`;
           await this.services.workspace.ProjectsManager.reloadProjects();
         } else {
-          logger.debug(`file changed: ${path}`);
+          logger.debug`file changed: ${path}`;
           await this.services.workspace.DocumentBuilder.update([URI.file(path)], []);
         }
       } catch (error) {
@@ -47,11 +50,11 @@ export class ChokidarFileSystemWatcher {
     };
     const onRemove = async (path) => {
       try {
-        if (isLikeC4ProjectFile(path)) {
-          logger.debug(`project file removed: ${path}`);
+        if (isLikeC4Config(path)) {
+          logger.debug`project file removed: ${path}`;
           await this.services.workspace.ProjectsManager.reloadProjects();
         } else {
-          logger.debug(`file removed: ${path}`);
+          logger.debug`file removed: ${path}`;
           await this.services.workspace.DocumentBuilder.update([], [URI.file(path)]);
         }
       } catch (error) {

package/dist/filesystem/LikeC4FileSystem.d.ts

@@ -1,5 +1,3 @@
 import type { FileSystemModuleContext } from './index';
 export declare const LikeC4FileSystem: (ehableWatcher?: boolean) => FileSystemModuleContext;
-export declare const isLikeC4ProjectFile: (path: string) => boolean;
-export declare const isLikeC4File: (path: string) => any;
 export declare const isAnyLikeC4File: (path: string) => any;

package/dist/filesystem/LikeC4FileSystem.js

@@ -1,19 +1,18 @@
+import { isLikeC4Config, loadConfig } from "@likec4/config/node";
 import { fdir } from "fdir";
 import { URI } from "langium";
 import { NodeFileSystemProvider } from "langium/node";
 import { LikeC4LanguageMetaData } from "../generated/module.js";
 import { Content, isLikeC4Builtin } from "../likec4lib.js";
 import { logError } from "../logger.js";
-import { ProjectsManager } from "../workspace/ProjectsManager.js";
 import { chokidarFileSystemWatcher } from "./ChokidarWatcher.js";
 import { noopFileSystemWatcher } from "./FileSystemWatcher.js";
 export const LikeC4FileSystem = (ehableWatcher = true) => ({
   fileSystemProvider: () => new SymLinkTraversingFileSystemProvider(),
   ...ehableWatcher ? chokidarFileSystemWatcher : noopFileSystemWatcher
 });
-export const isLikeC4ProjectFile = (path) => ProjectsManager.ConfigFileNames.some((ext) => path.endsWith(ext));
-export const isLikeC4File = (path) => LikeC4LanguageMetaData.fileExtensions.some((ext) => path.endsWith(ext));
-export const isAnyLikeC4File = (path) => isLikeC4File(path) || isLikeC4ProjectFile(path);
+const isLikeC4File = (path) => LikeC4LanguageMetaData.fileExtensions.some((ext) => path.endsWith(ext));
+export const isAnyLikeC4File = (path) => isLikeC4File(path) || isLikeC4Config(path);
 class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
   async readFile(uri) {
     if (isLikeC4Builtin(uri)) {
@@ -40,7 +39,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
   async scanProjectFiles(folderUri) {
     const entries = [];
     try {
-      const crawled = await new fdir().withSymlinks({ resolvePaths: false }).withFullPaths().filter(isLikeC4ProjectFile).crawl(folderUri.fsPath).withPromise();
+      const crawled = await new fdir().withSymlinks({ resolvePaths: false }).withFullPaths().filter(isLikeC4Config).crawl(folderUri.fsPath).withPromise();
       for (const path of crawled) {
         entries.push({
           isFile: true,
@@ -53,4 +52,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
     }
     return entries;
   }
+  async loadProjectConfig(filepath) {
+    return await loadConfig(filepath);
+  }
 }

package/dist/filesystem/index.d.ts

@@ -1,3 +1,4 @@
+import { type LikeC4ProjectConfig } from '@likec4/config';
 import type { FileSystemNode, FileSystemProvider as LangiumFileSystemProvider, LangiumSharedCoreServices } from 'langium';
 import { URI } from 'vscode-uri';
 import { type FileSystemWatcherModuleContext } from './FileSystemWatcher';
@@ -8,6 +9,11 @@ export interface FileSystemProvider extends LangiumFileSystemProvider {
      * @returns The list of file system entries that are contained within the specified directory.
      */
     scanProjectFiles(folderUri: URI): Promise<FileSystemNode[]>;
+    /**
+     * Loads the project config from the given file.
+     * @returns The project config.
+     */
+    loadProjectConfig(filepath: URI): Promise<LikeC4ProjectConfig>;
 }
 export interface FileSystemModuleContext extends FileSystemWatcherModuleContext {
     fileSystemProvider: (services: LangiumSharedCoreServices) => FileSystemProvider;
@@ -16,5 +22,6 @@ export declare class NoopFileSystemProvider implements FileSystemProvider {
     scanProjectFiles(): Promise<FileSystemNode[]>;
     readFile(): Promise<string>;
     readDirectory(): Promise<FileSystemNode[]>;
+    loadProjectConfig(): Promise<LikeC4ProjectConfig>;
 }
 export declare const NoopFileSystem: FileSystemModuleContext;

package/dist/filesystem/index.js

@@ -9,6 +9,9 @@ export class NoopFileSystemProvider {
   readDirectory() {
     return Promise.resolve([]);
   }
+  loadProjectConfig() {
+    throw new Error("No file system is available.");
+  }
 }
 export const NoopFileSystem = {
   fileSystemProvider: () => new NoopFileSystemProvider(),

package/dist/generated/ast.d.ts

@@ -12,6 +12,7 @@ export declare const LikeC4Terminals: {
     LIB_ICON: RegExp;
     URI_WITH_SCHEMA: RegExp;
     URI_RELATIVE: RegExp;
+    URI_ALIAS: RegExp;
     DotUnderscore: RegExp;
     DotWildcard: RegExp;
     Hash: RegExp;

package/dist/generated/ast.js

@@ -8,6 +8,7 @@ export const LikeC4Terminals = {
   LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
   URI_WITH_SCHEMA: /\w+:\/{2}\S+/,
   URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
+  URI_ALIAS: /@[a-zA-Z0-9_-]*\/[^\s]+/,
   DotUnderscore: /\b\._(?![_a-zA-Z])/,
   DotWildcard: /\b\.\*{1,2}/,
   Hash: /#/,
@@ -150,7 +151,7 @@ export function isThemeColor(item) {
   return item === "primary" || item === "secondary" || item === "muted" || item === "slate" || item === "blue" || item === "indigo" || item === "sky" || item === "red" || item === "gray" || item === "green" || item === "amber";
 }
 export function isUri(item) {
-  return typeof item === "string" && (/\w+:\/{2}\S+/.test(item) || /\.{0,2}\/[^\/]\S+/.test(item));
+  return typeof item === "string" && (/\w+:\/{2}\S+/.test(item) || /\.{0,2}\/[^\/]\S+/.test(item) || /@[a-zA-Z0-9_-]*\/[^\s]+/.test(item));
 }
 export function isViewLayoutDirection(item) {
   return item === "TopBottom" || item === "LeftRight" || item === "BottomTop" || item === "RightLeft";