@likec4/language-server 1.42.0 → 1.43.0

package/dist/filesystem/LikeC4FileSystem.mjs

@@ -4,9 +4,10 @@ import { URI } from "langium";
 import { NodeFileSystemProvider } from "langium/node";
 import { LikeC4LanguageMetaData } from "../generated/module.mjs";
 import { Content, isLikeC4Builtin } from "../likec4lib.mjs";
-import { logError } from "../logger.mjs";
+import { logger as rootLogger } from "../logger.mjs";
 import { chokidarFileSystemWatcher } from "./ChokidarWatcher.mjs";
 import { noopFileSystemWatcher } from "./FileSystemWatcher.mjs";
+const logger = rootLogger.getChild("filesystem");
 export const LikeC4FileSystem = (ehableWatcher = true) => ({
   fileSystemProvider: () => new SymLinkTraversingFileSystemProvider(),
   ...ehableWatcher ? chokidarFileSystemWatcher : noopFileSystemWatcher
@@ -18,7 +19,12 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
     if (isLikeC4Builtin(uri)) {
       return Promise.resolve(Content);
     }
-    return await super.readFile(uri);
+    try {
+      return await super.readFile(uri);
+    } catch (error) {
+      logger.error(`Failed to read file ${uri.fsPath}`, { error });
+      return "";
+    }
   }
   async readDirectory(folderPath) {
     const entries = [];
@@ -32,7 +38,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
         });
       }
     } catch (error) {
-      logError(error);
+      logger.error(`Failed to read directory ${folderPath.fsPath}`, { error });
     }
     return entries;
   }
@@ -48,7 +54,7 @@ class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
         });
       }
     } catch (error) {
-      logError(error);
+      logger.error(`Failed to scan project files ${folderUri.fsPath}`, { error });
     }
     return entries;
   }

package/dist/generated/ast.d.ts

@@ -29,8 +29,11 @@ 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" | "md" | "medium" | "metadata" | "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" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "secondary" | "sequence" | "shape" | "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" | "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" | "md" | "medium" | "metadata" | "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" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "secondary" | "sequence" | "shape" | "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";
+export declare function isAnyProperty(item: unknown): item is AnyProperty;
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 export declare function isArrowType(item: unknown): item is ArrowType;
 export type BorderStyleValue = 'none' | LineOptions;
@@ -95,6 +98,9 @@ export declare function isLineOptions(item: unknown): item is LineOptions;
 export type MetadataProperty = MetadataBody;
 export declare const MetadataProperty = "MetadataProperty";
 export declare function isMetadataProperty(item: unknown): item is MetadataProperty;
+export type MetadataValue = MarkdownOrString | MetadataArray;
+export declare const MetadataValue = "MetadataValue";
+export declare function isMetadataValue(item: unknown): item is MetadataValue;
 export type ModelReferenceable = Element | Imported;
 export declare const ModelReferenceable = "ModelReferenceable";
 export declare function isModelReferenceable(item: unknown): item is ModelReferenceable;
