@likec4/language-server 1.23.1 → 1.24.1

package/dist/LikeC4FileSystem.d.ts

@@ -8,6 +8,7 @@ export declare const LikeC4FileSystem: {
  * @see https://github.com/likec4/likec4/pull/1213
  */
 declare class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
+    readFile(uri: URI): Promise<string>;
     readDirectory(folderPath: URI): Promise<FileSystemNode[]>;
 }
 export {};

package/dist/LikeC4FileSystem.js

@@ -2,12 +2,19 @@ import { fdir } from "fdir";
 import { URI } from "langium";
 import { NodeFileSystemProvider } from "langium/node";
 import { LikeC4LanguageMetaData } from "./generated/module.js";
+import { Content, isLikeC4Builtin } from "./likec4lib.js";
 import { logError } from "./logger.js";
 export const LikeC4FileSystem = {
   fileSystemProvider: () => new SymLinkTraversingFileSystemProvider()
 };
 const hasExtension = (path) => LikeC4LanguageMetaData.fileExtensions.some((ext) => path.endsWith(ext));
 class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
+  async readFile(uri) {
+    if (isLikeC4Builtin(uri)) {
+      return Promise.resolve(Content);
+    }
+    return await super.readFile(uri);
+  }
   async readDirectory(folderPath) {
     const entries = [];
     try {

package/dist/Rpc.js

@@ -1,10 +1,10 @@
 import { filter, funnel, map, pipe } from "remeda";
 import { logger } from "./logger.js";
-import { nonexhaustive } from "@likec4/core";
+import { LikeC4Model, nonexhaustive } from "@likec4/core";
 import { Disposable, interruptAndCheck, URI, UriUtils } from "langium";
 import { DiagnosticSeverity } from "vscode-languageserver";
 import { isLikeC4LangiumDocument } from "./ast.js";
-import { Scheme } from "./likec4lib.js";
+import { isLikeC4Builtin } from "./likec4lib.js";
 import {
   buildDocuments,
   changeView,
@@ -43,9 +43,8 @@ export class Rpc extends ADisposable {
         });
       },
       {
-        minQuietPeriodMs: 250,
-        maxBurstDurationMs: 1e3,
-        minGapMs: 200
+        triggerAt: "both",
+        minGapMs: 350
       }
     );
     let isFirstBuild = true;
