@likec4/language-server 0.37.1 → 0.40.0

package/dist/validation/index.js

@@ -1,49 +1,39 @@
-import { Utils } from 'vscode-uri';
-import { logger } from '../logger';
-import { elementChecks } from './element';
-import { relationChecks } from './relation';
-import { elementKindChecks, tagChecks } from './specification';
-import { viewChecks } from './view';
+import * as vscodeUri from "vscode-uri";
+import { logger } from "../logger.js";
+import { elementChecks } from "./element.js";
+import { relationChecks } from "./relation.js";
+import { elementKindChecks, tagChecks } from "./specification.js";
+import { viewChecks } from "./view.js";
 export function registerValidationChecks(services) {
-    logger.info('registerValidationChecks');
-    const registry = services.validation.ValidationRegistry;
-    // const checks: ValidationChecks = {
-    // Element: validator.checkElementNameDuplicates,
-    // Tag: validator.checkTagDuplicates,
-    // ElementKind: elementKindChecks(services),
-    // ElementStyleProperty: validator.checkElementStyleProperty,
-    // View: validator.checkViewNameDuplicates,
-    // ColorStyleProperty: validator.checkColorStyleProperty,
-    // }
-    registry.register({
-        ElementView: viewChecks(services),
-        Element: elementChecks(services),
-        ElementKind: elementKindChecks(services),
-        Relation: relationChecks(services),
-        Tag: tagChecks(services)
-    });
-    const connection = services.shared.lsp.Connection;
-    if (connection) {
-        logger.info('registerValidationChecks');
-        // wokraround for bug in langium
-        services.shared.workspace.DocumentBuilder.onUpdate((changed, deleted) => {
-            const message = [`[DocumentBuilder.onUpdate]`];
-            if (changed.length > 0) {
-                message.push(` changed:`);
-                changed.forEach(u => message.push(`  - ${Utils.basename(u)}`));
-            }
-            if (deleted.length > 0) {
-                message.push(` deleted:`);
-                deleted.forEach(u => message.push(`  - ${Utils.basename(u)}`));
-            }
-            logger.debug(message.join('\n'));
-            for (const uri of deleted) {
-                void connection.sendDiagnostics({
-                    uri: uri.toString(),
-                    diagnostics: []
-                });
-            }
+  logger.info("registerValidationChecks");
+  const registry = services.validation.ValidationRegistry;
+  registry.register({
+    ElementView: viewChecks(services),
+    Element: elementChecks(services),
+    ElementKind: elementKindChecks(services),
+    Relation: relationChecks(services),
+    Tag: tagChecks(services)
+  });
+  const connection = services.shared.lsp.Connection;
+  if (connection) {
+    logger.info("registerValidationChecks");
+    services.shared.workspace.DocumentBuilder.onUpdate((changed, deleted) => {
+      const message = [`[DocumentBuilder.onUpdate]`];
+      if (changed.length > 0) {
+        message.push(` changed:`);
+        changed.forEach((u) => message.push(`  - ${vscodeUri.Utils.basename(u)}`));
+      }
+      if (deleted.length > 0) {
+        message.push(` deleted:`);
+        deleted.forEach((u) => message.push(`  - ${vscodeUri.Utils.basename(u)}`));
+      }
+      logger.debug(message.join("\n"));
+      for (const uri of deleted) {
+        void connection.sendDiagnostics({
+          uri: uri.toString(),
+          diagnostics: []
         });
-    }
+      }
+    });
+  }
 }
-//# sourceMappingURL=index.js.map

package/dist/validation/relation.d.ts

@@ -1,5 +1,3 @@
-import type { ValidationCheck } from 'langium';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare const relationChecks: (services: LikeC4Services) => ValidationCheck<ast.Relation>;
-//# sourceMappingURL=relation.d.ts.map

package/dist/validation/relation.js

@@ -1,50 +1,46 @@
-import { isSameHierarchy } from '@likec4/core';
-import { ast } from '../ast';
-import { elementRef } from '../elementRef';
-import { logError } from '../logger';
+import { isSameHierarchy } from "@likec4/core";
+import { ast } from "../ast.js";
+import { elementRef } from "../elementRef.js";
+import { logError } from "../logger.js";
 export const relationChecks = (services) => {
-    const fqnIndex = services.likec4.FqnIndex;
-    return (el, accept) => {
-        try {
-            const targetEl = elementRef(el.target);
-            const target = targetEl && fqnIndex.getFqn(targetEl);
-            if (!target) {
-                accept('error', 'Target not found (not parsed/indexed yet)', {
-                    node: el,
-                    property: 'target'
-                });
-            }
-            let sourceEl;
-            if ('source' in el) {
-                sourceEl = elementRef(el.source);
-            }
-            else {
-                if (!ast.isElementBody(el.$container)) {
-                    accept('error', 'Invalid relation, expected to have source defined or be inside the element', {
-                        node: el,
-                        keyword: '->'
-                    });
-                }
-                else {
-                    sourceEl = el.$container.$container;
-                }
-            }
-            const source = sourceEl && fqnIndex.getFqn(sourceEl);
-            if (sourceEl && !source) {
-                accept('error', 'Source not found (not parsed/indexed yet)', {
-                    node: el,
-                    property: 'source'
-                });
-            }
-            if (source && target && isSameHierarchy(source, target)) {
-                return accept('error', 'Invalid parent-child relationship', {
-                    node: el
-                });
-            }
+  const fqnIndex = services.likec4.FqnIndex;
+  return (el, accept) => {
+    try {
+      const targetEl = elementRef(el.target);
+      const target = targetEl && fqnIndex.getFqn(targetEl);
+      if (!target) {
+        accept("error", "Target not found (not parsed/indexed yet)", {
+          node: el,
+          property: "target"
+        });
+      }
+      let sourceEl;
+      if ("source" in el) {
+        sourceEl = elementRef(el.source);
+      } else {
+        if (!ast.isElementBody(el.$container)) {
+          accept("error", "Invalid relation, expected to have source defined or be inside the element", {
+            node: el,
+            keyword: "->"
+          });
+        } else {
+          sourceEl = el.$container.$container;
         }
-        catch (e) {
-            logError(e);
-        }
-    };
+      }
+      const source = sourceEl && fqnIndex.getFqn(sourceEl);
+      if (sourceEl && !source) {
+        accept("error", "Source not found (not parsed/indexed yet)", {
+          node: el,
+          property: "source"
+        });
+      }
+      if (source && target && isSameHierarchy(source, target)) {
+        return accept("error", "Invalid parent-child relationship", {
+          node: el
+        });
+      }
+    } catch (e) {
+      logError(e);
+    }
+  };
 };
-//# sourceMappingURL=relation.js.map

package/dist/validation/specification.d.ts

@@ -1,6 +1,4 @@
-import type { ValidationCheck } from 'langium';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare const elementKindChecks: (services: LikeC4Services) => ValidationCheck<ast.ElementKind>;
 export declare const tagChecks: (services: LikeC4Services) => ValidationCheck<ast.Tag>;
-//# sourceMappingURL=specification.d.ts.map

package/dist/validation/specification.js

@@ -1,34 +1,25 @@
-import { ast } from '../ast';
+import { ast } from "../ast.js";
 export const elementKindChecks = (services) => {
-    const index = services.shared.workspace.IndexManager;
-    return (node, accept) => {
-        const sameKinds = index
-            .allElements(ast.ElementKind)
-            .filter(n => n.name === node.name)
-            .limit(2)
-            .count();
-        if (sameKinds > 1) {
-            accept('error', `Duplicate element kind '${node.name}'`, {
-                node: node,
-                property: 'name'
-            });
-        }
-    };
+  const index = services.shared.workspace.IndexManager;
+  return (node, accept) => {
+    const sameKinds = index.allElements(ast.ElementKind).filter((n) => n.name === node.name).limit(2).count();
+    if (sameKinds > 1) {
+      accept("error", `Duplicate element kind '${node.name}'`, {
+        node,
+        property: "name"
+      });
+    }
+  };
 };
 export const tagChecks = (services) => {
-    const index = services.shared.workspace.IndexManager;
-    return (node, accept) => {
-        const sameKinds = index
-            .allElements(ast.Tag)
-            .filter(n => n.name === node.name)
-            .limit(2)
-            .count();
-        if (sameKinds > 1) {
-            accept('error', `Duplicate tag '${node.name}'`, {
-                node: node,
-                property: 'name'
-            });
-        }
-    };
+  const index = services.shared.workspace.IndexManager;
+  return (node, accept) => {
+    const sameKinds = index.allElements(ast.Tag).filter((n) => n.name === node.name).limit(2).count();
+    if (sameKinds > 1) {
+      accept("error", `Duplicate tag '${node.name}'`, {
+        node,
+        property: "name"
+      });
+    }
+  };
 };
-//# sourceMappingURL=specification.js.map

package/dist/validation/view.d.ts

@@ -1,5 +1,3 @@
-import type { ValidationCheck } from 'langium';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare const viewChecks: (services: LikeC4Services) => ValidationCheck<ast.ElementView>;
-//# sourceMappingURL=view.d.ts.map

package/dist/validation/view.js

@@ -1,24 +1,18 @@
-import { ast } from '../ast';
+import { ast } from "../ast.js";
 export const viewChecks = (services) => {
-    const index = services.shared.workspace.IndexManager;
-    return (el, accept) => {
-        if (el.extends) {
-            // TODO: circular dependency check
-        }
-        if (!el.name) {
-            return;
-        }
-        const anotherViews = index
-            .allElements(ast.View)
-            .filter(n => n.name === el.name)
-            .limit(2)
-            .count();
-        if (anotherViews > 1) {
-            accept('error', `Duplicate view '${el.name}'`, {
-                node: el,
-                property: 'name'
-            });
-        }
-    };
+  const index = services.shared.workspace.IndexManager;
+  return (el, accept) => {
+    if (el.extends) {
+    }
+    if (!el.name) {
+      return;
+    }
+    const anotherViews = index.allElements(ast.View).filter((n) => n.name === el.name).limit(2).count();
+    if (anotherViews > 1) {
+      accept("error", `Duplicate view '${el.name}'`, {
+        node: el,
+        property: "name"
+      });
+    }
+  };
 };
-//# sourceMappingURL=view.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.37.1",
+  "version": "0.40.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -20,21 +20,26 @@
     "directory": "packages/language-server"
   },
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
   },
   "scripts": {
-    "turbo-build": "run -T turbo run build --filter='language-server'",
-    "turbo-compile": "run -T turbo run compile --filter='language-server'",
-    "compile": "tsc --noEmit",
+    "typecheck:turbo": "run -T turbo run typecheck --filter='language-server'",
+    "typecheck": "tsc --emitDeclarationOnly",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
     "generate": "langium generate",
-    "build": "tsc",
+    "prepack": "run clean && run build",
+    "build:watch": "run-p 'watch:*'",
+    "build:turbo": "run -T turbo run build --filter='language-server'",
+    "build": "unbuild",
     "dev": "run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
     "clean": "run -T rimraf dist contrib",
@@ -42,12 +47,13 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.37.1",
+    "@likec4/core": "0.40.0",
     "langium": "^2.0.2",
-    "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
+    "p-debounce": "^4.0.0",
+    "p-throttle": "^5.1.0",
     "rambdax": "^9.1.1",
-    "remeda": "^1.24.0",
+    "remeda": "^1.27.0",
     "strip-indent": "^4.0.0",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3",
@@ -55,11 +61,12 @@
   },
   "devDependencies": {
     "@types/node": "^18.15.11",
-    "@types/object-hash": "^3.0.2",
+    "@types/object-hash": "^3.0.4",
     "langium-cli": "^2.0.1",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.4"
+    "unbuild": "^2.0.0",
+    "vitest": "^0.34.6"
   },
   "packageManager": "yarn@3.6.3"
 }

