@likec4/language-server 1.31.0 → 1.32.1

package/dist/LikeC4LanguageServices.d.ts

@@ -1,4 +1,5 @@
-import { type DiagramView, type NonEmptyArray, type ProjectId, LikeC4Model } from '@likec4/core';
+import { type DiagramView, type NonEmptyArray, type ProjectId } from '@likec4/core';
+import { LikeC4Model } from '@likec4/core/model';
 import { URI } from 'langium';
 import { type Range } from 'vscode-languageserver-types';
 import type { ProjectConfig } from './config';

package/dist/LikeC4LanguageServices.js

@@ -1,4 +1,5 @@
-import { LikeC4Model, nonexhaustive } from "@likec4/core";
+import { nonexhaustive } from "@likec4/core";
+import { LikeC4Model } from "@likec4/core/model";
 import { loggable } from "@likec4/log";
 import { URI } from "langium";
 import { entries, hasAtLeast, indexBy, map, pipe, prop } from "remeda";
@@ -74,8 +75,8 @@ export class DefaultLikeC4LanguageServices {
     }
     const diagrams = await this.views.diagrams(projectId);
     return LikeC4Model.create({
-      ...parsed,
-      __: "layouted",
+      ...parsed.$data,
+      _stage: "layouted",
       views: indexBy(diagrams, prop("id"))
     });
   }

package/dist/Rpc.js

@@ -1,9 +1,9 @@
 import { filter, flatMap, funnel, indexBy, keys, map, mapValues, pipe, sort } from "remeda";
 import { logger as rootLogger } from "./logger.js";
 import {
-  LikeC4Model,
   nonexhaustive
 } from "@likec4/core";
