@likec4/language-server 0.48.0 → 0.50.0

package/dist/ast.js

@@ -47,11 +47,10 @@ export function cleanParsedModel(doc) {
     c4Relations: [],
     c4Views: []
   };
-  Object.assign(doc, props);
-  return doc;
+  return Object.assign(doc, props);
 }
 export function isFqnIndexedDocument(doc) {
-  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
+  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqns;
 }
 export function isLikeC4LangiumDocument(doc) {
   return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId;

package/dist/lsp/DocumentLinkProvider.d.ts

@@ -5,5 +5,6 @@ export declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider
     private services;
     constructor(services: LikeC4Services);
     getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams): MaybePromise<DocumentLink[]>;
+    resolveLink(doc: LangiumDocument, link: string): string;
 }
 //# sourceMappingURL=DocumentLinkProvider.d.ts.map

package/dist/lsp/DocumentLinkProvider.js

@@ -1,4 +1,5 @@
 import { findNodeForProperty, streamAllContents } from "langium";
+import { hasProtocol, isRelative, withBase } from "ufo";
 import { ast, isParsedLikeC4LangiumDocument } from "../ast.js";
 import { logError } from "../logger.js";
 export class LikeC4DocumentLinkProvider {
@@ -9,17 +10,16 @@ export class LikeC4DocumentLinkProvider {
     if (!isParsedLikeC4LangiumDocument(doc)) {
       return [];
     }
-    const base = new URL(doc.uri.toString());
     return streamAllContents(doc.parseResult.value).filter(ast.isLinkProperty).flatMap((n) => {
       try {
-        const u = new URL(n.value, base);
-        const valueCst = findNodeForProperty(n.$cstNode, "value");
-        if (!valueCst) {
+        const range = findNodeForProperty(n.$cstNode, "value")?.range;
+        if (!range) {
           return [];
         }
+        const target = this.resolveLink(doc, n.value);
         return {
-          range: valueCst.range,
-          target: u.toString()
+          range,
+          target
         };
       } catch (e) {
         logError(e);
@@ -27,4 +27,15 @@ export class LikeC4DocumentLinkProvider {
       }
     }).toArray();
   }
+  resolveLink(doc, link) {
+    if (hasProtocol(link)) {
+      return link;
+    }
+    if (isRelative(link)) {
+      const base = new URL(doc.uri.toString(true));
+      return new URL(link, base).toString();
+    }
+    const workspace = this.services.shared.workspace.WorkspaceManager.workspaceURL;
+    return withBase(link, workspace.toString());
+  }
 }

package/dist/lsp/DocumentLinkProvider.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=DocumentLinkProvider.test.d.ts.map

package/dist/lsp/DocumentLinkProvider.test.js

@@ -0,0 +1,54 @@
+import { beforeAll, describe, expect, it, vi } from "vitest";
+import { createTestServices } from "../test/index.js";
+vi.mock("../logger");
+describe("DocumentLinkProvider", () => {
+  let services;
+  let doc;
+  let documentLinkProvider;
+  beforeAll(async () => {
+    const test = createTestServices("vscode-vfs://host/virtual");
+    services = test.services;
+    documentLinkProvider = services.lsp.DocumentLinkProvider;
+    doc = await test.parse(
+      `
+      specification {
+        element component
+      }
+    `,
+      "dir1/doc.c4"
+    );
+  });
+  it("test should have correct doc uri and workspace uri", () => {
+    expect(services.shared.workspace.WorkspaceManager.workspaceUri.toString()).toBe(
+      "vscode-vfs://host/virtual"
+    );
+    expect(services.shared.workspace.WorkspaceManager.workspaceURL.toString()).toBe(
+      "vscode-vfs://host/virtual"
+    );
+    expect(doc.uri.toString()).toBe("vscode-vfs://host/virtual/src/dir1/doc.c4");
+  });
+  it("should return the link unchanged if it has a protocol", () => {
+    const link = "http://example.com/link";
+    expect(documentLinkProvider.resolveLink(doc, link)).toBe(link);
+  });
+  it("should resolve a relative link against the document URI", () => {
+    const link = "./relative/link#fragment";
+    const expected = "vscode-vfs://host/virtual/src/dir1/relative/link#fragment";
+    expect(documentLinkProvider.resolveLink(doc, link)).toBe(expected);
+  });
+  it("should resolve a parent relative link against the document URI", () => {
+    const link = "../dir2/link?query=1#L1=22";
+    const expected = "vscode-vfs://host/virtual/src/dir2/link?query=1#L1=22";
+    expect(documentLinkProvider.resolveLink(doc, link)).toBe(expected);
+  });
+  it("should resolve a link against the workspace URL", () => {
+    const link = "/root";
+    const expected = "vscode-vfs://host/virtual/root";
+    expect(documentLinkProvider.resolveLink(doc, link)).toBe(expected);
+  });
+  it("should resolve a link with quary and hash against the workspace URL", () => {
+    const link = "/root/a/b/c/link?query=1#L1=22";
+    const expected = "vscode-vfs://host/virtual/root/a/b/c/link?query=1#L1=22";
+    expect(documentLinkProvider.resolveLink(doc, link)).toBe(expected);
+  });
+});

package/dist/model/model-builder.js

@@ -11,10 +11,7 @@ import { isValidLikeC4LangiumDocument } from "../ast.js";
 import { logError, logWarnError, logger } from "../logger.js";
 import { printDocs } from "../utils.js";
 import { assignNavigateTo, resolveRelativePaths, resolveRulesExtendedViews } from "../view-utils/index.js";
-function isRelativeLink(link) {
-  return link.startsWith(".") || link.startsWith("/");
-}
-function buildModel(docs) {
+function buildModel(services, docs) {
   const c4Specification = {
     kinds: {},
     relationships: {}
@@ -23,9 +20,8 @@ function buildModel(docs) {
     Object.assign(c4Specification.kinds, spec.kinds), Object.assign(c4Specification.relationships, spec.relationships);
   });
   const resolveLinks = (doc, links) => {
-    const base = new URL(doc.uri.toString());
     return links.map(
-      (l) => isRelativeLink(l) ? new URL(l, base).toString() : l
+      (l) => services.lsp.DocumentLinkProvider.resolveLink(doc, l)
     );
   };
   const toModelElement = (doc) => {
@@ -190,7 +186,7 @@ ${printDocs(docs)}`);
         }
         logger.debug(`[ModelBuilder] buildModel from ${docs.length} docs:
 ${printDocs(docs)}`);
-        return buildModel(docs);
+        return buildModel(this.services, docs);
       } catch (e) {
         logError(e);
         return null;

package/dist/model/model-parser.d.ts

@@ -1,6 +1,6 @@
 import { type c4 } from '@likec4/core';
 import type { LangiumDocument } from 'langium';
-import type { LikeC4LangiumDocument, ParsedLikeC4LangiumDocument } from '../ast';
+import type { FqnIndexedDocument, ParsedLikeC4LangiumDocument } from '../ast';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export type ModelParsedListener = () => void;
@@ -9,7 +9,7 @@ export declare class LikeC4ModelParser {
     private fqnIndex;
     constructor(services: LikeC4Services);
     parse(doc: LangiumDocument | LangiumDocument[]): ParsedLikeC4LangiumDocument[];
-    protected parseLikeC4Document(_doc: LikeC4LangiumDocument): ParsedLikeC4LangiumDocument;
+    protected parseLikeC4Document(_doc: FqnIndexedDocument): ParsedLikeC4LangiumDocument;
     private parseSpecification;
     private parseModel;
     private parseElement;

package/dist/model/model-parser.js

@@ -1,18 +1,13 @@
-import {
-  InvalidModelError,
-  invariant,
-  isNonEmptyArray,
-  nonexhaustive
-} from "@likec4/core";
+import { InvalidModelError, invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
 import { getDocument } from "langium";
 import objectHash from "object-hash";
+import { isTruthy } from "remeda";
 import stripIndent from "strip-indent";
 import {
   ElementViewOps,
   ast,
   cleanParsedModel,
   isFqnIndexedDocument,
-  isLikeC4LangiumDocument,
   resolveRelationPoints,
   streamModel,
   toAutoLayout,
@@ -22,7 +17,6 @@ import {
 } from "../ast.js";
 import { elementRef, getFqnElementRef } from "../elementRef.js";
 import { logError, logWarnError, logger } from "../logger.js";
-import { isTruthy } from "remeda";
 function toSingleLine(str) {
   return str?.split("\n").join(" ").trim();
 }
@@ -40,7 +34,8 @@ export class LikeC4ModelParser {
     const docs = Array.isArray(doc) ? doc : [doc];
     const result = [];
     for (const doc2 of docs) {
-      if (!isLikeC4LangiumDocument(doc2)) {
+      if (!isFqnIndexedDocument(doc2)) {
+        logger.warn(`Not a FqnIndexedDocument: ${doc2.uri.toString(true)}`);
         continue;
       }
       try {
@@ -52,7 +47,6 @@ export class LikeC4ModelParser {
     return result;
   }
   parseLikeC4Document(_doc) {
-    invariant(isFqnIndexedDocument(_doc), "Not a FqnIndexedDocument");
     const doc = cleanParsedModel(_doc);
     this.parseSpecification(doc);
     this.parseModel(doc);

package/dist/module.d.ts

@@ -1,7 +1,18 @@
 import { WorkspaceCache, type DefaultSharedModuleContext, type LangiumServices, type LangiumSharedServices, type Module, type PartialLangiumServices } from 'langium';
-import { LikeC4DocumentSymbolProvider } from './lsp';
-import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from './model';
 import { Rpc } from './Rpc';
+import { LikeC4DocumentLinkProvider, LikeC4DocumentSymbolProvider } from './lsp';
+import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from './model';
+import { LikeC4WorkspaceManager, NodeKindProvider, WorkspaceSymbolProvider } from './shared';
+interface LikeC4AddedSharedServices {
+    lsp: {
+        NodeKindProvider: NodeKindProvider;
+        WorkspaceSymbolProvider: WorkspaceSymbolProvider;
+    };
+    workspace: {
+        WorkspaceManager: LikeC4WorkspaceManager;
+    };
+}
+export type LikeC4SharedServices = LangiumSharedServices & LikeC4AddedSharedServices;
 /**
  * Declaration of custom services - add your own service classes here.
  */
@@ -15,14 +26,16 @@ export interface LikeC4AddedServices {
         ModelLocator: LikeC4ModelLocator;
     };
     lsp: {
+        DocumentLinkProvider: LikeC4DocumentLinkProvider;
         DocumentSymbolProvider: LikeC4DocumentSymbolProvider;
     };
+    shared?: LikeC4SharedServices;
 }
 export type LikeC4Services = LangiumServices & LikeC4AddedServices;
 export declare const LikeC4Module: Module<LikeC4Services, PartialLangiumServices & LikeC4AddedServices>;
 type LanguageServicesContext = Partial<DefaultSharedModuleContext>;
 export declare function createLanguageServices(context?: LanguageServicesContext): {
-    shared: LangiumSharedServices;
+    shared: LikeC4SharedServices;
     likec4: LikeC4Services;
 };
 export {};

package/dist/module.js

@@ -1,8 +1,14 @@
+import { serializeError } from "@likec4/core";
 import {
-  WorkspaceCache
+  EmptyFileSystem,
+  WorkspaceCache,
+  createDefaultModule,
+  createDefaultSharedModule,
+  inject
 } from "langium";
-import { EmptyFileSystem, createDefaultModule, createDefaultSharedModule, inject } from "langium";
+import { Rpc } from "./Rpc.js";
 import { LikeC4GeneratedModule, LikeC4GeneratedSharedModule } from "./generated/module.js";
+import { logger } from "./logger.js";
 import {
   LikeC4CodeLensProvider,
   LikeC4DocumentLinkProvider,
@@ -12,11 +18,17 @@ import {
 } from "./lsp/index.js";
 import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from "./model/index.js";
 import { LikeC4ScopeComputation, LikeC4ScopeProvider } from "./references/index.js";
-import { Rpc } from "./Rpc.js";
+import { LikeC4WorkspaceManager, NodeKindProvider, WorkspaceSymbolProvider } from "./shared/index.js";
 import { registerValidationChecks } from "./validation/index.js";
-import { logger } from "./logger.js";
-import { serializeError } from "@likec4/core";
-import { WorkspaceSymbolProvider, NodeKindProvider } from "./shared/index.js";
+const LikeC4SharedModule = {
+  lsp: {
+    NodeKindProvider: (services) => new NodeKindProvider(services),
+    WorkspaceSymbolProvider: (services) => new WorkspaceSymbolProvider(services)
+  },
+  workspace: {
+    WorkspaceManager: (services) => new LikeC4WorkspaceManager(services)
+  }
+};
 function bind(Type) {
   return (services) => new Type(services);
 }
@@ -41,15 +53,6 @@ export const LikeC4Module = {
     ScopeProvider: bind(LikeC4ScopeProvider)
   }
 };
-const LikeC4SharedModule = {
-  lsp: {
-    NodeKindProvider: (services) => new NodeKindProvider(services),
-    WorkspaceSymbolProvider: (services) => new WorkspaceSymbolProvider(services)
-  }
-  // workspace: {
-  //   WorkspaceManager: services => new LikeC4WorkspaceManager(services)
-  // }
-};
 export function createLanguageServices(context) {
   const connection = context?.connection;
   if (connection) {

package/dist/shared/WorkspaceManager.d.ts

@@ -1,6 +1,8 @@
+/// <reference types="node" />
 import type { LangiumDocument } from 'langium';
 import { DefaultWorkspaceManager } from 'langium';
 import type { WorkspaceFolder } from 'vscode-languageserver';
+import { URI } from 'vscode-uri';
 export declare class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
     /**
      * Load all additional documents that shall be visible in the context of the given workspace
@@ -9,5 +11,7 @@ export declare class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
      */
     protected loadAdditionalDocuments(_folders: WorkspaceFolder[], _collector: (document: LangiumDocument) => void): Promise<void>;
     workspace(): WorkspaceFolder | null;
+    get workspaceUri(): URI;
+    get workspaceURL(): import("url").URL;
 }
 //# sourceMappingURL=WorkspaceManager.d.ts.map

package/dist/shared/WorkspaceManager.js

@@ -1,5 +1,6 @@
-import { nonNullable } from "@likec4/core";
+import { hasAtLeast, invariant } from "@likec4/core";
 import { DefaultWorkspaceManager } from "langium";
+import { URI } from "vscode-uri";
 export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
   /**
    * Load all additional documents that shall be visible in the context of the given workspace
@@ -10,6 +11,19 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
     return Promise.resolve();
   }
   workspace() {
-    return this.folders && this.folders.length > 0 ? nonNullable(this.folders[0]) : null;
+    if (this.folders && hasAtLeast(this.folders, 1)) {
+      return this.folders[0];
+    }
+    return null;
+  }
+  get workspaceUri() {
+    const workspace = this.workspace();
+    invariant(workspace, "Workspace not initialized");
+    return URI.parse(workspace.uri);
+  }
+  get workspaceURL() {
+    const workspace = this.workspace();
+    invariant(workspace, "Workspace not initialized");
+    return new URL(workspace.uri);
   }
 }

package/dist/test/testServices.js

@@ -1,9 +1,9 @@
-import { createLanguageServices } from "../module.js";
 import { EmptyFileSystem } from "langium";
-import { URI, Utils } from "vscode-uri";
-import stripIndent from "strip-indent";
 import * as assert from "node:assert";
+import stripIndent from "strip-indent";
 import { DiagnosticSeverity } from "vscode-languageserver-protocol";
+import { URI, Utils } from "vscode-uri";
+import { createLanguageServices } from "../module.js";
 export function createTestServices(workspace = "file:///test/workspace") {
   const services = createLanguageServices(EmptyFileSystem).likec4;
   const metaData = services.LanguageMetaData;

package/dist/utils.js

@@ -1,4 +1,4 @@
-export const printDocs = (docs) => docs.map((d) => "  - " + d.uri).join("\n");
+export const printDocs = (docs) => docs.map((d) => "  - " + d.uri.toString(true)).join("\n");
 export function queueMicrotask(cb) {
   return Promise.resolve().then(cb);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.48.0",
+  "version": "0.50.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -50,27 +50,28 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.48.0",
-    "@likec4/graph": "0.48.0",
-    "langium": "^2.1.2",
+    "@likec4/core": "0.50.0",
+    "@likec4/graph": "0.50.0",
+    "langium": "^2.1.3",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "p-throttle": "^5.1.0",
     "rambdax": "^9.1.1",
     "remeda": "^1.29.0",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.8.1",
+    "type-fest": "^4.8.2",
+    "ufo": "^1.3.2",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@types/node": "^20.8.7",
+    "@types/node": "^20.10.1",
     "@types/object-hash": "^3.0.6",
     "execa": "^8.0.1",
     "langium-cli": "^2.1.0",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.2",
     "unbuild": "^2.0.0",
     "vitest": "^0.34.6"
   },