xq-lsp 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.4.1](https://github.com/DrRataplan/xq-lsp/compare/lsp-v1.4.0...lsp-v1.4.1) (2026-06-10)
+
+
+### Bug Fixes
+
+* change the bin to the dist version ([e77944d](https://github.com/DrRataplan/xq-lsp/commit/e77944de7da857ac6ca9d3148b4a41abec175de4))
+* do not package testing snapshots to npm ([9638734](https://github.com/DrRataplan/xq-lsp/commit/963873401f3e4d74a9338c387bcfc3c3564f4f0d))
+* union multiple imports of modules ([1d77b65](https://github.com/DrRataplan/xq-lsp/commit/1d77b65b48933abfe20c6f0e9abd113c318f16b4))
+
+## [1.4.0](https://github.com/DrRataplan/xq-lsp/compare/lsp-v1.3.0...lsp-v1.4.0) (2026-05-28)
+
+
+### Features
+
+* **vscode:** bundle extension with esbuild, add smoke tests, fix release pipeline ([463e25d](https://github.com/DrRataplan/xq-lsp/commit/463e25d4289d092fb19ff7d6dd2b9bb10ba5a1fc))
+
 ## [1.3.0](https://github.com/DrRataplan/xq-lsp/compare/lsp-v1.2.0...lsp-v1.3.0) (2026-05-28)
 
 

package/dist/server.js

@@ -77,6 +77,13 @@ function getImportedAnalysis(importUri) {
         return null;
     }
 }
+function mergeAnalyses(a, b) {
+    return {
+        ...a,
+        functions: [...a.functions, ...b.functions],
+        moduleVariables: [...a.moduleVariables, ...b.moduleVariables],
+    };
+}
 function getGlobAnalyses(currentUri) {
     const found = findConfig(currentUri);
     if (!found)
@@ -90,8 +97,10 @@ function getGlobAnalyses(currentUri) {
     for (const filePath of expandGlobs(config.globs, configDir)) {
         const fileUri = pathToFileURL(filePath).toString();
         const imported = getImportedAnalysis(fileUri);
-        if (imported?.moduleNamespaceUri)
-            byNamespace.set(imported.moduleNamespaceUri, imported);
+        if (!imported?.moduleNamespaceUri)
+            continue;
+        const existing = byNamespace.get(imported.moduleNamespaceUri);
+        byNamespace.set(imported.moduleNamespaceUri, existing ? mergeAnalyses(existing, imported) : imported);
     }
     globAnalysesByConfigDir.set(configDir, byNamespace);
     return { byNamespace, lib };
@@ -103,7 +112,8 @@ function resolveImports(currentUri, analysis) {
     const runtimeByNamespace = new Map();
     for (const runtimeAnalysis of getRuntimeAnalyses(lib)) {
         if (runtimeAnalysis.moduleNamespaceUri) {
-            runtimeByNamespace.set(runtimeAnalysis.moduleNamespaceUri, runtimeAnalysis);
+            const existing = runtimeByNamespace.get(runtimeAnalysis.moduleNamespaceUri);
+            runtimeByNamespace.set(runtimeAnalysis.moduleNamespaceUri, existing ? mergeAnalyses(existing, runtimeAnalysis) : runtimeAnalysis);
         }
     }
     for (const imp of analysis.imports) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xq-lsp",
-	"version": "1.3.0",
+	"version": "1.4.1",
 	"description": "XQuery Language Server Protocol implementation",
 	"license": "MIT",
 	"author": "Martin Middel",
@@ -11,7 +11,7 @@
 		"url": "git+https://github.com/DrRataplan/xq-lsp.git"
 	},
 	"bin": {
-		"xq-lsp": "src/server.ts"
+		"xq-lsp": "dist/server.js"
 	},
 	"scripts": {
 		"build": "tsc",

package/src/server.ts

@@ -102,6 +102,14 @@ function getImportedAnalysis(importUri: string): FileAnalysis | null {
 	}
 }
 
+function mergeAnalyses(a: FileAnalysis, b: FileAnalysis): FileAnalysis {
+	return {
+		...a,
+		functions: [...a.functions, ...b.functions],
+		moduleVariables: [...a.moduleVariables, ...b.moduleVariables],
+	};
+}
+
 function getGlobAnalyses(currentUri: string): { byNamespace: Map<string, FileAnalysis>; lib: string[] } {
 	const found = findConfig(currentUri);
 	if (!found) return { byNamespace: new Map(), lib: [] };
@@ -117,7 +125,9 @@ function getGlobAnalyses(currentUri: string): { byNamespace: Map<string, FileAna
 	for (const filePath of expandGlobs(config.globs, configDir)) {
 		const fileUri = pathToFileURL(filePath).toString();
 		const imported = getImportedAnalysis(fileUri);
-		if (imported?.moduleNamespaceUri) byNamespace.set(imported.moduleNamespaceUri, imported);
+		if (!imported?.moduleNamespaceUri) continue;
+		const existing = byNamespace.get(imported.moduleNamespaceUri);
+		byNamespace.set(imported.moduleNamespaceUri, existing ? mergeAnalyses(existing, imported) : imported);
 	}
 	globAnalysesByConfigDir.set(configDir, byNamespace);
 	return { byNamespace, lib };
@@ -130,7 +140,11 @@ function resolveImports(currentUri: string, analysis: FileAnalysis): Map<string,
 	const runtimeByNamespace = new Map<string, FileAnalysis>();
 	for (const runtimeAnalysis of getRuntimeAnalyses(lib)) {
 		if (runtimeAnalysis.moduleNamespaceUri) {
-			runtimeByNamespace.set(runtimeAnalysis.moduleNamespaceUri, runtimeAnalysis);
+			const existing = runtimeByNamespace.get(runtimeAnalysis.moduleNamespaceUri);
+			runtimeByNamespace.set(
+				runtimeAnalysis.moduleNamespaceUri,
+				existing ? mergeAnalyses(existing, runtimeAnalysis) : runtimeAnalysis,
+			);
 		}
 	}
 	for (const imp of analysis.imports) {

package/firebase.json

@@ -1,12 +0,0 @@
-{
-	"hosting": {
-		"public": "demo/dist",
-		"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-		"rewrites": [
-			{
-				"source": "**",
-				"destination": "/index.html"
-			}
-		]
-	}
-}

package/release-please-config.json

@@ -1,16 +0,0 @@
-{
-	"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-	"packages": {
-		".": {
-			"release-type": "node",
-			"package-name": "xq-lsp",
-			"component": "lsp",
-			"exclude-paths": ["editors/"]
-		},
-		"editors/vscode": {
-			"release-type": "node",
-			"package-name": "xquery-lsp-vscode",
-			"component": "vscode"
-		}
-	}
-}