@@ -699,18 +705,25 @@ export interface LinkProperty extends langium.AstNode {
 export declare const LinkProperty = "LinkProperty";
 export declare function isLinkProperty(item: unknown): item is LinkProperty;
 export interface MarkdownOrString extends langium.AstNode {
-    readonly $container: ElementStringProperty | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
+    readonly $container: ElementStringProperty | MetadataArray | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
     readonly $type: 'MarkdownOrString';
     markdown?: string;
     text?: string;
 }
 export declare const MarkdownOrString = "MarkdownOrString";
 export declare function isMarkdownOrString(item: unknown): item is MarkdownOrString;
+export interface MetadataArray extends langium.AstNode {
+    readonly $container: MetadataAttribute;
+    readonly $type: 'MetadataArray';
+    values: Array<MarkdownOrString>;
+}
+export declare const MetadataArray = "MetadataArray";
+export declare function isMetadataArray(item: unknown): item is MetadataArray;
 export interface MetadataAttribute extends langium.AstNode {
     readonly $container: MetadataBody;
     readonly $type: 'MetadataAttribute';
     key: string;
-    value: MarkdownOrString;
+    value: MetadataValue;
 }
 export declare const MetadataAttribute = "MetadataAttribute";
 export declare function isMetadataAttribute(item: unknown): item is MetadataAttribute;
@@ -1190,6 +1203,7 @@ export declare const DynamicStepSingle = "DynamicStepSingle";
 export declare function isDynamicStepSingle(item: unknown): item is DynamicStepSingle;
 export type LikeC4AstType = {
     AbstractDynamicStep: AbstractDynamicStep;
+    AnyProperty: AnyProperty;
     ArrowProperty: ArrowProperty;
     BorderProperty: BorderProperty;
     ColorLiteral: ColorLiteral;
@@ -1271,9 +1285,11 @@ export type LikeC4AstType = {
     LineProperty: LineProperty;
     LinkProperty: LinkProperty;
     MarkdownOrString: MarkdownOrString;
+    MetadataArray: MetadataArray;
     MetadataAttribute: MetadataAttribute;
     MetadataBody: MetadataBody;
     MetadataProperty: MetadataProperty;
+    MetadataValue: MetadataValue;
     Model: Model;
     ModelDeployments: ModelDeployments;
     ModelReferenceable: ModelReferenceable;

package/dist/generated/ast.mjs

@@ -24,6 +24,10 @@ export const LikeC4Terminals = {
   IdTerminal: /[_]*[a-zA-Z][-\w]*/,
   Hex: /[a-fA-F0-9]{3,}(?![-_g-zG-Z])/
 };
+export const AnyProperty = "AnyProperty";
+export function isAnyProperty(item) {
+  return reflection.isInstance(item, AnyProperty);
+}
 export function isArrowType(item) {
   return item === "none" || item === "normal" || item === "onormal" || item === "dot" || item === "odot" || item === "diamond" || item === "odiamond" || item === "crow" || item === "open" || item === "vee";
 }
@@ -112,6 +116,10 @@ export const MetadataProperty = "MetadataProperty";
 export function isMetadataProperty(item) {
   return reflection.isInstance(item, MetadataProperty);
 }
+export const MetadataValue = "MetadataValue";
+export function isMetadataValue(item) {
+  return reflection.isInstance(item, MetadataValue);
+}
 export const ModelReferenceable = "ModelReferenceable";
 export function isModelReferenceable(item) {
   return reflection.isInstance(item, ModelReferenceable);
@@ -467,6 +475,10 @@ export const MarkdownOrString = "MarkdownOrString";
 export function isMarkdownOrString(item) {
   return reflection.isInstance(item, MarkdownOrString);
 }
+export const MetadataArray = "MetadataArray";
+export function isMetadataArray(item) {
+  return reflection.isInstance(item, MetadataArray);
+}
 export const MetadataAttribute = "MetadataAttribute";
 export function isMetadataAttribute(item) {
   return reflection.isInstance(item, MetadataAttribute);
@@ -701,7 +713,7 @@ export function isDynamicStepSingle(item) {
 }
 export class LikeC4AstReflection extends langium.AbstractAstReflection {
   getAllTypes() {
-    return [AbstractDynamicStep, ArrowProperty, BorderProperty, ColorLiteral, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicStepChain, DynamicStepSingle, DynamicView, DynamicViewBody, DynamicViewDisplayVariantProperty, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewProperty, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, HexColor, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MarkdownOrString, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, RGBAColor, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationKindDotRef, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, TagRef, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
+    return [AbstractDynamicStep, AnyProperty, ArrowProperty, BorderProperty, ColorLiteral, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicStepChain, DynamicStepSingle, DynamicView, DynamicViewBody, DynamicViewDisplayVariantProperty, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewProperty, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, HexColor, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MarkdownOrString, MetadataArray, MetadataAttribute, MetadataBody, MetadataProperty, MetadataValue, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, RGBAColor, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationKindDotRef, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, TagRef, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -745,14 +757,19 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case DynamicStepSingle: {
         return this.isSubtype(AbstractDynamicStep, supertype) || this.isSubtype(DynamicViewStep, supertype);
       }
-      case DynamicViewDisplayVariantProperty:
-      case ViewProperty: {
+      case DynamicViewDisplayVariantProperty: {
         return this.isSubtype(DynamicViewProperty, supertype);
       }
       case DynamicViewGlobalPredicateRef:
       case DynamicViewIncludePredicate: {
         return this.isSubtype(DynamicViewRule, supertype);
       }
+      case DynamicViewProperty:
+      case ElementProperty:
+      case RelationProperty:
+      case StringProperty: {
+        return this.isSubtype(AnyProperty, supertype);
+      }
       case Element: {
         return this.isSubtype(FqnReferenceable, supertype) || this.isSubtype(ModelReferenceable, supertype) || this.isSubtype(Referenceable, supertype);
       }
@@ -798,6 +815,10 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case LinkProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(ExtendElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
       }
+      case MarkdownOrString:
+      case MetadataArray: {
+        return this.isSubtype(MetadataValue, supertype);
+      }
       case MetadataAttribute:
       case NotationProperty:
       case NotesProperty:
@@ -831,6 +852,9 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case RelationStringProperty: {
         return this.isSubtype(RelationProperty, supertype) || this.isSubtype(StringProperty, supertype);
       }
+      case ViewProperty: {
+        return this.isSubtype(AnyProperty, supertype) || this.isSubtype(DynamicViewProperty, supertype);
+      }
       case ViewRuleAutoLayout: {
         return this.isSubtype(DeploymentViewRule, supertype) || this.isSubtype(DynamicViewRule, supertype) || this.isSubtype(ViewRule, supertype);
       }
@@ -1556,6 +1580,14 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case MetadataArray: {
+        return {
+          name: MetadataArray,
+          properties: [
+            { name: "values", defaultValue: [] }
+          ]
+        };
+      }
       case MetadataAttribute: {
         return {
           name: MetadataAttribute,