@likec4/language-server 1.9.0 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/contrib/likec4.tmLanguage.json +1 -1
  2. package/dist/browser.cjs +1 -1
  3. package/dist/browser.d.cts +3 -4
  4. package/dist/browser.d.mts +3 -4
  5. package/dist/browser.d.ts +3 -4
  6. package/dist/browser.mjs +1 -1
  7. package/dist/index.cjs +1 -1
  8. package/dist/index.d.cts +2 -2
  9. package/dist/index.d.mts +2 -2
  10. package/dist/index.d.ts +2 -2
  11. package/dist/index.mjs +1 -1
  12. package/dist/model-graph/index.cjs +1 -1
  13. package/dist/model-graph/index.mjs +1 -1
  14. package/dist/node.cjs +1 -1
  15. package/dist/node.d.cts +3 -4
  16. package/dist/node.d.mts +3 -4
  17. package/dist/node.d.ts +3 -4
  18. package/dist/node.mjs +1 -1
  19. package/dist/shared/{language-server.Q-wtPShM.mjs → language-server.BFBeyvV8.mjs} +486 -108
  20. package/dist/shared/{language-server.86lmJ8ZN.d.cts → language-server.BGy3FJPJ.d.cts} +43 -14
  21. package/dist/shared/{language-server.B1TZgyoH.cjs → language-server.Bfc-5M8A.cjs} +482 -104
  22. package/dist/shared/{language-server.CCB4ESN5.mjs → language-server.CbqwHp7Q.mjs} +184 -120
  23. package/dist/shared/{language-server.RjhrBZS0.d.ts → language-server.CnVuAxDh.d.ts} +43 -14
  24. package/dist/shared/{language-server.CFTY6j4e.d.mts → language-server.DEK39RmI.d.mts} +43 -14
  25. package/dist/shared/{language-server.D0bOlrCi.cjs → language-server.DJhoJBWh.cjs} +180 -116
  26. package/package.json +13 -11
  27. package/src/ast.ts +8 -6
  28. package/src/formatting/LikeC4Formatter.ts +390 -0
  29. package/src/formatting/utils.ts +26 -0
  30. package/src/generated/ast.ts +203 -11
  31. package/src/generated/grammar.ts +2 -2
  32. package/src/generated/module.ts +1 -1
  33. package/src/like-c4.langium +34 -7
  34. package/src/lsp/CompletionProvider.ts +1 -1
  35. package/src/lsp/DocumentLinkProvider.ts +27 -15
  36. package/src/lsp/SemanticTokenProvider.ts +1 -1
  37. package/src/lsp/index.ts +1 -1
  38. package/src/model/fqn-index.ts +0 -1
  39. package/src/model/model-builder.ts +43 -32
  40. package/src/model/model-parser.ts +43 -21
  41. package/src/model-graph/compute-view/compute.ts +111 -80
  42. package/src/model-graph/compute-view/predicates.ts +3 -5
  43. package/src/model-graph/dynamic-view/compute.ts +96 -60
  44. package/src/model-graph/utils/buildElementNotations.ts +1 -1
  45. package/src/model-graph/utils/uniqueTags.test.ts +42 -0
  46. package/src/model-graph/utils/uniqueTags.ts +19 -0
  47. package/src/module.ts +6 -9
  48. package/src/test/testServices.ts +27 -7
  49. package/src/validation/index.ts +2 -1
  50. package/src/validation/property-checks.ts +13 -1
  51. package/src/validation/specification.ts +3 -3
  52. package/src/view-utils/resolve-relative-paths.ts +14 -17
@@ -3,13 +3,13 @@ import { Fqn, ViewID } from '@likec4/core';
3
3
  import { AstNode, Reference, LangiumDocument, MultiMap, AstNodeDescription, DiagnosticInfo, ReferenceDescription, MaybePromise, DefaultScopeComputation, PrecomputedScopes, DefaultScopeProvider, ReferenceInfo, Scope, Disposable, DefaultWorkspaceManager, WorkspaceCache, Module, LangiumDocuments, Stream, Cancellation, URI as URI$1 } from 'langium';