package/contrib/likec4.monarch.ts

@@ -1,48 +0,0 @@
-// Monarch syntax highlighting for the likec4 language.
-export default {
-    keywords: [
-        'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','extends','gray','green','icon','include','indigo','it','kind','link','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
-    ],
-    operators: [
-        '*','.*'
-    ],
-    symbols: /\*|\.\*/,
-
-    tokenizer: {
-        initial: [
-            { regex: /#/, action: {"token":"HASH"} },
-            { regex: /_/, action: {"token":"UNDERSCORE"} },
-            { regex: /-/, action: {"token":"DASH"} },
-            { regex: /[^\W\d_]/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"LETTER"} }} },
-            { regex: /[0-9]/, action: {"token":"DIGIT"} },
-            { regex: /[\t\r\n\v\f]/, action: {"token":"NEWLINE"} },
-            { regex: /\w+:\/\/\S+/, action: {"token":"URI_WITH_SCHEMA"} },
-            { regex: /\.{0,2}\/[^\/]\S+/, action: {"token":"URI_RELATIVE"} },
-            { regex: /->/, action: {"token":"RARROW"} },
-            { regex: /\b\.\b/, action: {"token":"Dot"} },
-            { regex: /!=/, action: {"token":"NotEqual"} },
-            { regex: /=/, action: {"token":"Eq"} },
-            { regex: /\{/, action: {"token":"OpenBlock"} },
-            { regex: /\}/, action: {"token":"CloseBlock"} },
-            { regex: /:/, action: {"token":"Colon"} },
-            { regex: /;/, action: {"token":"SemiColon"} },
-            { regex: /,/, action: {"token":"Comma"} },
-            { regex: /((#)([^\W\d_])(((([^\W\d_])|([0-9]))|(_))|(-))*)/, action: {"token":"TagID"} },
-            { regex: /((([^\W\d_])|(_))(((([^\W\d_])|([0-9]))|(_))|(-))*)/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"ID"} }} },
-            { regex: /"[^"]*"|'[^']*'/, action: {"token":"string"} },
-            { include: '@whitespace' },
-            { regex: /@symbols/, action: { cases: { '@operators': {"token":"operator"}, '@default': {"token":""} }} },
-        ],
-        whitespace: [
-            { regex: /[^\S\r\n]/, action: {"token":"white"} },
-            { regex: /(([\t\r\n\v\f])|([^\S\r\n]))+/, action: {"token":"white"} },
-            { regex: /\/\*/, action: {"token":"comment","next":"@comment"} },
-            { regex: /\/\/[^\n\r]*/, action: {"token":"comment"} },
-        ],
-        comment: [
-            { regex: /[^/\*]+/, action: {"token":"comment"} },
-            { regex: /\*\//, action: {"token":"comment","next":"@pop"} },
-            { regex: /[/\*]/, action: {"token":"comment"} },
-        ],
-    }
-};