+import { LikeC4Model } from "@likec4/core/model";
 import { Disposable, interruptAndCheck, URI, UriUtils } from "langium";
 import { DiagnosticSeverity } from "vscode-languageserver";
 import {
@@ -16,6 +16,7 @@ import {
   FetchProjects,
   FetchTelemetryMetrics,
   FetchViewsFromAllProjects,
+  GetDocumentTags,
   LayoutView,
   Locate,
   ValidateLayout
@@ -84,8 +85,8 @@ export class Rpc extends ADisposable {
         const diagrams = await views.diagrams(projectId, cancelToken);
         return {
           model: {
-            ...model,
-            __: "layouted",
+            ...model.$data,
+            _stage: "layouted",
             views: indexBy(diagrams, (d) => d.id)
           }
         };
@@ -196,7 +197,7 @@ export class Rpc extends ADisposable {
           return {
             elementKinds: keys(model.$model.specification.elements).length,
             relationshipKinds: keys(model.$model.specification.relationships).length,
-            tags: model.$model.specification.tags.length,
+            tags: keys(model.$model.specification.tags ?? {}).length,
             elements: keys(model.$model.elements).length,
             relationships: keys(model.$model.relations).length,
             views: keys(model.$model.views).length,
@@ -219,6 +220,12 @@ export class Rpc extends ADisposable {
           metrics
         };
       }),
+      connection.onRequest(GetDocumentTags.req, async ({ documentUri }, cancelToken) => {
+        const tags = await modelLocator.locateDocumentTags(URI.parse(documentUri), cancelToken);
+        return {
+          tags
+        };
+      }),
       Disposable.create(() => {
         notifyModelParsed.cancel();
       })

package/dist/ast.d.ts

@@ -48,12 +48,11 @@ export type ParsedElementStyle = {
     textSize?: c4.TextSize;
 };
 export interface ParsedAstSpecification {
-    tags: Set<c4.Tag>;
-    elements: Record<c4.ElementKind, {
-        technology?: string;
-        notation?: string;
-        style: ParsedElementStyle;
+    tags: Record<c4.Tag, {
+        astPath: string;
+        color?: c4.ColorLiteral;
     }>;
+    elements: Record<c4.ElementKind, c4.ElementSpecification>;
     relationships: Record<c4.RelationshipKind, {
         technology?: string;
         notation?: string;
@@ -63,9 +62,9 @@ export interface ParsedAstSpecification {
         tail?: c4.RelationshipArrowType;
     }>;
     colors: Record<c4.CustomColor, {
-        color: c4.HexColorLiteral;
+        color: c4.ColorLiteral;
     }>;
-    deployments: Record<c4.DeploymentNodeKind, c4.DeploymentNodeKindSpecification>;
+    deployments: Record<c4.DeploymentKind, c4.ElementSpecification>;
 }
 export interface ParsedAstElement {
     id: c4.Fqn;
@@ -93,8 +92,8 @@ export interface ParsedAstExtend {
 export interface ParsedAstRelation {
     id: c4.RelationId;
     astPath: string;
-    source: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
-    target: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
+    source: c4.FqnRef.ModelRef;
+    target: c4.FqnRef.ModelRef;
     kind?: c4.RelationshipKind;
     tags?: c4.NonEmptyArray<c4.Tag>;
     title: string;
@@ -114,15 +113,14 @@ export type ParsedAstDeployment = Simplify<MergeExclusive<ParsedAstDeployment.No
 export declare namespace ParsedAstDeployment {
     type Node = c4.DeploymentNode;
     type Instance = Omit<c4.DeployedInstance, 'element'> & {
-        readonly element: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
+        readonly element: c4.FqnRef.ModelRef;
     };
 }
-export type ParsedAstDeploymentRelation = c4.DeploymentRelation & {
+export type ParsedAstDeploymentRelation = c4.DeploymentRelationship & {
     astPath: string;
 };
 export type ParsedAstGlobals = Writable<c4.ModelGlobals>;
 export interface ParsedAstElementView {
-    __: 'element';
     id: c4.ViewId;
     viewOf?: c4.Fqn;
     extends?: c4.ViewId;
@@ -131,11 +129,10 @@ export interface ParsedAstElementView {
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
     links: c4.NonEmptyArray<c4.Link> | null;
-    rules: c4.ViewRule[];
+    rules: c4.ElementViewRule[];
     manualLayout?: c4.ViewManualLayout;
 }
 export interface ParsedAstDynamicView {
-    __: 'dynamic';
     id: c4.ViewId;
     astPath: string;
     title: string | null;
@@ -147,7 +144,6 @@ export interface ParsedAstDynamicView {
     manualLayout?: c4.ViewManualLayout;
 }
 export interface ParsedAstDeploymentView {
-    __: 'deployment';
     id: c4.ViewId;
     astPath: string;
     title: string | null;
@@ -193,6 +189,7 @@ export interface ParsedLikeC4LangiumDocument extends LikeC4GrammarDocument, Requ
 }
 export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is ParsedLikeC4LangiumDocument;
+export declare function parseAstPercent(value: string): number;
 export declare function parseAstOpacityProperty({ value }: ast.OpacityProperty): number;
 export declare function parseAstSizeValue({ value }: {
     value: ast.SizeValue;

package/dist/ast.js

@@ -33,10 +33,13 @@ export function isLikeC4LangiumDocument(doc) {
 export function isParsedLikeC4LangiumDocument(doc) {
   return isLikeC4LangiumDocument(doc) && doc.state == DocumentState.Validated && !!doc.c4Specification && !!doc.c4Elements && !!doc.c4ExtendElements && !!doc.c4ExtendDeployments && !!doc.c4Relations && !!doc.c4Views && !!doc.c4Deployments && !!doc.c4DeploymentRelations && !!doc.c4Imports;
 }
-export function parseAstOpacityProperty({ value }) {
+export function parseAstPercent(value) {
   const opacity = parseFloat(value);
   return isNaN(opacity) ? 100 : clamp(opacity, { min: 0, max: 100 });
 }
+export function parseAstOpacityProperty({ value }) {
+  return parseAstPercent(value);
+}
 export function parseAstSizeValue({ value }) {
   switch (value) {
     case "xs":