4
4
  import { SetRequired, ValueOf, ConditionalPick } from 'type-fest';
5
5
  import { Diagnostic, DocumentSymbol, SymbolKind, Hover, Location, Range, TextEdit, CompletionItemKind } from 'vscode-languageserver-types';
6
- import { CodeLensProvider, DefaultCompletionProvider, DefaultDocumentHighlightProvider, DocumentLinkProvider, DocumentSymbolProvider, NodeKindProvider as NodeKindProvider$1, AstNodeHoverProvider, DefaultRenameProvider, AbstractSemanticTokenProvider, SemanticTokenAcceptor, LangiumSharedServices, DefaultWorkspaceSymbolProvider, LangiumServices, PartialLangiumServices, DefaultSharedModuleContext } from 'langium/lsp';
6
+ import { CodeLensProvider, DefaultCompletionProvider, DefaultDocumentHighlightProvider, DocumentLinkProvider, DocumentSymbolProvider, NodeKindProvider as NodeKindProvider$1, AstNodeHoverProvider, AbstractSemanticTokenProvider, SemanticTokenAcceptor, LangiumSharedServices, DefaultWorkspaceSymbolProvider, LangiumServices, PartialLangiumServices, DefaultSharedModuleContext } from 'langium/lsp';
7
7
  import { CodeLensParams, CancellationToken, CodeLens, DocumentHighlight, DocumentLinkParams, DocumentLink, WorkspaceFolder } from 'vscode-languageserver';
8
8
  import { ChangeViewRequestParams } from '../protocol.cjs';
9
9
  import { URI } from 'vscode-uri';
10
10
 
11
11
  /******************************************************************************
12
- * This file was generated by langium-cli 3.1.1.
12
+ * This file was generated by langium-cli 3.2.0.
13
13
  * DO NOT EDIT MANUALLY!
14
14
  ******************************************************************************/
15
15
 
@@ -48,12 +48,12 @@ type RelationPredicate = RelationPredicateOrWhere | RelationPredicateWith;
48
48
  declare const RelationPredicate = "RelationPredicate";
49
49
  type RelationPredicateOrWhere = RelationExpression | RelationPredicateWhere;
50
50
  declare const RelationPredicateOrWhere = "RelationPredicateOrWhere";
51
- type RelationProperty = LinkProperty | MetadataProperty | RelationStringProperty | RelationStyleProperty;
51
+ type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
52
52
  declare const RelationProperty = "RelationProperty";
53
53
  declare function isRelationProperty(item: unknown): item is RelationProperty;
54
54
  type RelationshipStyleProperty = ArrowProperty | ColorProperty | LineProperty;
55
55
  declare const RelationshipStyleProperty = "RelationshipStyleProperty";
56
- type StringProperty = ElementStringProperty | MetadataAttribute | NotationProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
56
+ type StringProperty = ElementStringProperty | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
57
57
  declare const StringProperty = "StringProperty";
58
58
  type StyleProperty = BorderProperty | ColorProperty | IconProperty | OpacityProperty | ShapeProperty;
59
59
  declare const StyleProperty = "StyleProperty";
@@ -120,7 +120,7 @@ declare const CustomElementProperties = "CustomElementProperties";
120
120
  interface CustomRelationProperties extends AstNode {
121
121
  readonly $container: DynamicViewStep | RelationPredicateWith;
122
122
  readonly $type: 'CustomRelationProperties';
123
- props: Array<NotationProperty | RelationStringProperty | RelationshipStyleProperty>;
123
+ props: Array<NotationProperty | NotesProperty | RelationNavigateToProperty | RelationStringProperty | RelationshipStyleProperty>;
124
124
  }
125
125
  declare const CustomRelationProperties = "CustomRelationProperties";
