@likec4/language-server 1.0.2 → 1.1.1

package/dist/model/model-parser.js

@@ -8,11 +8,11 @@ import {
   cleanParsedModel,
   ElementViewOps,
   isFqnIndexedDocument,
+  parseAstOpacityProperty,
   resolveRelationPoints,
   streamModel,
   toAutoLayout,
   toElementStyle,
-  toElementStyleExcludeDefaults,
   toRelationshipStyleExcludeDefaults
 } from "../ast.js";
 import { elementRef, getFqnElementRef } from "../elementRef.js";
@@ -56,22 +56,22 @@ export class LikeC4ModelParser {
     return doc;
   }
   parseSpecification(doc) {
-    const { isValid } = checksFromDiagnostics(doc);
+    const { isValid: isValid2 } = checksFromDiagnostics(doc);
     const { parseResult, c4Specification } = doc;
-    const specifications = parseResult.value.specifications.filter(isValid);
-    const element_specs = specifications.flatMap((s) => s.elements.filter(isValid));
+    const specifications = parseResult.value.specifications.filter(isValid2);
+    const element_specs = specifications.flatMap((s) => s.elements.filter(isValid2));
     for (const { kind, style } of element_specs) {
       try {
         const kindName = kind.name;
         c4Specification.kinds[kindName] = {
           ...c4Specification.kinds[kindName],
-          ...toElementStyleExcludeDefaults(style?.props)
+          ...toElementStyle(style?.props)
         };
       } catch (e) {
         logWarnError(e);
       }
     }
-    const relations_specs = specifications.flatMap((s) => s.relationships.filter(isValid));
+    const relations_specs = specifications.flatMap((s) => s.relationships.filter(isValid2));
     for (const { kind, props } of relations_specs) {
       try {
         const kindName = kind.name;
@@ -110,7 +110,7 @@ export class LikeC4ModelParser {
     const kind = astNode.kind.$refText;
     const tags = this.convertTags(astNode.body);
     const stylePropsAst = astNode.body?.props.find(ast.isStyleProperties)?.props;
-    const styleProps = toElementStyleExcludeDefaults(stylePropsAst);
+    const style = toElementStyle(stylePropsAst);
     const astPath = this.getAstNodePath(astNode);
     let [title, description, technology] = astNode.props ?? [];
     const bodyProps = astNode.body?.props.filter(ast.isElementStringProperty) ?? [];
@@ -127,7 +127,7 @@ export class LikeC4ModelParser {
       ...links && isNonEmptyArray(links) && { links },
       ...isTruthy(technology) && { technology },
       ...isTruthy(description) && { description },
-      ...styleProps
+      style
     };
   }
   parseRelation(astNode) {
@@ -160,11 +160,11 @@ export class LikeC4ModelParser {
     };
   }
   parseViews(doc) {
-    const { isValid } = checksFromDiagnostics(doc);
-    const views = doc.parseResult.value.views.flatMap((v) => isValid(v) ? v.views.filter(isValid) : []);
+    const { isValid: isValid2 } = checksFromDiagnostics(doc);
+    const views = doc.parseResult.value.views.flatMap((v) => isValid2(v) ? v.views.filter(isValid2) : []);
     for (const view of views) {
       try {
-        const v = this.parseElementView(view);
+        const v = this.parseElementView(view, isValid2);
         doc.c4Views.push(v);
       } catch (e) {
         logWarnError(e);
@@ -247,6 +247,10 @@ export class LikeC4ModelParser {
           acc.custom[prop.key] = value.trim();
           return acc;
         }
+        if (ast.isIconProperty(prop)) {
+          acc.custom[prop.key] = prop.value;
+          return acc;
+        }
         if (ast.isColorProperty(prop)) {
           acc.custom[prop.key] = prop.value;
           return acc;
@@ -255,6 +259,14 @@ export class LikeC4ModelParser {
           acc.custom[prop.key] = prop.value;
           return acc;
         }
+        if (ast.isBorderProperty(prop)) {
+          acc.custom[prop.key] = prop.value;
+          return acc;
+        }
+        if (ast.isOpacityProperty(prop)) {
+          acc.custom[prop.key] = parseAstOpacityProperty(prop);
+          return acc;
+        }
         nonexhaustive(prop);
       },
       {
@@ -295,11 +307,11 @@ export class LikeC4ModelParser {
     }
     nonexhaustive(astNode);
   }
-  parseViewRule(astRule) {
+  parseViewRule(astRule, isValid2) {
     if (ast.isIncludePredicate(astRule) || ast.isExcludePredicate(astRule)) {
       const exprs = astRule.expressions.flatMap((n) => {
         try {
-          return this.parsePredicateExpr(n);
+          return isValid2(n) ? this.parsePredicateExpr(n) : [];
         } catch (e) {
           logWarnError(e);
           return [];
@@ -323,7 +335,7 @@ export class LikeC4ModelParser {
     }
     nonexhaustive(astRule);
   }
-  parseElementView(astNode) {
+  parseElementView(astNode, isValid2) {
     const body = astNode.body;
     invariant(body, "ElementView body is not defined");
     const astPath = this.getAstNodePath(astNode);
@@ -345,8 +357,8 @@ export class LikeC4ModelParser {
         viewOf ?? ""
       );
     }
-    const title = body.props.find((p) => p.key === "title")?.value;
-    const description = body.props.find((p) => p.key === "description")?.value;
+    const title = toSingleLine(body.props.find((p) => p.key === "title")?.value);
+    const description = removeIndent(body.props.find((p) => p.key === "description")?.value);
     const tags = this.convertTags(body);
     const links = body.props.filter(ast.isLinkProperty).map((p) => p.value);
     const basic = {
@@ -359,7 +371,7 @@ export class LikeC4ModelParser {
       ...isNonEmptyArray(links) && { links },
       rules: body.rules.flatMap((n) => {
         try {
-          return this.parseViewRule(n);
+          return isValid2(n) ? this.parseViewRule(n, isValid2) : [];
         } catch (e) {
           logWarnError(e);
           return [];

package/dist/model-change/ModelChanges.js

@@ -1,20 +1,28 @@
 import { invariant, nonexhaustive } from "@likec4/core";
-import { Range, TextDocumentEdit } from "vscode-languageserver-protocol";
+import { Range } from "vscode-languageserver-protocol";
+import { changeElementStyle } from "./changeElementStyle.js";
 import { changeViewLayout } from "./changeViewLayout.js";
-import { changeViewStyle } from "./changeViewStyle.js";
 function unionRangeOfAllEdits(edits) {
   let start = Number.MAX_SAFE_INTEGER;
   let end = Number.MIN_SAFE_INTEGER;
-  let startCharacter = 0;
-  let endCharacter = 0;
+  let startCharacter = Number.MAX_SAFE_INTEGER;
+  let endCharacter = Number.MIN_SAFE_INTEGER;
   for (const { range } of edits) {
-    start = Math.min(start, range.start.line);
-    if (start === range.start.line) {
-      startCharacter = range.start.character;
+    if (range.start.line <= start) {
+      if (start == range.start.line) {
+        startCharacter = Math.min(range.start.character, startCharacter);
+      } else {
+        start = range.start.line;
+        startCharacter = range.start.character;
+      }
     }
-    end = Math.max(end, range.end.line);
-    if (end === range.end.line) {
-      endCharacter = range.end.character;
+    if (end <= range.end.line) {
+      if (end == range.end.line) {
+        endCharacter = Math.max(range.end.character, endCharacter);
+      } else {
+        end = range.end.line;
+        endCharacter = range.end.character;
+      }
     }
   }
   return Range.create(start, startCharacter, end, endCharacter);
@@ -41,9 +49,9 @@ export class LikeC4ModelChanges {
       const applyResult = await lspConnection.workspace.applyEdit({
         label: `LikeC4 - change view ${changeView.viewId}`,
         edit: {
-          documentChanges: [
-            TextDocumentEdit.create(textDocument, edits)
-          ]
+          changes: {
+            [textDocument.uri]: edits
+          }
         }
       });
       if (!applyResult.applied) {
@@ -65,21 +73,11 @@ export class LikeC4ModelChanges {
     const edits = [];
     for (const change of changes) {
       switch (change.op) {
-        case "change-color": {
-          edits.push(...changeViewStyle(this.services, {
-            ...lookup,
-            targets: change.targets,
-            key: "color",
-            value: change.color
-          }));
-          break;
-        }
-        case "change-shape": {
-          edits.push(...changeViewStyle(this.services, {
+        case "change-element-style": {
+          edits.push(...changeElementStyle(this.services, {
             ...lookup,
             targets: change.targets,
-            key: "shape",
-            value: change.shape
+            style: change.style
           }));
           break;
         }

package/dist/model-change/{changeViewStyle.d.ts → changeElementStyle.d.ts}

@@ -2,14 +2,14 @@ import { type Fqn, type NonEmptyArray } from '@likec4/core';
 import { TextEdit } from 'vscode-languageserver-protocol';
 import { ast, type ParsedAstElementView, type ParsedLikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
-type ChangeViewStyleArg = {
+import type { ChangeView } from '../protocol';
+type ChangeElementStyleArg = {
     view: ParsedAstElementView;
     doc: ParsedLikeC4LangiumDocument;
     viewAst: ast.ElementView;
-    key: string;
-    value: string;
     targets: NonEmptyArray<Fqn>;
+    style: ChangeView.ChangeElementStyle['style'];
 };
-export declare function changeViewStyle(services: LikeC4Services, { view, viewAst, targets, key, value }: ChangeViewStyleArg): TextEdit[];
+export declare function changeElementStyle(services: LikeC4Services, { view, viewAst, targets, style }: ChangeElementStyleArg): TextEdit[];
 export {};
-//# sourceMappingURL=changeViewStyle.d.ts.map
+//# sourceMappingURL=changeElementStyle.d.ts.map

package/dist/model-change/changeElementStyle.js

@@ -0,0 +1,141 @@
+import { invariant, isAncestor, nonNullable } from "@likec4/core";
+import { GrammarUtils } from "langium";
+import { entries, findLast, isNumber, last } from "remeda";
+import { TextEdit } from "vscode-languageserver-protocol";
+import { ast } from "../ast.js";
+const { findNodeForKeyword, findNodeForProperty } = GrammarUtils;
+const asViewStyleRule = (target, style, indent = 0) => {
+  const indentStr = indent > 0 ? " ".repeat(indent) : "";
+  return [
+    indentStr + `style ${target} {`,
+    ...entries(style).map(([key, value]) => indentStr + `  ${key} ${value}`),
+    indentStr + `}`
+  ].join("\n");
+};
+const isMatchingViewRule = (fqn, index) => (rule) => {
+  if (!ast.isViewRuleStyle(rule)) {
+    return false;
+  }
+  const [target, ...rest] = rule.targets;
+  if (!target || rest.length > 0 || !ast.isElementRef(target)) {
+    return false;
+  }
+  const ref = target.el.ref;
+  const _fqn = ref ? index.getFqn(ref) : null;
+  return _fqn === fqn;
+};
+export function changeElementStyle(services, {
+  view,
+  viewAst,
+  targets,
+  style
+}) {
+  const viewCstNode = viewAst.$cstNode;
+  invariant(viewCstNode, "viewCstNode");
+  const insertPos = last(viewAst.body.rules)?.$cstNode?.range.end ?? last(viewAst.body.props)?.$cstNode?.range.end ?? viewAst.body.$cstNode?.range.start;
+  invariant(insertPos, "insertPos is not defined");
+  const indent = viewCstNode.range.start.character + 2;
+  const fqnIndex = services.likec4.FqnIndex;
+  const styleRules = viewAst.body.rules.filter(ast.isViewRuleStyle);
+  const viewOf = view.viewOf;
+  const existing = [];
+  const insert = [];
+  targets.forEach((target) => {
+    const rule = findLast(styleRules, isMatchingViewRule(target, fqnIndex));
+    const fqn = viewOf && isAncestor(viewOf, target) ? target.substring(viewOf.length + 1) : target;
+    if (rule) {
+      existing.push({ fqn, rule });
+    } else {
+      insert.push({ fqn });
+    }
+  });
+  const modifiedRange = {
+    start: insertPos,
+    end: insertPos
+  };
+  const includeRange = (range) => {
+    if (range.start.line <= modifiedRange.start.line) {
+      if (range.start.line == modifiedRange.start.line) {
+        modifiedRange.start.character = Math.min(range.start.character, modifiedRange.start.character);
+      } else {
+        modifiedRange.start.line = range.start.line;
+        modifiedRange.start.character = range.start.character;
+      }
+    }
+    if (range.end.line >= modifiedRange.end.line) {
+      if (range.end.line == modifiedRange.end.line) {
+        modifiedRange.end.character = Math.max(range.end.character, modifiedRange.end.character);
+      } else {
+        modifiedRange.end.line = range.end.line;
+        modifiedRange.end.character = range.end.character;
+      }
+    }
+  };
+  const edits = [];
+  if (insert.length > 0) {
+    const linesToInsert = [
+      "",
+      ...insert.map(({ fqn }) => asViewStyleRule(fqn, style, indent))
+    ];
+    edits.push(
+      TextEdit.insert(
+        insertPos,
+        linesToInsert.join("\n")
+      )
+    );
+    modifiedRange.start = {
+      line: insertPos.line + 1,
+      character: indent
+    };
+    modifiedRange.end = {
+      line: insertPos.line + linesToInsert.length,
+      character: indent + (last(linesToInsert)?.length ?? 0) + 1
+    };
+  }
+  if (existing.length > 0) {
+    for (const { rule } of existing) {
+      const ruleCstNode = rule.$cstNode;
+      invariant(ruleCstNode, "RuleCstNode not found");
+      for (const [key, _value] of entries.strict(style)) {
+        const value = isNumber(_value) ? _value.toString() + "%" : _value;
+        const ruleProp = rule.styleprops.find((p) => p.key === key);
+        if (ruleProp && ruleProp.$cstNode) {
+          const { range: { start, end } } = nonNullable(
+            findNodeForProperty(ruleProp.$cstNode, "value"),
+            "cant find value cst node"
+          );
+          includeRange({
+            start,
+            end: {
+              line: end.line,
+              character: start.character + value.length + 1
+            }
+          });
+          edits.push(TextEdit.replace({ start, end }, value));
+          continue;
+        }
+        const insertPos2 = findNodeForKeyword(ruleCstNode, "{")?.range.end;
+        invariant(insertPos2, "Opening brace not found");
+        const indentStr = " ".repeat(2 + ruleCstNode.range.start.character);
+        const insertKeyValue = indentStr + key + " " + value;
+        edits.push(
+          TextEdit.insert(
+            insertPos2,
+            "\n" + insertKeyValue
+          )
+        );
+        includeRange({
+          start: {
+            line: insertPos2.line + 1,
+            character: indentStr.length + 1
+          },
+          end: {
+            line: insertPos2.line + 1,
+            character: insertKeyValue.length + 1
+          }
+        });
+      }
+    }
+  }
+  return edits;
+}

package/dist/protocol.d.ts

@@ -1,4 +1,4 @@
-import type { AutoLayoutDirection, ComputedView, ElementShape, Fqn, LikeC4ComputedModel, LikeC4Model, NonEmptyArray, RelationID, ThemeColor, ViewID } from '@likec4/core';
+import type { AutoLayoutDirection, BorderStyle, ComputedView, ElementShape, Fqn, LikeC4ComputedModel, LikeC4Model, NonEmptyArray, RelationID, ThemeColor, ViewID } from '@likec4/core';
 import type { DocumentUri, Location } from 'vscode-languageserver-protocol';
 import { NotificationType, RequestType, RequestType0 } from 'vscode-languageserver-protocol';
 export declare const onDidChangeModel: NotificationType<string>;
@@ -33,22 +33,22 @@ export type LocateParams = {
 export declare const locate: RequestType<LocateParams, Location | null, void>;
 export type LocateRequest = typeof locate;
 export declare namespace ChangeView {
-    interface ChangeColor {
-        op: 'change-color';
-        color: ThemeColor;
-        targets: NonEmptyArray<Fqn>;
-    }
-    interface ChangeShape {
-        op: 'change-shape';
-        shape: ElementShape;
-        targets: NonEmptyArray<Fqn>;
-    }
     interface ChangeAutoLayout {
         op: 'change-autolayout';
         layout: AutoLayoutDirection;
     }
+    interface ChangeElementStyle {
+        op: 'change-element-style';
+        style: {
+            border?: BorderStyle;
+            opacity?: number;
+            shape?: ElementShape;
+            color?: ThemeColor;
+        };
+        targets: NonEmptyArray<Fqn>;
+    }
 }
-export type ChangeView = ChangeView.ChangeColor | ChangeView.ChangeShape | ChangeView.ChangeAutoLayout;
+export type ChangeView = ChangeView.ChangeAutoLayout | ChangeView.ChangeElementStyle;
 export interface ChangeViewRequestParams {
     viewId: ViewID;
     changes: NonEmptyArray<ChangeView>;

package/dist/references/scope-computation.js

@@ -95,9 +95,11 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
         }
       }
     }
-    for (const [name, descriptions] of nestedScopes.entriesGroupedByKey()) {
-      if (!localScope.has(name) && descriptions.length === 1) {
-        localScope.add(name, descriptions[0]);
+    if (nestedScopes.size > 0) {
+      for (const [name, descriptions] of nestedScopes.entriesGroupedByKey()) {
+        if (!localScope.has(name) && descriptions.length === 1) {
+          localScope.add(name, descriptions[0]);
+        }
       }
     }
     scopes.addAll(container, localScope.values());

package/dist/validation/index.js

@@ -1,5 +1,6 @@
 import { logger } from "../logger.js";
 import { elementChecks } from "./element.js";
+import { opacityPropertyRuleChecks } from "./property-checks.js";
 import { relationChecks } from "./relation.js";
 import {
   elementKindChecks,
@@ -20,6 +21,7 @@ export function registerValidationChecks(services) {
   logger.info("registerValidationChecks");
   const registry = services.validation.ValidationRegistry;
   registry.register({
+    OpacityProperty: opacityPropertyRuleChecks(services),
     SpecificationRule: specificationRuleChecks(services),
     Model: modelRuleChecks(services),
     ModelViews: modelViewsChecks(services),

package/dist/validation/property-checks.d.ts

@@ -0,0 +1,5 @@
+import type { ValidationCheck } from 'langium';
+import type { ast } from '../ast';
+import type { LikeC4Services } from '../module';
+export declare const opacityPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.OpacityProperty>;
+//# sourceMappingURL=property-checks.d.ts.map

package/dist/validation/property-checks.js

@@ -0,0 +1,11 @@
+export const opacityPropertyRuleChecks = (_) => {
+  return (node, accept) => {
+    const opacity = parseFloat(node.value);
+    if (isNaN(opacity) || opacity < 0 || opacity > 100) {
+      accept("warning", `Value ignored, must be between 0% and 100%`, {
+        node,
+        property: "value"
+      });
+    }
+  };
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -74,8 +74,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "1.0.2",
-    "@likec4/graph": "1.0.2",
+    "@likec4/core": "1.1.1",
+    "@likec4/graph": "1.1.1",
     "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "langium": "^3.0.0",
@@ -95,7 +95,7 @@
     "@types/node": "^20.12.7",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1",
-    "execa": "^8.0.1",
+    "execa": "^9.1.0",
     "langium-cli": "3.0.3",
     "npm-run-all2": "^6.1.2",
     "typescript": "^5.4.5",

package/dist/model-change/changeViewStyle.js

@@ -1,123 +0,0 @@
-import { invariant, isAncestor, nonNullable } from "@likec4/core";
-import { GrammarUtils } from "langium";
-import { findLast, last, partition } from "remeda";
-import { TextEdit } from "vscode-languageserver-protocol";
-import { ast } from "../ast.js";
-const { findNodeForKeyword, findNodeForProperty } = GrammarUtils;
-const asViewStyleRule = (target, key, value, indent = 0) => {
-  const indentStr = indent > 0 ? " ".repeat(indent) : "";
-  return [
-    indentStr + `style ${target} {`,
-    indentStr + `  ${key} ${value}`,
-    indentStr + `}`
-  ].join("\n");
-};
-const isMatchingViewRule = (fqn, index) => (rule) => {
-  if (!ast.isViewRuleStyle(rule)) {
-    return false;
-  }
-  const [target, ...rest] = rule.targets;
-  if (!target || rest.length > 0 || !ast.isElementRef(target)) {
-    return false;
-  }
-  const ref = target.el.ref;
-  const _fqn = ref ? index.getFqn(ref) : null;
-  return _fqn === fqn;
-};
-export function changeViewStyle(services, {
-  view,
-  viewAst,
-  targets,
-  key,
-  value
-}) {
-  const viewCstNode = viewAst.$cstNode;
-  invariant(viewCstNode, "viewCstNode");
-  const insertPos = last(viewAst.body.rules)?.$cstNode?.range.end ?? last(viewAst.body.props)?.$cstNode?.range.end ?? viewAst.body.$cstNode?.range.start;
-  invariant(insertPos, "insertPos is not defined");
-  const indent = viewCstNode.range.start.character + 2;
-  const fqnIndex = services.likec4.FqnIndex;
-  const styleRules = viewAst.body.rules.filter(ast.isViewRuleStyle);
-  const viewOf = view.viewOf;
-  const targetsWithRules = targets.map((target) => {
-    const rule = findLast(styleRules, isMatchingViewRule(target, fqnIndex));
-    const fqn = viewOf && isAncestor(viewOf, target) ? target.substring(viewOf.length + 1) : target;
-    if (rule) {
-      return {
-        fqn,
-        rule
-      };
-    } else {
-      return {
-        fqn
-      };
-    }
-  });
-  const [existing, insert] = partition(
-    targetsWithRules,
-    (a) => !!a.rule
-  );
-  const modifiedRange = {
-    start: insertPos,
-    end: insertPos
-  };
-  const includeRange = (range) => {
-    if (range.start.line < modifiedRange.start.line) {
-      modifiedRange.start = range.start;
-    }
-    if (range.end.line > modifiedRange.end.line) {
-      modifiedRange.end = range.end;
-    }
-  };
-  const edits = [];
-  if (insert.length > 0) {
-    const linesToInsert = [
-      "",
-      ...insert.map(({ fqn }) => asViewStyleRule(fqn, key, value, indent))
-    ];
-    edits.push(
-      TextEdit.insert(
-        insertPos,
-        linesToInsert.join("\n")
-      )
-    );
-    modifiedRange.end = {
-      line: modifiedRange.end.line + linesToInsert.length,
-      character: last(linesToInsert)?.length ?? insertPos.character
-    };
-  }
-  if (existing.length > 0) {
-    for (const { rule } of existing) {
-      const ruleCstNode = rule.$cstNode;
-      invariant(ruleCstNode, "RuleCstNode not found");
-      const ruleProp = rule.styleprops.find((p) => p.key === key);
-      if (ruleProp && ruleProp.$cstNode) {
-        const { range: { start, end } } = nonNullable(
-          findNodeForProperty(ruleProp.$cstNode, "value"),
-          "cant find value cst node"
-        );
-        includeRange(ruleProp.$cstNode.range);
-        edits.push(TextEdit.replace({ start, end }, value));
-        continue;
-      }
-      const insertPos2 = findNodeForKeyword(ruleCstNode, "{")?.range.end;
-      invariant(insertPos2, "Opening brace not found");
-      const indentStr = " ".repeat(2 + ruleCstNode.range.start.character);
-      const insertKeyValue = indentStr + key + " " + value;
-      edits.push(
-        TextEdit.insert(
-          insertPos2,
-          "\n" + insertKeyValue
-        )
-      );
-      includeRange({
-        start: insertPos2,
-        end: {
-          line: insertPos2.line + 1,
-          character: insertKeyValue.length
-        }
-      });
-    }
-  }
-  return edits;
-}