@likec4/language-server 1.27.3 → 1.28.1

package/dist/LikeC4LanguageServices.js

@@ -26,11 +26,11 @@ export class DefaultLikeC4LanguageServices {
       entries(),
       map(([projectId, docs]) => {
         const id = projectId;
-        const { folder, config } = projectsManager.getProject(id);
+        const { folder: folder2, config: config2 } = projectsManager.getProject(id);
         return {
           id,
-          folder,
-          config,
+          folder: folder2,
+          config: config2,
           documents: map(docs, prop("uri"))
         };
       })
@@ -38,12 +38,11 @@ export class DefaultLikeC4LanguageServices {
     if (hasAtLeast(projectsWithDocs, 1)) {
       return projectsWithDocs;
     }
+    const { folder, config } = projectsManager.getProject(ProjectsManager.DefaultProjectId);
     return [{
       id: ProjectsManager.DefaultProjectId,
-      folder: this.services.shared.workspace.WorkspaceManager.workspaceUri,
-      config: {
-        name: "default"
-      },
+      folder,
+      config,
       documents: null
     }];
   }

package/dist/ast.d.ts

@@ -1,12 +1,12 @@
 import type * as c4 from '@likec4/core';
+import { MultiMap } from '@likec4/core';
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument } from 'langium';
-import type { ConditionalPick, ValueOf, Writable } from 'type-fest';
+import type { ConditionalPick, MergeExclusive, Simplify, ValueOf, Writable } from 'type-fest';
 import type { Diagnostic } from 'vscode-languageserver-types';
 import type { LikeC4Grammar } from './generated/ast';
 import * as ast from './generated/ast';
 import type { IsValidFn } from './validation';
 export { ast };
