@likec4/language-server 1.39.5 → 1.40.0

package/dist/lsp/CompletionProvider.mjs

@@ -52,9 +52,10 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           ].join("\n")
         });
         break;
-      case ["title", "description", "technology"].includes(keyword.value):
+      case ["title", "description", "technology", "link"].includes(keyword.value):
         acceptor(context, {
           label: keyword.value,
+          detail: `Insert ${keyword.value} property`,
           kind: CompletionItemKind.Property,
           insertTextFormat: InsertTextFormat.Snippet,
           insertText: `${keyword.value} '\${0}'`
@@ -91,7 +92,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         acceptor(context, {
           label: keyword.value,
           detail: `Insert group block`,
-          kind: CompletionItemKind.Class,
+          kind: CompletionItemKind.Module,
           insertTextFormat: InsertTextFormat.Snippet,
           insertText: [
             "group '${1:Title}' {",
@@ -100,6 +101,19 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           ].join("\n")
         });
         break;
+      case ["par", "parallel"].includes(keyword.value):
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert block of parallel steps`,
+          kind: CompletionItemKind.Module,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: [
+            `${keyword.value} {`,
+            "	$0",
+            "}"
+          ].join("\n")
+        });
+        break;
       case (keyword.value === "dynamic" && AstUtils.hasContainerOfType(context.node, ast.isModelViews)):
         acceptor(context, {
           label: keyword.value,
@@ -160,11 +174,28 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
       case keyword.value === "autoLayout":
         acceptor(context, {
           label: keyword.value,
-          kind: CompletionItemKind.Class,
+          kind: CompletionItemKind.Property,
           insertTextFormat: InsertTextFormat.Snippet,
           insertText: "autoLayout ${1|TopBottom,BottomTop,LeftRight,RightLeft|}$0"
         });
         break;
+      case keyword.value === "mode":
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Property,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: "mode ${1|sequence,diagram|}$0"
+        });
+        break;
+      case ["include", "exclude"].includes(keyword.value):
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Operator,
+          detail: `Insert ${keyword.value} predicate`,
+          insertTextFormat: InsertTextFormat.PlainText,
+          insertText: `${keyword.value} `
+        });
+        break;
       default:
         acceptor(context, {
           label: keyword.value,

package/dist/lsp/SemanticTokenProvider.mjs

@@ -281,7 +281,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       }
       return "prune";
     }
-    if (ast.isColorProperty(node) || ast.isShapeProperty(node) || ast.isArrowProperty(node) || ast.isLineProperty(node) || ast.isBorderProperty(node) || ast.isSizeProperty(node)) {
+    if (ast.isColorProperty(node) || ast.isShapeProperty(node) || ast.isArrowProperty(node) || ast.isLineProperty(node) || ast.isBorderProperty(node) || ast.isSizeProperty(node) || ast.isDynamicViewDisplayVariantProperty(node)) {
       acceptor({
         node,
         property: "key",

package/dist/model/builder/buildModel.mjs

@@ -21,6 +21,7 @@ import {
   keys,
   map,
   mapValues,
+  omitBy,
   pipe,
   prop,
   reduce
@@ -153,7 +154,7 @@ export function buildModelData(project, docs) {
         title = "Landscape view";
       }
       return {
-        ...model,
+        ...omitBy(model, (v) => v === void 0),
         [_stage]: "parsed",
         docUri,
         description,

package/dist/model/parser/ViewsParser.mjs

@@ -1,6 +1,6 @@
 import * as c4 from "@likec4/core";
 import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
-import { filter, isArray, isDefined, isEmpty, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
+import { filter, find, isArray, isDefined, isEmpty, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
 import {
   ast,
   parseMarkdownAsString,
@@ -241,6 +241,7 @@ export function ViewsParser(B) {
       const links = this.convertLinks(body);
       ViewOps.writeId(astNode, id);
       const manualLayout = parseViewManualLayout(astNode);
+      const variant = find(props, ast.isDynamicViewDisplayVariantProperty)?.value;
       return {
         [c4._type]: "dynamic",
         id,
@@ -249,6 +250,7 @@ export function ViewsParser(B) {
         description,
         tags,
         links: isNonEmptyArray(links) ? links : null,
+        variant,
         rules: [
           ...additionalStyles,
           ...body.rules.flatMap((n) => {

package/dist/validation/{dynamic-view-step.d.ts → dynamic-view.d.ts}

@@ -1,4 +1,5 @@
-import type { ValidationCheck } from 'langium';
+import { type ValidationCheck } from 'langium';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare const dynamicViewStep: (services: LikeC4Services) => ValidationCheck<ast.DynamicViewStep>;
+export declare const dynamicViewDisplayVariant: (services: LikeC4Services) => ValidationCheck<ast.DynamicViewDisplayVariantProperty>;

package/dist/validation/{dynamic-view-step.mjs → dynamic-view.mjs}

@@ -1,4 +1,7 @@
 import { isAncestor } from "@likec4/core";
+import { AstUtils } from "langium";
+import { isEmpty } from "remeda";
+import { ast } from "../ast.mjs";
 import { elementRef } from "../utils/elementRef.mjs";
 import { tryOrLog } from "./_shared.mjs";
 export const dynamicViewStep = (services) => {
@@ -27,3 +30,19 @@ export const dynamicViewStep = (services) => {
     }
   });
 };
+export const dynamicViewDisplayVariant = (services) => {
+  return tryOrLog((prop, accept) => {
+    if (isEmpty(prop.value) || prop.value !== "diagram" && prop.value !== "sequence") {
+      accept("error", 'Invalid display variant: "diagram" or "sequence" are allowed', {
+        node: prop,
+        property: "value"
+      });
+      return;
+    }
+    if (!AstUtils.hasContainerOfType(prop, ast.isDynamicViewBody)) {
+      accept("error", `Display mode can be defined only inside dynamic view`, {
+        node: prop
+      });
+    }
+  });
+};

package/dist/validation/index.d.ts

@@ -4,7 +4,7 @@ import type { LikeC4Services } from '../module';
 export { LikeC4DocumentValidator } from './DocumentValidator';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewDisplayVariantProperty | ast.LinkProperty | ast.ViewStringProperty | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/validation/index.mjs

@@ -9,7 +9,7 @@ import {
   deploymentRelationChecks,
   extendDeploymentChecks
 } from "./deployment-checks.mjs";
-import { dynamicViewStep } from "./dynamic-view-step.mjs";
+import { dynamicViewDisplayVariant, dynamicViewStep } from "./dynamic-view.mjs";
 import { checkElement } from "./element.mjs";
 import { checkElementRef } from "./element-ref.mjs";
 import { checkImported, checkImportsFromPoject } from "./imports.mjs";
@@ -74,6 +74,7 @@ const isValidatableAstNode = validatableAstNodeGuards([
   ast.isDeploymentNode,
   ast.isDeploymentRelation,
   ast.isRelationshipStyleProperty,
+  ast.isDynamicViewDisplayVariantProperty,
   ast.isMetadataProperty,
   ast.isRelation,
   ast.isElementProperty,
@@ -155,7 +156,8 @@ export function registerValidationChecks(services) {
     OutgoingRelationExpr: checkOutgoingRelationExpr(services),
     ImportsFromPoject: checkImportsFromPoject(services),
     Imported: checkImported(services),
-    ColorLiteral: colorLiteralRuleChecks(services)
+    ColorLiteral: colorLiteralRuleChecks(services),
+    DynamicViewDisplayVariantProperty: dynamicViewDisplayVariant(services)
   });
   const connection = services.shared.lsp.Connection;
   if (connection) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.39.5",
+  "version": "1.40.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -112,7 +112,7 @@
     "langium-cli": "3.5.2",
     "natural-compare-lite": "^1.4.0",
     "p-debounce": "4.0.0",
-    "p-queue": "8.1.0",
+    "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
     "pretty-ms": "^9.2.0",
@@ -132,12 +132,12 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "3.25.76",
-    "@likec4/core": "1.39.5",
-    "@likec4/config": "1.39.5",
-    "@likec4/icons": "1.39.5",
-    "@likec4/layouts": "1.39.5",
-    "@likec4/tsconfig": "1.39.5",
-    "@likec4/log": "1.39.5"
+    "@likec4/core": "1.40.0",
+    "@likec4/config": "1.40.0",
+    "@likec4/icons": "1.40.0",
+    "@likec4/layouts": "1.40.0",
+    "@likec4/log": "1.40.0",
+    "@likec4/tsconfig": "1.40.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",