@likec4/language-server 1.38.0 → 1.38.1

package/dist/model/builder/MergedSpecification.d.ts

@@ -12,7 +12,7 @@ export declare class MergedSpecification {
     readonly tags: Readonly<Record<c4.Tag, c4.TagSpecification>>;
     readonly globals: c4.ModelGlobals;
     readonly imports: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
-    constructor(docs: ParsedLikeC4LangiumDocument[]);
+    constructor(docs: ReadonlyArray<ParsedLikeC4LangiumDocument>);
     /**
      * Converts a parsed model into a C4 model element.
      */

package/dist/model/builder/buildModel.d.ts

@@ -18,4 +18,4 @@ export declare function buildModelData(project: {
     id: c4.ProjectId;
     folderUri: URI;
     config: Readonly<ProjectConfig>;
-}, docs: ParsedLikeC4LangiumDocument[]): BuildModelData;
+}, docs: ReadonlyArray<ParsedLikeC4LangiumDocument>): BuildModelData;

package/dist/workspace/LangiumDocuments.d.ts

@@ -1,10 +1,13 @@
 import type { NonEmptyArray, ProjectId } from '@likec4/core';
-import { type Stream, DefaultLangiumDocuments } from 'langium';
+import type { LangiumDocument, Stream } from 'langium';
+import { DefaultLangiumDocuments } from 'langium';
 import { type LikeC4LangiumDocument } from '../ast';
 import type { LikeC4SharedServices } from '../module';
 export declare class LangiumDocuments extends DefaultLangiumDocuments {
     protected services: LikeC4SharedServices;
+    protected compare: any;
     constructor(services: LikeC4SharedServices);
+    addDocument(document: LangiumDocument): void;
     /**
      * Returns all user documents, excluding built-in documents.
      */

package/dist/workspace/LangiumDocuments.js

@@ -1,12 +1,27 @@
+import { compareNaturalHierarchically } from "@likec4/core/utils";
 import { DefaultLangiumDocuments } from "langium";
 import { groupBy, prop } from "remeda";
 import { isLikeC4LangiumDocument } from "../ast.js";
 import { isLikeC4Builtin } from "../likec4lib.js";
+const compare = compareNaturalHierarchically("/", true);
+const ensureOrder = (a, b) => compare(a.uri.path, b.uri.path);
 export class LangiumDocuments extends DefaultLangiumDocuments {
   constructor(services) {
     super(services);
     this.services = services;
   }
+  compare = compareNaturalHierarchically("/", true);
+  addDocument(document) {
+    const uriString = document.uri.toString();
+    if (this.documentMap.has(uriString)) {
+      throw new Error(`A document with the URI '${uriString}' is already present.`);
+    }
+    const docs = [...this.documentMap.values(), document].sort(ensureOrder);
+    this.documentMap.clear();
+    for (const doc of docs) {
+      this.documentMap.set(doc.uri.toString(), doc);
+    }
+  }
   /**
    * Returns all user documents, excluding built-in documents.
    */

package/dist/workspace/ProjectsManager.d.ts

@@ -5,7 +5,7 @@ import type { Tagged } from 'type-fest';
 import { ProjectConfig } from '../config';
 import type { LikeC4SharedServices } from '../module';
 /**
- * A tagged string that represents a project folder.
+ * A tagged string that represents a project folder URI
  * Always has trailing slash.
  */
 export type ProjectFolder = Tagged<string, 'ProjectFolder'>;

package/dist/workspace/ProjectsManager.js

@@ -10,23 +10,26 @@ import PQueue from "p-queue";
 import picomatch from "picomatch";
 import { hasAtLeast, isNullish, isTruthy, map, pickBy, pipe, prop, sortBy } from "remeda";
 import {
-  hasProtocol,
   joinRelativeURL,
-  normalizeURL,
   parseFilename,
   withoutProtocol,
-  withProtocol,
   withTrailingSlash
 } from "ufo";
 import { parseConfigJson, validateConfig } from "../config/index.js";
 import { logger as mainLogger } from "../logger.js";
 const logger = mainLogger.getChild("ProjectsManager");
-export function ProjectFolder(folder) {
-  if (URI.isUri(folder)) {
-    folder = folder.toString();
+function normalizeUri(uri) {
+  if (URI.isUri(uri)) {
+    return uri.toString();
+  } else if (typeof uri === "string") {
+    return uri.startsWith("file://") ? uri : URI.file(uri).toString();
+  } else {
+    return uri.uri.toString();
   }
-  folder = hasProtocol(folder) ? folder : withProtocol(folder, "file://");
-  return withTrailingSlash(normalizeURL(folder));
+}
+export function ProjectFolder(folder) {
+  folder = normalizeUri(folder);
+  return withTrailingSlash(folder);
 }
 export class ProjectsManager {
   constructor(services) {
@@ -131,7 +134,7 @@ export class ProjectsManager {
   }
   checkIfExcluded(document) {
     if (typeof document === "string" || URI.isUri(document)) {
-      let docUriAsString = typeof document === "string" ? document : document.toString();
+      let docUriAsString = normalizeUri(document);
       const project = this.findProjectForDocument(docUriAsString);
       return project.exclude ? project.exclude(withoutProtocol(docUriAsString)) : false;
     }
@@ -244,14 +247,7 @@ ${loggable(error)}`
     return project;
   }
   belongsTo(document) {
-    let documentUri;
-    if (typeof document === "string") {
-      documentUri = hasProtocol(document) ? document : withProtocol(document, "file://");
-    } else if (URI.isUri(document)) {
-      documentUri = document.toString();
-    } else {
-      documentUri = document.uri.toString();
-    }
+    const documentUri = normalizeUri(document);
     return this.findProjectForDocument(documentUri).id;
   }
   async reloadProjects(token) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.38.0",
+  "version": "1.38.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -123,7 +123,7 @@
     "remeda": "^2.23.1",
     "strip-indent": "^4.0.0",
     "tsx": "4.20.3",
-    "turbo": "2.5.5",
+    "turbo": "2.5.6",
     "type-fest": "^4.41.0",
     "typescript": "5.9.2",
     "ufo": "1.6.1",
@@ -137,17 +137,17 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "3.25.67",
-    "@likec4/log": "1.38.0",
-    "@likec4/icons": "1.38.0",
-    "@likec4/core": "1.38.0",
-    "@likec4/tsconfig": "1.38.0",
-    "@likec4/layouts": "1.38.0"
+    "@likec4/core": "1.38.1",
+    "@likec4/layouts": "1.38.1",
+    "@likec4/tsconfig": "1.38.1",
+    "@likec4/icons": "1.38.1",
+    "@likec4/log": "1.38.1"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
     "build": "unbuild",
     "pack": "pnpm pack",
-    "pregenerate": "rm -f src/generated/*",
+    "pregenerate": "rm -f src/generated/* || true",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
     "generate": "langium generate && tsx scripts/generate-icons.ts",