@likec4/language-server 1.46.3 → 1.47.0

package/dist/filesystem/ChokidarWatcher.d.ts

@@ -13,4 +13,7 @@ export declare class ChokidarFileSystemWatcher implements FileSystemWatcher {
     dispose(): Promise<void>;
     private createWatcher;
     private enqueueFileOp;
+    private onAddOrChange;
+    private onRemove;
+    private onRemoveDir;
 }

package/dist/filesystem/ChokidarWatcher.js

@@ -1,5 +1,4 @@
 import { isLikeC4Config } from '@likec4/config/node';
-import { loggable } from '@likec4/log';
 import chokidar from 'chokidar';
 import { URI } from 'langium';
 import PQueue from 'p-queue';
@@ -23,12 +22,11 @@ export class ChokidarFileSystemWatcher {
     }
     watch(folder) {
         if (this.watcher) {
+            logger.debug `add watching folder: ${folder}`;
             this.watcher.add(folder);
+            return;
         }
-        else {
-            this.watcher = this.createWatcher(folder);
-        }
-        logger.debug `watching folder: ${folder}`;
+        this.watcher = this.createWatcher(folder);
     }
     async dispose() {
         if (this.watcher) {
@@ -39,6 +37,7 @@ export class ChokidarFileSystemWatcher {
         return;
     }
     createWatcher(folder) {
+        logger.debug `create watcher for folder: ${folder}`;
         let watcher = chokidar.watch(folder, {
             ignored: [
                 path => path.includes('node_modules') || path.includes('.git'),
@@ -47,50 +46,30 @@ export class ChokidarFileSystemWatcher {
             followSymlinks: true,
             ignoreInitial: true,
         });
-        const onAddOrChange = (path) => {
+        const onAddOrChange = (path, stats) => {
+            if (stats?.isDirectory()) {
+                return;
+            }
             this.enqueueFileOp('addOrChange: ' + path, async () => {
-                if (isLikeC4Config(path)) {
-                    logger.debug `project file changed: ${path}`;
-                    await this.services.workspace.ProjectsManager.reloadProjects();
-                }
-                else if (isLikeC4File(path)) {
-                    logger.debug `file changed: ${path}`;
-                    await this.services.workspace.DocumentBuilder.update([URI.file(path)], []);
-                }
-                else if (isManualLayoutFile(path)) {
-                    logger.debug `manual layout file changed: ${path}`;
-                    const projectId = this.services.workspace.ProjectsManager.belongsTo(URI.file(path));
-                    await this.services.workspace.ProjectsManager.rebuidProject(projectId);
-                }
-                else {
-                    logger.warn `Unknown file change: ${path}`;
-                }
+                await this.onAddOrChange(path);
             });
         };
-        const onRemove = (path) => {
+        const onRemove = (path, stats) => {
+            if (stats?.isDirectory()) {
+                return;
+            }
             this.enqueueFileOp('remove: ' + path, async () => {
-                const pm = this.services.workspace.ProjectsManager;
-                if (isLikeC4Config(path)) {
-                    logger.debug `project file removed: ${path}`;
-                    await pm.reloadProjects();
-                }
-                else if (isLikeC4File(path)) {
-                    logger.debug `file removed: ${path}`;
-                    await this.services.workspace.DocumentBuilder.update([], [URI.file(path)]);
-                }
-                else if (isManualLayoutFile(path)) {
-                    logger.debug `manual layout file removed: ${path}`;
-                    const project = pm.belongsTo(path);
-                    await pm.rebuidProject(project);
-                }
-                else {
-                    logger.warn `Unknown file removal: ${path}`;
-                }
+                await this.onRemove(path);
             });
         };
         watcher.on('add', onAddOrChange)
             .on('change', onAddOrChange)
-            .on('unlink', onRemove);
+            .on('unlink', onRemove)
+            .on('unlinkDir', (path) => {
+            this.enqueueFileOp('removeDir: ' + path, async () => {
+                await this.onRemoveDir(path);
+            });
+        });
         return watcher;
     }
     enqueueFileOp(fileop, fn) {
@@ -102,7 +81,53 @@ export class ChokidarFileSystemWatcher {
                 logger.warn(`Failed on ${fileop}`, { error });
             }
         }).catch(error => {
-            logger.error(loggable(error));
+            logger.error(`Error on ${fileop}`, { error });
         });
     }
+    async onAddOrChange(path) {
+        const pm = this.services.workspace.ProjectsManager;
+        if (isLikeC4Config(path)) {
+            logger.debug `project file changed: ${path}`;
+            await pm.registerConfigFile(URI.file(path));
+        }
+        else if (isLikeC4File(path)) {
+            logger.debug `file changed: ${path}`;
+            await this.services.workspace.DocumentBuilder.update([URI.file(path)], []);
+        }
+        else if (isManualLayoutFile(path)) {
+            logger.debug `manual layout file changed: ${path}`;
+            const projectId = pm.belongsTo(URI.file(path));
+            await pm.rebuidProject(projectId);
+        }
+        else {
+            logger.warn `Unknown file change: ${path}`;
+        }
+    }
+    async onRemove(path) {
+        const pm = this.services.workspace.ProjectsManager;
+        if (isLikeC4Config(path)) {
+            logger.debug `project file removed: ${path}`;
+            await pm.reloadProjects();
+        }
+        else if (isLikeC4File(path)) {
+            logger.debug `file removed: ${path}`;
+            await this.services.workspace.DocumentBuilder.update([], [URI.file(path)]);
+        }
+        else if (isManualLayoutFile(path)) {
+            logger.debug `manual layout file removed: ${path}`;
+            const project = pm.belongsTo(path);
+            await pm.rebuidProject(project);
+        }
+        else {
+            logger.warn `Unknown file removal: ${path}`;
+        }
+    }
+    async onRemoveDir(path) {
+        logger.debug `directory removed: ${path}`;
+        const pm = this.services.workspace.ProjectsManager;
+        const projects = pm.findAllProjectsByFolder(path);
+        if (projects.length > 0) {
+            await pm.reloadProjects();
+        }
+    }
 }

package/dist/filesystem/LikeC4FileSystem.d.ts

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

package/dist/filesystem/LikeC4FileSystem.js

@@ -1,4 +1,5 @@
 import { isLikeC4Config, loadConfig } from '@likec4/config/node';
+import { compareNaturalHierarchically } from '@likec4/core/utils';
 import { fdir } from 'fdir';
 import { URI } from 'langium';
 import { NodeFileSystemProvider } from 'langium/node';
@@ -15,7 +16,14 @@ export const LikeC4FileSystem = (ehableWatcher = true) => ({
     fileSystemProvider: () => new SymLinkTraversingFileSystemProvider(),
     ...ehableWatcher ? chokidarFileSystemWatcher : noopFileSystemWatcher,
 });
-export const isLikeC4File = (path) => LikeC4LanguageMetaData.fileExtensions.some((ext) => path.endsWith(ext));
+export const isLikeC4File = (path, isDirectory = false) => !isDirectory && LikeC4LanguageMetaData.fileExtensions.some((ext) => path.endsWith(ext));
+const isLikeC4ConfigFile = (path, isDirectory) => !isDirectory && isLikeC4Config(path);
+const excludeNodeModules = (dirName) => ['node_modules', '.git', '.svn', '.yarn', '.pnpm'].includes(dirName);
+/**
+ * Compare function for document paths to ensure consistent order
+ */
+const compare = compareNaturalHierarchically('/');
+const ensureOrder = (a, b) => compare(a.uri.path, b.uri.path);
 /**
  * A file system provider that follows symbolic links.
  * @see https://github.com/likec4/likec4/pull/1213
@@ -40,8 +48,9 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
         try {
             let crawler = new fdir()
                 .withSymlinks({ resolvePaths: false })
-                .withFullPaths()
-                .filter(isLikeC4File);
+                .exclude(excludeNodeModules)
+                .filter(isLikeC4File)
+                .withFullPaths();
             if (!recursive) {
                 crawler = crawler.withMaxDepth(1);
             }
@@ -62,10 +71,10 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
         catch (error) {
             logger.warn(`Failed to read directory ${folderPath.fsPath}`, { error });
         }
-        return entries;
+        return entries.sort(ensureOrder);
     }
     async scanProjectFiles(folderUri) {
-        return await this.scanDirectory(folderUri, isLikeC4Config);
+        return await this.scanDirectory(folderUri, isLikeC4ConfigFile);
     }
     async scanDirectory(directory, filter) {
         const entries = [];
@@ -74,6 +83,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
                 .withSymlinks({ resolvePaths: false })
                 .withFullPaths()
                 .filter(filter)
+                .exclude(excludeNodeModules)
                 .crawl(directory.fsPath)
                 .withPromise();
             for (const path of crawled) {
@@ -87,7 +97,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
         catch (error) {
             logger.warn(`Failed to scan directory ${directory.fsPath}`, { error });
         }
-        return entries;
+        return entries.sort(ensureOrder);
     }
     async loadProjectConfig(filepath) {
         return await loadConfig(filepath);

package/dist/generated/ast.d.ts

@@ -29,7 +29,7 @@ export declare const LikeC4Terminals: {
     Hex: RegExp;
 };
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
-export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "[" | "]" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diagram" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "max" | "md" | "medium" | "metadata" | "min" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rank" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "same" | "secondary" | "sequence" | "shape" | "sink" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "summary" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "variant" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
+export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "[" | "]" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "bucket" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diagram" | "diamond" | "document" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "max" | "md" | "medium" | "metadata" | "min" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rank" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "same" | "secondary" | "sequence" | "shape" | "sink" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "summary" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "variant" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
 export type LikeC4TokenNames = LikeC4TerminalNames | LikeC4KeywordNames;
 export type AnyProperty = DynamicViewProperty | ElementProperty | RelationProperty | StringProperty | ViewProperty;
 export declare const AnyProperty = "AnyProperty";
@@ -66,7 +66,7 @@ export declare function isDynamicViewStep(item: unknown): item is DynamicViewSte
 export type ElementProperty = ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataProperty;
 export declare const ElementProperty = "ElementProperty";
 export declare function isElementProperty(item: unknown): item is ElementProperty;
-export type ElementShape = 'browser' | 'cylinder' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
+export type ElementShape = 'browser' | 'bucket' | 'cylinder' | 'document' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
 export declare function isElementShape(item: unknown): item is ElementShape;
 export type ExpressionV2 = FqnExprOrWith | RelationExprOrWith;
 export declare const ExpressionV2 = "ExpressionV2";

package/dist/generated/ast.js

@@ -10,7 +10,7 @@ export const LikeC4Terminals = {
     WS: /[\t ]+/,
     NL: /[\r\n]+/,
     BOOLEAN: /\b(true|false)\b/,
-    LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
+    LIB_ICON: /(aws|azure|bootstrap|gcp|tech):[-\w]*/,
     URI_WITH_SCHEMA: /\w+:\/{2}\S+/,
     URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
     URI_ALIAS: /@[a-zA-Z0-9_-]*\/[^\s]+/,
@@ -78,7 +78,7 @@ export function isElementProperty(item) {
     return reflection.isInstance(item, ElementProperty);
 }
 export function isElementShape(item) {
-    return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue';
+    return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue' || item === 'bucket' || item === 'document';
 }
 export const ExpressionV2 = 'ExpressionV2';
 export function isExpressionV2(item) {
@@ -109,7 +109,7 @@ export function isFqnReferenceable(item) {
     return reflection.isInstance(item, FqnReferenceable);
 }
 export function isIconId(item) {
-    return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
+    return (typeof item === 'string' && (/(aws|azure|bootstrap|gcp|tech):[-\w]*/.test(item)));
 }
 export function isId(item) {
     return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || isDynamicViewDisplayVariantValue(item) || item === 'element' || item === 'model' || item === 'group' || item === 'node' || item === 'deployment' || item === 'instance' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));