@likec4/language-server 1.39.5 → 1.41.0

package/dist/model/parser/ValueConverter.mjs

@@ -3,7 +3,7 @@ export class LikeC4ValueConverter extends DefaultValueConverter {
   runConverter(rule, input, cstNode) {
     if (rule.name === "MarkdownString") {
       if (input.startsWith('"""') && input.endsWith('"""') || input.startsWith(`'''`) && input.endsWith(`'''`)) {
-        input = input.slice(3, -3);
+        input = input.slice(2, -2);
       }
       return ValueConverter.convertString(input);
     }

package/dist/model/parser/ViewsParser.d.ts

@@ -70,16 +70,19 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
-        parseTitleDescriptionTechnology(inlineProps: {
-            title?: string | undefined;
-            description?: string | undefined;
-            technology?: string | undefined;
-        }, bodyProps: {
+        parseBaseProps(props: {
             title?: ast.MarkdownOrString | undefined;
+            summary?: ast.MarkdownOrString | undefined;
             description?: ast.MarkdownOrString | undefined;
             technology?: ast.MarkdownOrString | undefined;
+        }, override?: {
+            title?: string | undefined;
+            summary?: string | undefined;
+            description?: string | undefined;
+            technology?: string | undefined;
         }): {
             title?: string;
+            summary?: c4.MarkdownOrString;
             description?: c4.MarkdownOrString;
             technology?: string;
         };

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,
@@ -77,8 +77,7 @@ export function ViewsParser(B) {
           viewOf ?? ""
         );
       }
-      const { title = null, description = null } = this.parseTitleDescriptionTechnology(
-        {},
+      const { title = null, description = null } = this.parseBaseProps(
         pipe(
           body.props,
           filter((p) => this.isValid(p)),
@@ -229,8 +228,7 @@ export function ViewsParser(B) {
           astPath
         );
       }
-      const { title = null, description = null } = this.parseTitleDescriptionTechnology(
-        {},
+      const { title = null, description = null } = this.parseBaseProps(
         pipe(
           props,
           filter(ast.isViewStringProperty),
@@ -241,6 +239,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 +248,7 @@ export function ViewsParser(B) {
         description,
         tags,
         links: isNonEmptyArray(links) ? links : null,
+        variant,
         rules: [
           ...additionalStyles,
           ...body.rules.flatMap((n) => {

package/dist/test/testServices.mjs

@@ -25,31 +25,29 @@ export function createTestServices(options) {
   async function initialize() {
     if (isInitialized) return;
     isInitialized = true;
-    await services.shared.workspace.WorkspaceLock.write(async (_cancelToken) => {
-      services.shared.workspace.ConfigurationProvider.updateConfiguration({
-        settings: { likec4: { formatting: { quoteStyle: "single" } } }
-      });
-      services.shared.workspace.WorkspaceManager.initialize({
-        capabilities: {},
-        processId: null,
-        rootUri: workspaceFolder.uri,
-        workspaceFolders: [workspaceFolder]
-      });
-      await services.shared.workspace.WorkspaceManager.initializeWorkspace([workspaceFolder]);
-      if (projectConfig) {
-        const projectFolderUri = Utils.resolvePath(workspaceUri, "src");
-        services.shared.workspace.ProjectsManager.registerProject({
-          config: {
-            name: projectConfig?.name || "test-project",
-            title: projectConfig?.title || "Test Project",
-            contactPerson: projectConfig?.contactPerson || "Unknown",
-            imageAliases: projectConfig?.imageAliases || {},
-            exclude: projectConfig?.exclude || ["node_modules"]
-          },
-          folderUri: projectFolderUri
-        });
-      }
+    services.shared.workspace.ConfigurationProvider.updateConfiguration({
+      settings: { likec4: { formatting: { quoteStyle: "single" } } }
     });
+    services.shared.workspace.WorkspaceManager.initialize({
+      capabilities: {},
+      processId: null,
+      rootUri: workspaceFolder.uri,
+      workspaceFolders: [workspaceFolder]
+    });
+    await services.shared.workspace.WorkspaceManager.initializeWorkspace([workspaceFolder]);
+    if (projectConfig) {
+      const projectFolderUri = Utils.resolvePath(workspaceUri, "src");
+      await services.shared.workspace.ProjectsManager.registerProject({
+        config: {
+          name: projectConfig?.name || "test-project",
+          title: projectConfig?.title || "Test Project",
+          contactPerson: projectConfig?.contactPerson || "Unknown",
+          imageAliases: projectConfig?.imageAliases || {},
+          exclude: projectConfig?.exclude || ["node_modules"]
+        },
+        folderUri: projectFolderUri
+      });
+    }
   }
   const addDocument = async (input, uri) => {
     await initialize();

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.41.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.41.0",
+    "@likec4/config": "1.41.0",
+    "@likec4/layouts": "1.41.0",
+    "@likec4/log": "1.41.0",
+    "@likec4/icons": "1.41.0",
+    "@likec4/tsconfig": "1.41.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",