-declare const idattr: unique symbol;
 declare module 'langium' {
     interface LangiumDocument {
         likec4ProjectId?: c4.ProjectId;
@@ -15,6 +15,7 @@ declare module 'langium' {
         likec4ProjectId?: c4.ProjectId;
     }
 }
+declare const idattr: unique symbol;
 declare module './generated/ast' {
     interface Element {
         [idattr]?: c4.Fqn | undefined;
@@ -35,7 +36,7 @@ declare module './generated/ast' {
         [idattr]?: c4.Fqn | undefined;
     }
 }
-type ParsedElementStyle = {
+export type ParsedElementStyle = {
     shape?: c4.ElementShape;
     icon?: c4.IconUrl;
     color?: c4.Color;
@@ -92,8 +93,8 @@ export interface ParsedAstExtend {
 export interface ParsedAstRelation {
     id: c4.RelationId;
     astPath: string;
-    source: c4.Fqn;
-    target: c4.Fqn;
+    source: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
+    target: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
     kind?: c4.RelationshipKind;
     tags?: c4.NonEmptyArray<c4.Tag>;
     title: string;
@@ -109,10 +110,12 @@ export interface ParsedAstRelation {
         [key: string]: string;
     };
 }
-export type ParsedAstDeployment = c4.DeploymentElement;
+export type ParsedAstDeployment = Simplify<MergeExclusive<ParsedAstDeployment.Node, ParsedAstDeployment.Instance>>;
 export declare namespace ParsedAstDeployment {
     type Node = c4.DeploymentNode;
-    type Instance = c4.DeployedInstance;
+    type Instance = Omit<c4.DeployedInstance, 'element'> & {
+        readonly element: c4.FqnRef.ModelRef | c4.FqnRef.ImportRef;
+    };
 }
 export type ParsedAstDeploymentRelation = c4.DeploymentRelation & {
     astPath: string;
@@ -163,6 +166,7 @@ export declare const ElementOps: {
     readId(node: ast.Element | ast.DeploymentElement): any;
 };
 export interface AstNodeDescriptionWithFqn extends AstNodeDescription {
+    likec4ProjectId: c4.ProjectId;
     id: c4.Fqn;
 }
 export type LikeC4AstNode = ValueOf<ConditionalPick<ast.LikeC4AstType, AstNode>>;
@@ -178,6 +182,7 @@ export interface LikeC4DocumentProps {
     c4Views?: ParsedAstView[];
     c4Deployments?: ParsedAstDeployment[];
     c4DeploymentRelations?: ParsedAstDeploymentRelation[];
+    c4Imports?: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
 }
 type LikeC4GrammarDocument = Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>;
 export interface LikeC4LangiumDocument extends LikeC4GrammarDocument, LikeC4DocumentProps {
@@ -192,7 +197,6 @@ export declare function parseAstOpacityProperty({ value }: ast.OpacityProperty):
 export declare function parseAstSizeValue({ value }: {
     value: ast.SizeValue;
 }): 'xs' | 'sm' | 'md' | 'lg' | 'xl';
-export declare function toElementStyle(props: Array<ast.StyleProperty> | undefined, isValid: IsValidFn): ParsedElementStyle;
 export declare function toRelationshipStyle(props: ast.RelationshipStyleProperty[] | undefined, isValid: IsValidFn): {
     color?: c4.Color;
     line?: c4.RelationshipLineType;
@@ -208,4 +212,7 @@ export declare function toRelationshipStyleExcludeDefaults(props: ast.Specificat
 export declare function toColor(astNode: ast.ColorProperty): c4.Color | undefined;
 export declare function toAutoLayout(rule: ast.ViewRuleAutoLayout): c4.ViewRuleAutoLayout;
 export declare function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['direction']): ast.ViewLayoutDirection;
-export declare function elementExpressionFromPredicate(predicate: ast.ElementPredicate): ast.ElementExpression;
+export declare function getViewRulePredicateContainer<T extends AstNode>(el: T): ast.ViewRulePredicate | ast.DeploymentViewRulePredicate | ast.DynamicViewIncludePredicate | undefined;
+export declare function isFqnRefInsideGlobals(astNode: AstNode): boolean;
+export declare function isFqnRefInsideModel(astNode: AstNode): boolean;
+export declare function isFqnRefInsideDeployment(astNode: AstNode): boolean;

package/dist/ast.js

@@ -1,6 +1,6 @@
 import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from "@likec4/core";
-import { DocumentState } from "langium";
-import { clamp, isBoolean, isNullish, isTruthy } from "remeda";
+import { AstUtils, DocumentState } from "langium";
+import { clamp, isNullish, isTruthy } from "remeda";
 import * as ast from "./generated/ast.js";
 import { LikeC4LanguageMetaData } from "./generated/module.js";
 export { ast };
@@ -31,7 +31,7 @@ export function isLikeC4LangiumDocument(doc) {
   return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId;
 }
 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;
+  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 }) {
   const opacity = parseFloat(value);
@@ -59,74 +59,6 @@ export function parseAstSizeValue({ value }) {
       nonexhaustive(value);
   }
 }
-export function toElementStyle(props, isValid) {
-  const result = {};
-  if (!props || props.length === 0) {
-    return result;
-  }
-  for (const prop of props) {
-    if (!isValid(prop)) {
-      continue;
-    }
-    switch (true) {
-      case ast.isBorderProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.border = prop.value;
-        }
-        break;
-      }
-      case ast.isColorProperty(prop): {
-        const color = toColor(prop);
-        if (isTruthy(color)) {
-          result.color = color;
-        }
-        break;
-      }
-      case ast.isShapeProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.shape = prop.value;
-        }
-        break;
-      }
-      case ast.isIconProperty(prop): {
-        const icon = prop.libicon?.ref?.name ?? prop.value;
-        if (isTruthy(icon)) {
-          result.icon = icon;
-        }
-        break;
-      }
-      case ast.isOpacityProperty(prop): {
-        result.opacity = parseAstOpacityProperty(prop);
-        break;
-      }
-      case ast.isMultipleProperty(prop): {
-        result.multiple = isBoolean(prop.value) ? prop.value : false;
-        break;
-      }
-      case ast.isShapeSizeProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.size = parseAstSizeValue(prop);
-        }
-        break;
-      }
-      case ast.isPaddingSizeProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.padding = parseAstSizeValue(prop);
-        }
-        break;
-      }
-      case ast.isTextSizeProperty(prop): {
-        if (isTruthy(prop.value)) {
-          result.textSize = parseAstSizeValue(prop);
-        }
-        break;
-      }
-      default:
-        nonexhaustive(prop);
-    }
-  }
-  return result;
-}
 export function toRelationshipStyle(props, isValid) {
   const result = {};
   if (!props || props.length === 0) {
@@ -231,15 +163,62 @@ export function toAstViewLayoutDirection(c4) {
       nonexhaustive(c4);
   }
 }
-export function elementExpressionFromPredicate(predicate) {
-  if (ast.isElementExpression(predicate)) {
-    return predicate;
+export function getViewRulePredicateContainer(el) {
+  return AstUtils.getContainerOfType(
+    el,
+    (n) => {
+      return ast.isViewRulePredicate(n) || ast.isDeploymentViewRulePredicate(n) || ast.isDynamicViewIncludePredicate(n);
+    }
+  );
+}
+const _isModel = (astNode) => {
+  return ast.isModel(astNode) || ast.isElementBody(astNode) || ast.isExtendElementBody(astNode) || ast.isElementViewBody(astNode) || ast.isDynamicViewBody(astNode) || ast.isElementRef(astNode);
+};
+const _isDeployment = (astNode) => {
+  return ast.isModelDeployments(astNode) || ast.isDeploymentViewBody(astNode) || ast.isDeploymentNodeBody(astNode) || ast.isExtendDeploymentBody(astNode) || ast.isDeployedInstanceBody(astNode);
+};
+export function isFqnRefInsideGlobals(astNode) {
+  while (true) {
+    if (_isDeployment(astNode) || _isModel(astNode)) {
+      return false;
+    }
+    if (ast.isGlobals(astNode) || ast.isModelViews(astNode)) {
+      return true;
+    }
+    if (astNode.$container) {
+      astNode = astNode.$container;
+    } else {
+      return false;
+    }
   }
-  if (ast.isElementPredicateWhere(predicate)) {
-    return predicate.subject;
+}
+export function isFqnRefInsideModel(astNode) {
+  while (true) {
+    if (_isDeployment(astNode)) {
+      return false;
+    }
+    if (_isModel(astNode)) {
+      return true;
+    }
+    if (astNode.$container) {
+      astNode = astNode.$container;
+    } else {
+      return false;
+    }
   }
-  if (ast.isElementPredicateWith(predicate)) {
-    return elementExpressionFromPredicate(predicate.subject);
+}
+export function isFqnRefInsideDeployment(astNode) {
+  while (true) {
+    if (_isModel(astNode)) {
+      return false;
+    }
+    if (_isDeployment(astNode)) {
+      return true;
+    }
+    if (astNode.$container) {
+      astNode = astNode.$container;
+    } else {
+      return false;
+    }
   }
-  nonexhaustive(predicate);
 }