@@ -53,14 +52,17 @@ export class Rpc extends ADisposable {
       modelBuilder.onModelParsed(() => notifyModelParsed.call()),
       connection.onRequest(fetchComputedModel, async ({ cleanCaches }, cancelToken) => {
         if (cleanCaches) {
-          this.services.WorkspaceCache.clear();
-          this.services.DocumentCache.clear();
+          const all = LangiumDocuments.all.map((d) => d.uri).toArray();
+          await DocumentBuilder.update(all, [], cancelToken);
         }
-        const model = await modelBuilder.buildComputedModel(cancelToken);
-        return { model };
+        const likec4model = await modelBuilder.buildLikeC4Model(cancelToken);
+        if (likec4model !== LikeC4Model.EMPTY) {
+          return { model: likec4model.$model };
+        }
+        return { model: null };
       }),
       connection.onRequest(fetchModel, async (cancelToken) => {
-        const model = await modelBuilder.buildModel(cancelToken);
+        const model = await modelBuilder.parseModel(cancelToken);
         return { model };
       }),
       connection.onRequest(computeView, async ({ viewId }, cancelToken) => {
@@ -79,7 +81,7 @@ export class Rpc extends ADisposable {
       connection.onRequest(buildDocuments, async ({ docs }, cancelToken) => {
         const changed = docs.map((d) => URI.parse(d));
         const notChanged = (uri) => changed.every((c) => !UriUtils.equals(c, uri));
-        const deleted = LangiumDocuments.all.filter((d) => isLikeC4LangiumDocument(d) && notChanged(d.uri) && d.uri.scheme !== Scheme).map((d) => d.uri).toArray();
+        const deleted = LangiumDocuments.all.toArray().filter((d) => !isLikeC4Builtin(d.uri) && isLikeC4LangiumDocument(d) && notChanged(d.uri)).map((d) => d.uri);
         logger.debug(
           `[ServerRpc] received request to build:
   changed (total ${changed.length}):${docs.map((d) => "\n    - " + d).join("")}

package/dist/ast.d.ts

@@ -1,6 +1,6 @@
 import type * as c4 from '@likec4/core';
-import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium';
-import type { ConditionalPick, SetRequired, ValueOf, Writable } from 'type-fest';
+import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument } from 'langium';
+import type { ConditionalPick, ValueOf, Writable } from 'type-fest';
 import type { Diagnostic } from 'vscode-languageserver-types';
 import type { LikeC4Grammar } from './generated/ast';
 import * as ast from './generated/ast';
@@ -66,17 +66,17 @@ export interface ParsedAstElement {
     description?: string;
     technology?: string;
     tags?: c4.NonEmptyArray<c4.Tag>;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     style: ParsedElementStyle;
     metadata?: {
         [key: string]: string;
     };
 }
-export interface ParsedAstExtendElement {
+export interface ParsedAstExtend {
     id: c4.Fqn;
     astPath: string;
     tags?: c4.NonEmptyArray<c4.Tag>;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     metadata?: {
         [key: string]: string;
     };
@@ -95,7 +95,7 @@ export interface ParsedAstRelation {
     line?: c4.RelationshipLineType;
     head?: c4.RelationshipArrowType;
     tail?: c4.RelationshipArrowType;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     navigateTo?: c4.ViewId;
     metadata?: {
         [key: string]: string;
@@ -119,7 +119,7 @@ export interface ParsedAstElementView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     rules: c4.ViewRule[];
     manualLayout?: c4.ViewManualLayout;
 }
@@ -130,7 +130,7 @@ export interface ParsedAstDynamicView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     steps: c4.DynamicViewStepOrParallel[];
     rules: Array<c4.DynamicViewRule>;
     manualLayout?: c4.ViewManualLayout;
@@ -142,7 +142,7 @@ export interface ParsedAstDeploymentView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     rules: Array<c4.DeploymentViewRule>;
 }
 export type ParsedAstView = ParsedAstElementView | ParsedAstDynamicView | ParsedAstDeploymentView;
@@ -150,19 +150,12 @@ export declare const ViewOps: {
     writeId<T extends ast.LikeC4View>(node: T, id: c4.ViewId): T;
     readId(node: ast.LikeC4View): c4.ViewId | undefined;
 };
-export interface ParsedLink {
-    title?: string;
-    url: string;
-}
 export declare const ElementOps: {
     writeId(node: ast.Element | ast.DeploymentElement, id: c4.Fqn | null): ast.DeploymentElement | ast.Element;
     readId(node: ast.Element | ast.DeploymentElement): any;
 };
-export interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
-    fqn: c4.Fqn;
-}
-export interface DeploymentAstNodeDescription extends AstNodeDescription {
-    fqn: string;
+export interface AstNodeDescriptionWithFqn extends AstNodeDescription {
+    id: c4.Fqn;
 }
 export type LikeC4AstNode = ValueOf<ConditionalPick<ast.LikeC4AstType, AstNode>>;
 type LikeC4DocumentDiagnostic = Diagnostic & DiagnosticInfo<LikeC4AstNode>;
@@ -170,30 +163,21 @@ export interface LikeC4DocumentProps {
     diagnostics?: Array<LikeC4DocumentDiagnostic>;
     c4Specification?: ParsedAstSpecification;
     c4Elements?: ParsedAstElement[];
-    c4ExtendElements?: ParsedAstExtendElement[];
+    c4ExtendElements?: ParsedAstExtend[];
+    c4ExtendDeployments?: ParsedAstExtend[];
     c4Relations?: ParsedAstRelation[];
     c4Globals?: ParsedAstGlobals;
     c4Views?: ParsedAstView[];
     c4Deployments?: ParsedAstDeployment[];
     c4DeploymentRelations?: ParsedAstDeploymentRelation[];
-    c4fqnIndex?: MultiMap<c4.Fqn, DocFqnIndexAstNodeDescription>;
 }
 type LikeC4GrammarDocument = Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>;
 export interface LikeC4LangiumDocument extends LikeC4GrammarDocument, LikeC4DocumentProps {
 }
-export interface FqnIndexedDocument extends SetRequired<LikeC4LangiumDocument, 'c4fqnIndex'> {
-}
 export interface ParsedLikeC4LangiumDocument extends LikeC4GrammarDocument, Required<LikeC4DocumentProps> {
 }
 export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
-export declare function isFqnIndexedDocument(doc: LangiumDocument): doc is FqnIndexedDocument;
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is ParsedLikeC4LangiumDocument;
-export declare function streamModel(doc: LikeC4LangiumDocument): Generator<any, void, unknown>;
-export declare function streamDeploymentModel(doc: LikeC4LangiumDocument): Generator<any, void, unknown>;
-export declare function resolveRelationPoints(node: ast.Relation): {
-    source: ast.Element;
-    target: ast.Element;
-};
 export declare function parseAstOpacityProperty({ value }: ast.OpacityProperty): number;
 export declare function parseAstSizeValue({ value }: {
     value: ast.SizeValue;

package/dist/ast.js

@@ -1,9 +1,8 @@
-import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, LinkedList, nonexhaustive } from "@likec4/core";
+import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from "@likec4/core";
 import { DocumentState } from "langium";
-import { clamp, isBoolean, isDefined, isNullish, isTruthy } from "remeda";
+import { clamp, isBoolean, isNullish, isTruthy } from "remeda";
 import * as ast from "./generated/ast.js";
 import { LikeC4LanguageMetaData } from "./generated/module.js";
-import { elementRef } from "./utils/elementRef.js";
 export { ast };
 const idattr = Symbol.for("idattr");
 export const ViewOps = {
@@ -31,74 +30,8 @@ export const ElementOps = {
 export function isLikeC4LangiumDocument(doc) {
   return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId;
 }
-export function isFqnIndexedDocument(doc) {
-  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqnIndex;
-}
 export function isParsedLikeC4LangiumDocument(doc) {
-  return isLikeC4LangiumDocument(doc) && doc.state == DocumentState.Validated && !!doc.c4Specification && !!doc.c4Elements && !!doc.c4ExtendElements && !!doc.c4Relations && !!doc.c4Views && !!doc.c4fqnIndex && !!doc.c4Deployments && !!doc.c4DeploymentRelations;
-}
-export function* streamModel(doc) {
-  const traverseStack = LinkedList.from(doc.parseResult.value.models.flatMap((m) => m.elements));
-  const relations = [];
-  let el;
-  while (el = traverseStack.shift()) {
-    if (ast.isRelation(el)) {
-      relations.push(el);
-      continue;
-    }
-    if (el.body && el.body.elements && el.body.elements.length > 0) {
-      for (const child of el.body.elements) {
-        traverseStack.push(child);
-      }
-    }
-    yield el;
-  }
-  yield* relations;
-  return;
-}
-export function* streamDeploymentModel(doc) {
-  const traverseStack = LinkedList.from(
-    doc.parseResult.value.deployments.flatMap((m) => m.elements)
-  );
-  const relations = [];
-  let el;
-  while (el = traverseStack.shift()) {
-    if (ast.isDeploymentRelation(el)) {
-      relations.push(el);
-      continue;
-    }
-    if (ast.isDeploymentNode(el) && el.body && el.body.elements.length > 0) {
-      for (const child of el.body.elements) {
-        traverseStack.push(child);
-      }
-    }
-    yield el;
-  }
-  yield* relations;
-  return;
-}
-export function resolveRelationPoints(node) {
-  const target = elementRef(node.target);
-  if (!target) {
-    throw new Error("RelationRefError: Invalid reference to target");
-  }
-  if (isDefined(node.source)) {
-    const source = elementRef(node.source);
-    if (!source) {
-      throw new Error("RelationRefError: Invalid reference to source");
-    }
-    return {
-      source,
-      target
-    };
-  }
-  if (!ast.isElementBody(node.$container)) {
-    throw new Error("RelationRefError: Invalid container for sourceless relation");
-  }
-  return {
-    source: node.$container.$container,
-    target
-  };
+  return isLikeC4LangiumDocument(doc) && doc.state == DocumentState.Validated && !!doc.c4Specification && !!doc.c4Elements && !!doc.c4ExtendElements && !!doc.c4ExtendDeployments && !!doc.c4Relations && !!doc.c4Views && !!doc.c4Deployments && !!doc.c4DeploymentRelations;
 }
 export function parseAstOpacityProperty({ value }) {
   const opacity = parseFloat(value);