@likec4/language-server 1.0.0-rc.1 → 1.0.1

package/dist/Rpc.js

@@ -23,18 +23,21 @@ export class Rpc {
     const modelEditor = this.services.likec4.ModelChanges;
     const connection = this.services.shared.lsp.Connection;
     if (!connection) {
-      logger.info(`[ServerRpc] no connection, not initializing`);
+      logger.warn(`[ServerRpc] no connection, not initializing`);
       return;
     }
     logger.info(`[ServerRpc] init`);
     const LangiumDocuments = this.services.shared.workspace.LangiumDocuments;
     const DocumentBuilder = this.services.shared.workspace.DocumentBuilder;
     const notifyModelParsed = debounce(
-      () => void connection.sendNotification(onDidChangeModel, "").catch(logError),
+      () => void connection.sendNotification(onDidChangeModel, "").catch((e) => {
+        logger.error(`[ServerRpc] error sending onDidChangeModel: ${e}`);
+        return Promise.resolve();
+      }),
       {
         timing: "both",
-        waitMs: 100,
-        maxWaitMs: 500
+        waitMs: 350,
+        maxWaitMs: 1e3
       }
     );
     this.disposables.push(

package/dist/ast.d.ts

@@ -9,10 +9,10 @@ export { ast };
 declare const idattr: unique symbol;
 declare module './generated/ast' {
     interface Element {
-        [idattr]?: c4.Fqn;
+        [idattr]?: c4.Fqn | undefined;
     }
     interface ElementView {
-        [idattr]?: c4.ViewID;
+        [idattr]?: c4.ViewID | undefined;
     }
 }
 export interface ParsedAstSpecification {
@@ -101,13 +101,12 @@ export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is Li
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is ParsedLikeC4LangiumDocument;
 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.Relation | ast.SpecificationRelationshipKind | ast.Model | ast.Element | ast.ExtendElement | ast.SpecificationRule | ast.SpecificationElementKind | ast.ElementView | ast.ModelViews | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.DescedantsExpr | ast.ElementKindExpr | ast.ElementRef | ast.ElementTagExpr | ast.ExpandElementExpr | ast.WildcardExpr | ast.ElementStringProperty | ast.LinkProperty | ast.StyleProperties | ast.ExplicitRelation | ast.ImplicitRelation | ast.RelationStringProperty | ast.RelationStyleProperty | ast.ViewStringProperty | ast.ViewRuleAutoLayout | ast.ExcludePredicate | ast.IncludePredicate | ast.ViewRuleStyle | ast.CustomElementExpr | ast.InOutExpr | ast.IncomingExpr | ast.OutgoingExpr | ast.RelationExpr | ast.SpecificationRelationshipKind | ast.RelationBody | ast.ElementBody | ast.ExtendElementBody | ast.Model | ast.Element | ast.ExtendElement | ast.SpecificationRule | ast.SpecificationElementKind | ast.ElementViewBody | ast.ElementView | ast.ModelViews | ast.SpecificationTag;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;
-    invalidNodes: WeakSet<ast.ExplicitRelation | ast.ImplicitRelation | ast.SpecificationRelationshipKind | ast.Model | ast.Element | ast.ExtendElement | ast.SpecificationRule | ast.SpecificationElementKind | ast.ElementView | ast.ModelViews | ast.SpecificationTag>;
+    invalidNodes: WeakSet<ast.DescedantsExpr | ast.ElementKindExpr | ast.ElementRef | ast.ElementTagExpr | ast.ExpandElementExpr | ast.WildcardExpr | ast.ElementStringProperty | ast.LinkProperty | ast.StyleProperties | ast.ExplicitRelation | ast.ImplicitRelation | ast.RelationStringProperty | ast.RelationStyleProperty | ast.ViewStringProperty | ast.ViewRuleAutoLayout | ast.ExcludePredicate | ast.IncludePredicate | ast.ViewRuleStyle | ast.CustomElementExpr | ast.InOutExpr | ast.IncomingExpr | ast.OutgoingExpr | ast.RelationExpr | ast.SpecificationRelationshipKind | ast.RelationBody | ast.ElementBody | ast.ExtendElementBody | ast.Model | ast.Element | ast.ExtendElement | ast.SpecificationRule | ast.SpecificationElementKind | ast.ElementViewBody | ast.ElementView | ast.ModelViews | ast.SpecificationTag>;
 };
-export declare const isValidLikeC4LangiumDocument: (doc: LangiumDocument) => doc is ParsedLikeC4LangiumDocument;
 export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Relation | ast.Element, void, unknown>;
 export declare function resolveRelationPoints(node: ast.Relation): {
     source: ast.Element;

package/dist/ast.js

@@ -8,7 +8,7 @@ import {
   RelationRefError
 } from "@likec4/core";
 import { AstUtils, DocumentState } from "langium";
-import { isNil } from "remeda";
+import { isNullish } from "remeda";
 import { DiagnosticSeverity } from "vscode-languageserver-protocol";
 import { elementRef } from "./elementRef.js";
 import * as ast from "./generated/ast.js";
@@ -26,8 +26,8 @@ export const ElementViewOps = {
 };
 export const ElementOps = {
   writeId(node, id) {
-    if (isNil(id)) {
-      delete node[idattr];
+    if (isNullish(id)) {
+      node[idattr] = void 0;
     } else {
       node[idattr] = id;
     }
@@ -62,24 +62,33 @@ function validatableAstNodeGuards(predicates) {
   return (n) => predicates.some((p) => p(n));
 }
 const isValidatableAstNode = validatableAstNodeGuards([
-  ast.isModel,
+  ast.isViewRuleStyle,
+  ast.isViewRulePredicateExpr,
+  ast.isViewRulePredicate,
+  ast.isViewRule,
+  ast.isViewProperty,
+  ast.isElementViewBody,
+  ast.isElementView,
+  ast.isRelationProperty,
+  ast.isRelationBody,
   ast.isRelation,
+  ast.isElementProperty,
+  ast.isElementBody,
   ast.isElement,
+  ast.isExtendElementBody,
   ast.isExtendElement,
-  ast.isSpecificationRule,
   ast.isSpecificationElementKind,
   ast.isSpecificationRelationshipKind,
   ast.isSpecificationTag,
-  ast.isElementView,
+  ast.isSpecificationRule,
+  ast.isModel,
   ast.isModelViews
 ]);
 export function checksFromDiagnostics(doc) {
+  const errors = doc.diagnostics?.filter((d) => d.severity === DiagnosticSeverity.Error) ?? [];
   const invalidNodes = new WeakSet(
-    doc.diagnostics?.flatMap((d) => {
-      if (d.severity === DiagnosticSeverity.Error) {
-        return AstUtils.getContainerOfType(d.node, isValidatableAstNode) ?? [];
-      }
-      return [];
+    errors.flatMap((d) => {
+      return AstUtils.getContainerOfType(d.node, isValidatableAstNode) ?? [];
     }) ?? []
   );
   const isValid = (n) => !invalidNodes.has(n);
@@ -88,16 +97,9 @@ export function checksFromDiagnostics(doc) {
     invalidNodes
   };
 }
-export const isValidLikeC4LangiumDocument = (doc) => {
-  if (!isParsedLikeC4LangiumDocument(doc))
-    return false;
-  const { parseResult, diagnostics } = doc;
-  return parseResult.lexerErrors.length === 0 && parseResult.parserErrors.length === 0 && (!diagnostics || diagnostics.length === 0 || diagnostics.every((d) => d.severity !== DiagnosticSeverity.Error));
-};
 export function* streamModel(doc) {
   const { isValid } = checksFromDiagnostics(doc);
-  const elements = doc.parseResult.value.models.flatMap((m) => isValid(m) ? m.elements : []);
-  const traverseStack = [...elements];
+  const traverseStack = doc.parseResult.value.models.flatMap((m) => isValid(m) ? m.elements : []);
   const relations = [];
   let el;
   while (el = traverseStack.shift()) {

package/dist/elementRef.js

@@ -5,8 +5,11 @@ export function getFqnElementRef(node) {
   const name = [node.el.$refText];
   let parent = node.parent;
   while (parent) {
-    name.unshift(parent.el.$refText);
+    name.push(parent.el.$refText);
     parent = parent.parent;
   }
-  return name.join(".");
+  if (name.length === 1) {
+    return name[0];
+  }
+  return name.reverse().join(".");
 }

package/dist/model-change/ModelChanges.js

@@ -5,11 +5,19 @@ import { changeViewStyle } from "./changeViewStyle.js";
 function unionRangeOfAllEdits(edits) {
   let start = Number.MAX_SAFE_INTEGER;
   let end = Number.MIN_SAFE_INTEGER;
-  for (const edit of edits) {
-    start = Math.min(start, edit.range.start.line);
-    end = Math.max(end, edit.range.end.line);
+  let startCharacter = 0;
+  let endCharacter = 0;
+  for (const { range } of edits) {
+    start = Math.min(start, range.start.line);
+    if (start === range.start.line) {
+      startCharacter = range.start.character;
+    }
+    end = Math.max(end, range.end.line);
+    if (end === range.end.line) {
+      endCharacter = range.end.character;
+    }
   }
-  return Range.create(start, 0, end, 0);
+  return Range.create(start, startCharacter, end, endCharacter);
 }
 export class LikeC4ModelChanges {
   constructor(services) {
@@ -39,7 +47,7 @@ export class LikeC4ModelChanges {
         }
       });
       if (!applyResult.applied) {
-        lspConnection.window.showErrorMessage(`Failed to apply changes${applyResult.failureReason}`);
+        lspConnection.window.showErrorMessage(`Failed to apply changes ${applyResult.failureReason}`);
         return;
       }
       result = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.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.0-rc.1",
-    "@likec4/graph": "1.0.0-rc.1",
+    "@likec4/core": "1.0.1",
+    "@likec4/graph": "1.0.1",
     "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "langium": "^3.0.0",
@@ -85,7 +85,7 @@
     "remeda": "^1.61.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.18.1",
+    "type-fest": "^4.18.2",
     "ufo": "^1.5.3",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
@@ -96,11 +96,11 @@
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1",
     "execa": "^8.0.1",
-    "langium-cli": "^3.0.3",
+    "langium-cli": "3.0.3",
     "npm-run-all2": "^6.1.2",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
     "vitest": "~1.5.2"
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.2.2"
 }