126
126
  interface DirectedRelationExpression extends AstNode {
@@ -142,7 +142,7 @@ interface DynamicViewBody extends AstNode {
142
142
  readonly $type: 'DynamicViewBody';
143
143
  props: Array<ViewProperty>;
144
144
  rules: Array<DynamicViewRule>;
145
- steps: Array<DynamicViewStep>;
145
+ steps: Array<DynamicViewParallelSteps | DynamicViewStep>;
146
146
  tags?: Tags;
147
147
  }
148
148
  declare const DynamicViewBody = "DynamicViewBody";
@@ -153,6 +153,13 @@ interface DynamicViewIncludePredicate extends AstNode {
153
153
  predicates: DynamicViewPredicateIterator;
154
154
  }
155
155
  declare const DynamicViewIncludePredicate = "DynamicViewIncludePredicate";
156
+ interface DynamicViewParallelSteps extends AstNode {
157
+ readonly $container: DynamicViewBody;
158
+ readonly $type: 'DynamicViewParallelSteps';
159
+ steps: Array<DynamicViewStep>;
160
+ }
161
+ declare const DynamicViewParallelSteps = "DynamicViewParallelSteps";
162
+ declare function isDynamicViewParallelSteps(item: unknown): item is DynamicViewParallelSteps;
156
163
  interface DynamicViewPredicateIterator extends AstNode {
157
164
  readonly $container: DynamicViewIncludePredicate | DynamicViewPredicateIterator;
158
165
  readonly $type: 'DynamicViewPredicateIterator';
@@ -161,8 +168,14 @@ interface DynamicViewPredicateIterator extends AstNode {
161
168
  }
162
169
  declare const DynamicViewPredicateIterator = "DynamicViewPredicateIterator";
163
170
  declare function isDynamicViewPredicateIterator(item: unknown): item is DynamicViewPredicateIterator;
171
+ interface DynamicViewRef extends AstNode {
172
+ readonly $container: RelationNavigateToProperty;
173
+ readonly $type: 'DynamicViewRef';
174
+ view: Reference<DynamicView>;
175
+ }
176
+ declare const DynamicViewRef = "DynamicViewRef";
164
177
  interface DynamicViewStep extends AstNode {
165
- readonly $container: DynamicViewBody;
178
+ readonly $container: DynamicViewBody | DynamicViewParallelSteps;
166
179
  readonly $type: 'DynamicViewStep';
167
180
  custom?: CustomRelationProperties;
168
181
  isBackward: boolean;
@@ -423,6 +436,13 @@ interface NotationProperty extends AstNode {
423
436
  value: string;
424
437
  }
425
438
  declare const NotationProperty = "NotationProperty";
439
+ interface NotesProperty extends AstNode {
440
+ readonly $container: CustomRelationProperties;
441
+ readonly $type: 'NotesProperty';
442
+ key: 'notes';
443
+ value: string;
444
+ }
445
+ declare const NotesProperty = "NotesProperty";
426
446
  interface OpacityProperty extends AstNode {
427
447
  readonly $container: CustomElementProperties | ElementStyleProperty | ViewRuleStyle;
428
448
  readonly $type: 'OpacityProperty';
@@ -466,6 +486,13 @@ interface RelationBody extends AstNode {
466
486
  }
467
487
  declare const RelationBody = "RelationBody";
468
488
  declare function isRelationBody(item: unknown): item is RelationBody;
489
+ interface RelationNavigateToProperty extends AstNode {
490
+ readonly $container: CustomRelationProperties | RelationBody;
491
+ readonly $type: 'RelationNavigateToProperty';
492
+ key: 'navigateTo';
493
+ value: DynamicViewRef;
494
+ }
495
+ declare const RelationNavigateToProperty = "RelationNavigateToProperty";
469
496
  interface RelationPredicateWhere extends AstNode {
470
497
  readonly $container: Predicates | RelationPredicateWith;
471
498
  readonly $type: 'RelationPredicateWhere';
@@ -673,7 +700,9 @@ type LikeC4AstType = {
673
700
  DynamicView: DynamicView;
674
701
  DynamicViewBody: DynamicViewBody;
675
702
  DynamicViewIncludePredicate: DynamicViewIncludePredicate;
703
+ DynamicViewParallelSteps: DynamicViewParallelSteps;
676
704
  DynamicViewPredicateIterator: DynamicViewPredicateIterator;
705
+ DynamicViewRef: DynamicViewRef;
677
706
  DynamicViewRule: DynamicViewRule;
678
707
  DynamicViewStep: DynamicViewStep;
679
708
  Element: Element;
@@ -717,6 +746,7 @@ type LikeC4AstType = {
717
746
  ModelViews: ModelViews;
718
747
  NavigateToProperty: NavigateToProperty;
719
748
  NotationProperty: NotationProperty;
749
+ NotesProperty: NotesProperty;
720
750
  OpacityProperty: OpacityProperty;
721
751
  OutgoingRelationExpression: OutgoingRelationExpression;
722
752
  Predicate: Predicate;
@@ -724,6 +754,7 @@ type LikeC4AstType = {
724
754
  Relation: Relation;
725
755
  RelationBody: RelationBody;
726
756
  RelationExpression: RelationExpression;
757
+ RelationNavigateToProperty: RelationNavigateToProperty;
727
758
  RelationPredicate: RelationPredicate;
728
759
  RelationPredicateOrWhere: RelationPredicateOrWhere;
729
760
  RelationPredicateWhere: RelationPredicateWhere;
@@ -836,6 +867,7 @@ interface ParsedAstRelation {
836
867
  head?: c4.RelationshipArrowType;
837
868
  tail?: c4.RelationshipArrowType;
838
869
  links?: c4.NonEmptyArray<ParsedLink>;
870
+ navigateTo?: c4.ViewID;
839
871
  metadata?: {
840
872
  [key: string]: string;
841
873
  };
@@ -861,7 +893,7 @@ interface ParsedAstDynamicView {
861
893
  description: string | null;
862
894
  tags: c4.NonEmptyArray<c4.Tag> | null;
863
895
  links: c4.NonEmptyArray<ParsedLink> | null;
864
- steps: c4.DynamicViewStep[];
896
+ steps: c4.DynamicViewStepOrParallel[];
865
897
  rules: Array<c4.DynamicViewRule>;
866
898
  manualLayout?: c4.ViewManualLayout;
867
899
  }
@@ -891,7 +923,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
891
923
  }
892
924
  type Guard<N extends AstNode> = (n: AstNode) => n is N;
893
925
  type Guarded<G> = G extends Guard<infer N> ? N : never;
894
- declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
926
+ declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
895
927
  type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
896
928
  declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
897
929
  isValid: (n: ValidatableAstNode) => boolean;
@@ -923,6 +955,7 @@ declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
923
955
  constructor(services: LikeC4Services);
924
956
  getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams): MaybePromise<DocumentLink[]>;
925
957
  resolveLink(doc: LangiumDocument, link: string): string;
958
+ relativeLink(doc: LangiumDocument, link: string): string | null;
926
959
  }
927
960
 
928
961
  declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
@@ -950,10 +983,6 @@ declare class LikeC4HoverProvider extends AstNodeHoverProvider {
950
983
  protected getAstNodeHoverContent(node: AstNode): MaybePromise<Hover | undefined>;
951
984
  }
952
985
 
953
- declare class LikeC4RenameProvider extends DefaultRenameProvider {
954
- constructor(services: LikeC4Services);
955
- }
956
-
957
986
  declare class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
958
987
  protected highlightElement(node: AstNode, acceptor: SemanticTokenAcceptor): void | undefined | 'prune';
959
988
  private highlightAstElement;
@@ -1061,7 +1090,6 @@ interface LikeC4AddedServices {
1061
1090
  ModelChanges: LikeC4ModelChanges;
1062
1091
  };
1063
1092
  lsp: {
1064
- RenameProvider: LikeC4RenameProvider;
1065
1093
  CompletionProvider: LikeC4CompletionProvider;
1066
1094
  DocumentHighlightProvider: LikeC4DocumentHighlightProvider;
1067
1095
  DocumentSymbolProvider: LikeC4DocumentSymbolProvider;
@@ -1181,6 +1209,7 @@ declare class LikeC4ModelParser {
1181
1209
  private parseRelationExpr;
1182
1210
  private parseViewRule;
1183
1211
  private parseViewManualLaout;
1212
+ private parseDynamicParallelSteps;
1184
1213
  private parseDynamicStep;
1185
1214
  private parseElementView;
1186
1215
  private parseDynamicElementView;