package/contrib/likec4.tmLanguage.json

@@ -1,73 +0,0 @@
-{
-  "name": "likec4",
-  "scopeName": "source.likec4",
-  "fileTypes": [
-    ".c4",
-    ".likec4",
-    ".like-c4"
-  ],
-  "patterns": [
-    {
-      "include": "#comments"
-    },
-    {
-      "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|browser|color|cylinder|description|element|exclude|extend|extends|gray|green|icon|include|indigo|it|kind|link|mobile|model|muted|of|person|primary|queue|rectangle|red|secondary|shape|sky|slate|specification|storage|style|tag|technology|this|title|view|views)\\b"
-    },
-    {
-      "name": "string.quoted.double.likec4",
-      "begin": "\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "include": "#string-character-escape"
-        }
-      ]
-    },
-    {
-      "name": "string.quoted.single.likec4",
-      "begin": "'",
-      "end": "'",
-      "patterns": [
-        {
-          "include": "#string-character-escape"
-        }
-      ]
-    }
-  ],
-  "repository": {
-    "comments": {
-      "patterns": [
-        {
-          "name": "comment.block.likec4",
-          "begin": "/\\*",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.likec4"
-            }
-          },
-          "end": "\\*/",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.likec4"
-            }
-          }
-        },
-        {
-          "begin": "//",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.likec4"
-            }
-          },
-          "end": "(?=$)",
-          "name": "comment.line.likec4"
-        }
-      ]
-    },
-    "string-character-escape": {
-      "name": "constant.character.escape.likec4",
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
-    }
-  }
-}

package/dist/registerProtocolHandlers.d.ts

@@ -1,3 +0,0 @@
-import type { LikeC4Services } from './module';
-export declare function registerProtocolHandlers(services: LikeC4Services): void;
-//# sourceMappingURL=registerProtocolHandlers.d.ts.map

package/dist/registerProtocolHandlers.js

@@ -1,112 +0,0 @@
-import { URI } from 'vscode-uri';
-import { logger, logError } from './logger';
-import { Rpc } from './protocol';
-import { nonexhaustive } from '@likec4/core';
-import { isLikeC4LangiumDocument } from './ast';
-export function registerProtocolHandlers(services) {
-    const connection = services.shared.lsp.Connection;
-    if (!connection) {
-        return;
-    }
-    const modelBuilder = services.likec4.ModelBuilder;
-    const modelLocator = services.likec4.ModelLocator;
-    const LangiumDocuments = services.shared.workspace.LangiumDocuments;
-    connection.onRequest(Rpc.fetchModel, async (_cancelToken) => {
-        let model;
-        try {
-            model = modelBuilder.buildModel() ?? null;
-        }
-        catch (e) {
-            model = null;
-            logError(e);
-        }
-        return Promise.resolve({ model });
-    });
-    connection.onRequest(Rpc.fetchRawModel, async (_cancelToken) => {
-        let rawmodel;
-        try {
-            rawmodel = modelBuilder.buildRawModel() ?? null;
-        }
-        catch (e) {
-            rawmodel = null;
-            logError(e);
-        }
-        return Promise.resolve({ rawmodel });
-    });
-    connection.onRequest(Rpc.computeView, ({ viewId }) => {
-        return {
-            view: modelBuilder.computeView(viewId)
-        };
-    });
-    connection.onRequest(Rpc.rebuild, async (cancelToken) => {
-        const changed = LangiumDocuments.all
-            .map(d => {
-            // clean up any computed properties
-            if (isLikeC4LangiumDocument(d)) {
-                delete d.c4Specification;
-                delete d.c4Elements;
-                delete d.c4Relations;
-                delete d.c4Views;
-                delete d.c4fqns;
-            }
-            return d.uri;
-        })
-            .toArray();
-        logger.debug(`[ProtocolHandlers] rebuild all documents: [
-      ${changed.map(d => d.toString()).join('\n      ')}
-    ]`);
-        await services.shared.workspace.DocumentBuilder.update(changed, [], cancelToken);
-        return {
-            docs: changed.map(d => d.toString())
-        };
-    });
-    connection.onRequest(Rpc.buildDocuments, async ({ docs }, cancelToken) => {
-        if (docs.length === 0) {
-            logger.debug(`[ProtocolHandlers] received empty request to rebuild`);
-            return;
-        }
-        logger.debug(`[ProtocolHandlers] received request to buildDocuments:
-  - ${docs.join('\n  - ')}`);
-        const changed = [];
-        for (const d of docs) {
-            try {
-                const uri = URI.parse(d);
-                if (LangiumDocuments.hasDocument(uri)) {
-                    changed.push(uri);
-                }
-                else {
-                    logger.warn(`LangiumDocuments does not have document: ${d}`);
-                    LangiumDocuments.getOrCreateDocument(uri);
-                }
-            }
-            catch (e) {
-                logError(e);
-            }
-        }
-        if (changed.length !== docs.length) {
-            const all = LangiumDocuments.all.map(d => d.uri.toString()).toArray();
-            logger.warn(`
-We have in LangiumDocuments: [
-  ${all.join('\n  ')}
-]
-We rebuild: [
-  ${changed.join('\n  ')}
-]
-`.trim());
-        }
-        await services.shared.workspace.DocumentBuilder.update(changed, [], cancelToken);
-    });
-    connection.onRequest(Rpc.locate, params => {
-        if ('element' in params) {
-            return modelLocator.locateElement(params.element, params.property ?? 'name');
-        }
-        if ('relation' in params) {
-            return modelLocator.locateRelation(params.relation);
-        }
-        if ('view' in params) {
-            return modelLocator.locateView(params.view);
-        }
-        nonexhaustive(params);
-    });
-}
-//# sourceMappingURL=registerProtocolHandlers.js.map