@volar/language-server - npm Package Compare versions

Comparing version 2.3.0 to 2.3.1

browser.d.ts

@@ -14,3 +14,3 @@ import * as vscode from 'vscode-languageserver/browser';
     initializeResult: import("./index").VolarInitializeResult;
-    languageServicePlugins: import("@volar/language-service").LanguageServicePlugin<any>[];
+    languageServicePlugins: import("@volar/language-service").LanguageServicePlugin[];
     project: import("./index").LanguageServerProject;
@@ -21,9 +21,9 @@ pullModelDiagnostics: boolean;
     getSyncedDocumentKey: (uri: URI) => string | undefined;
-    initialize: (initializeParams: vscode.InitializeParams, project: import("./index").LanguageServerProject, languageServicePlugins: import("@volar/language-service").LanguageServicePlugin<any>[], options?: {
-        pullModelDiagnostics?: boolean | undefined;
-    } | undefined) => import("./index").VolarInitializeResult;
+    initialize: (initializeParams: vscode.InitializeParams, project: import("./index").LanguageServerProject, languageServicePlugins: import("@volar/language-service").LanguageServicePlugin[], options?: {
+        pullModelDiagnostics?: boolean;
+    }) => import("./index").VolarInitializeResult;
     initialized: () => void;
     shutdown: () => void;
     watchFiles: (patterns: string[]) => void;
-    getConfiguration: <T>(section: string, scopeUri?: string | undefined) => Promise<T | undefined>;
+    getConfiguration: <T>(section: string, scopeUri?: string) => Promise<T | undefined>;
     onDidChangeConfiguration: (cb: vscode.NotificationHandler<vscode.DidChangeConfigurationParams>) => {
@@ -30,0 +30,0 @@ dispose(): void;

browser.js

@@ -17,3 +17,5 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTsdkByUrl = exports.createServer = exports.createConnection = void 0;
+exports.createConnection = createConnection;
+exports.createServer = createServer;
+exports.loadTsdkByUrl = loadTsdkByUrl;
 const language_service_1 = require("@volar/language-service");
@@ -36,3 +38,2 @@ const vscode = require("vscode-languageserver/browser");
 }
-exports.createConnection = createConnection;
 function createServer(connection) {
@@ -69,3 +70,2 @@ return (0, server_1.createServerBase)(connection, {
 }
-exports.createServer = createServer;
 async function loadTsdkByUrl(tsdkUrl, locale) {
@@ -97,3 +97,2 @@ return {
 }
-exports.loadTsdkByUrl = loadTsdkByUrl;
 //# sourceMappingURL=browser.js.map

lib/project/inferredCompilerOptions.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInferredCompilerOptions = void 0;
+exports.getInferredCompilerOptions = getInferredCompilerOptions;
 async function getInferredCompilerOptions(server) {
@@ -65,3 +65,2 @@ const [implicitProjectConfig_1 = {}, implicitProjectConfig_2 = {},] = await Promise.all([
 }
-exports.getInferredCompilerOptions = getInferredCompilerOptions;
 //# sourceMappingURL=inferredCompilerOptions.js.map

lib/project/simpleProject.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguageServiceEnvironment = exports.createSimpleProject = void 0;
+exports.createSimpleProject = createSimpleProject;
+exports.createLanguageServiceEnvironment = createLanguageServiceEnvironment;
 const language_service_1 = require("@volar/language-service");
@@ -38,3 +39,2 @@ function createSimpleProject(languagePlugins) {
 }
-exports.createSimpleProject = createSimpleProject;
 function createLanguageServiceEnvironment(server, workspaceFolders) {
@@ -51,3 +51,2 @@ return {
 }
-exports.createLanguageServiceEnvironment = createLanguageServiceEnvironment;
 //# sourceMappingURL=simpleProject.js.map

lib/project/typescriptProject.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspaceFolder = exports.isFileInDir = exports.sortTSConfigs = exports.createUriConverter = exports.createTypeScriptProject = void 0;
+exports.createTypeScriptProject = createTypeScriptProject;
+exports.createUriConverter = createUriConverter;
+exports.sortTSConfigs = sortTSConfigs;
+exports.isFileInDir = isFileInDir;
+exports.getWorkspaceFolder = getWorkspaceFolder;
 const language_service_1 = require("@volar/language-service");
@@ -211,3 +215,2 @@ const path = require("path-browserify");
 }
-exports.createTypeScriptProject = createTypeScriptProject;
 function createUriConverter() {
@@ -230,9 +233,26 @@ const encodeds = new Map();
             const prefix = `/${encoded}`;
-            if (fileName.startsWith(prefix)) {
+            if (fileName === prefix) {
                 return vscode_uri_1.URI.from({
                     scheme: uri.scheme,
                     authority: uri.authority,
-                    path: fileName.substring(prefix.length),
                 });
             }
+            if (uri.authority) {
+                if (fileName.startsWith(prefix + '/')) {
+                    return vscode_uri_1.URI.from({
+                        scheme: uri.scheme,
+                        authority: uri.authority,
+                        path: fileName.substring(prefix.length),
+                    });
+                }
+            }
+            else {
+                if (fileName.startsWith(prefix)) {
+                    return vscode_uri_1.URI.from({
+                        scheme: uri.scheme,
+                        authority: uri.authority,
+                        path: fileName.substring(prefix.length),
+                    });
+                }
+            }
         }
@@ -242,3 +262,2 @@ return vscode_uri_1.URI.file(fileName);
 }
-exports.createUriConverter = createUriConverter;
 function sortTSConfigs(file, a, b) {
@@ -261,3 +280,2 @@ const inA = isFileInDir(file, path.dirname(a));
 }
-exports.sortTSConfigs = sortTSConfigs;
 function isFileInDir(fileName, dir) {
@@ -267,3 +285,2 @@ const relative = path.relative(dir, fileName);
 }
-exports.isFileInDir = isFileInDir;
 function getWorkspaceFolder(uri, workspaceFolders) {
@@ -285,3 +302,2 @@ while (true) {
 }
-exports.getWorkspaceFolder = getWorkspaceFolder;
 //# sourceMappingURL=typescriptProject.js.map

lib/project/typescriptProjectLs.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTypeScriptLS = void 0;
+exports.createTypeScriptLS = createTypeScriptLS;
 const language_service_1 = require("@volar/language-service");
@@ -140,3 +140,2 @@ const typescript_1 = require("@volar/typescript");
 }
-exports.createTypeScriptLS = createTypeScriptLS;
 async function createParsedCommandLine(ts, sys, workspacePath, tsconfig, extraFileExtensions) {
@@ -143,0 +142,0 @@ let content = {

lib/register/registerEditorFeatures.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerEditorFeatures = void 0;
+exports.registerEditorFeatures = registerEditorFeatures;
 const language_service_1 = require("@volar/language-service");
@@ -76,4 +76,4 @@ const protocol_1 = require("../../protocol");
             const mappings = {};
-            for (const map of languageService.context.documents.getMaps(virtualCode)) {
-                mappings[map.sourceDocument.uri] = map.map.mappings;
+            for (const [sourceScript, map] of languageService.context.language.maps.forEach(virtualCode)) {
+                mappings[sourceScript.id.toString()] = map.mappings;
             }
@@ -102,2 +102,3 @@ return {
                 else {
+                    const uri = languageService.context.language.typescript.asScriptId(fileName);
                     const sourceScript = languageService.context.language.scripts.get(uri);
@@ -205,3 +206,2 @@ if (sourceScript?.generated) {
 }
-exports.registerEditorFeatures = registerEditorFeatures;
 //# sourceMappingURL=registerEditorFeatures.js.map

lib/register/registerLanguageFeatures.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = exports.registerLanguageFeatures = void 0;
-const embedded = require("@volar/language-service");
+exports.registerLanguageFeatures = registerLanguageFeatures;
+exports.sleep = sleep;
+const language_service_1 = require("@volar/language-service");
 const vscode = require("vscode-languageserver");
@@ -282,3 +283,3 @@ const vscode_uri_1 = require("vscode-uri");
         if (edits.length) {
-            embedded.mergeWorkspaceEdits(edits[0], ...edits.slice(1));
+            (0, language_service_1.mergeWorkspaceEdits)(edits[0], ...edits.slice(1));
             return edits[0];
@@ -302,3 +303,3 @@ }
                 }
-                const languageService = (await server.project.getLanguageService(uri));
+                const languageService = (await server.project.getLanguageService((0, language_service_1.decodeEmbeddedDocumentUri)(uri)?.[0] ?? uri));
                 const result = await cb(languageService);
@@ -322,7 +323,5 @@ if (token.isCancellationRequested) {
 }
-exports.registerLanguageFeatures = registerLanguageFeatures;
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
-exports.sleep = sleep;
 //# sourceMappingURL=registerLanguageFeatures.js.map

lib/schemaRequestHandlers/http.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = handler;
 const request_light_1 = require("request-light");
@@ -15,3 +16,2 @@ function handler(uri) {
 }
-exports.default = handler;
 //# sourceMappingURL=http.js.map

lib/server.d.ts

@@ -12,3 +12,3 @@ import { FileSystem, LanguageServicePlugin } from '@volar/language-service';
     initializeResult: VolarInitializeResult;
-    languageServicePlugins: LanguageServicePlugin<any>[];
+    languageServicePlugins: LanguageServicePlugin[];
     project: LanguageServerProject;
@@ -15,0 +15,0 @@ pullModelDiagnostics: boolean;

lib/server.js

@@ -17,3 +17,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerBase = void 0;
+exports.createServerBase = createServerBase;
 const language_service_1 = require("@volar/language-service");
@@ -450,3 +450,2 @@ const snapshot_document_1 = require("@volar/snapshot-document");
 }
-exports.createServerBase = createServerBase;
 function sleep(ms) {
@@ -453,0 +452,0 @@ return new Promise(resolve => setTimeout(resolve, ms));

node.d.ts

@@ -14,3 +14,3 @@ import { FileSystem } from '@volar/language-service';
     initializeResult: import("./index").VolarInitializeResult;
-    languageServicePlugins: import("@volar/language-service").LanguageServicePlugin<any>[];
+    languageServicePlugins: import("@volar/language-service").LanguageServicePlugin[];
     project: import("./index").LanguageServerProject;
@@ -21,9 +21,9 @@ pullModelDiagnostics: boolean;
     getSyncedDocumentKey: (uri: import("vscode-uri").URI) => string | undefined;
-    initialize: (initializeParams: vscode.InitializeParams, project: import("./index").LanguageServerProject, languageServicePlugins: import("@volar/language-service").LanguageServicePlugin<any>[], options?: {
-        pullModelDiagnostics?: boolean | undefined;
-    } | undefined) => import("./index").VolarInitializeResult;
+    initialize: (initializeParams: vscode.InitializeParams, project: import("./index").LanguageServerProject, languageServicePlugins: import("@volar/language-service").LanguageServicePlugin[], options?: {
+        pullModelDiagnostics?: boolean;
+    }) => import("./index").VolarInitializeResult;
     initialized: () => void;
     shutdown: () => void;
     watchFiles: (patterns: string[]) => void;
-    getConfiguration: <T>(section: string, scopeUri?: string | undefined) => Promise<T | undefined>;
+    getConfiguration: <T>(section: string, scopeUri?: string) => Promise<T | undefined>;
     onDidChangeConfiguration: (cb: vscode.NotificationHandler<vscode.DidChangeConfigurationParams>) => {
@@ -30,0 +30,0 @@ dispose(): void;

node.js

@@ -17,3 +17,6 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTsdkByPath = exports.fs = exports.createServer = exports.createConnection = void 0;
+exports.fs = void 0;
+exports.createConnection = createConnection;
+exports.createServer = createServer;
+exports.loadTsdkByPath = loadTsdkByPath;
 const language_service_1 = require("@volar/language-service");
@@ -32,7 +35,5 @@ const _fs = require("fs");
 }
-exports.createConnection = createConnection;
 function createServer(connection) {
     return (0, server_1.createServerBase)(connection, exports.fs);
 }
-exports.createServer = createServer;
 exports.fs = {
@@ -122,3 +123,2 @@ stat(uri) {
 }
-exports.loadTsdkByPath = loadTsdkByPath;
 //# sourceMappingURL=node.js.map

package.json

 {
 	"name": "@volar/language-server",
-	"version": "2.3.0",
+	"version": "2.3.1",
 	"license": "MIT",
@@ -15,6 +15,6 @@ "files": [
 	"dependencies": {
-		"@volar/language-core": "2.3.0",
-		"@volar/language-service": "2.3.0",
-		"@volar/snapshot-document": "2.3.0",
-		"@volar/typescript": "2.3.0",
+		"@volar/language-core": "2.3.1",
+		"@volar/language-service": "2.3.1",
+		"@volar/snapshot-document": "2.3.1",
+		"@volar/typescript": "2.3.1",
 		"path-browserify": "^1.0.1",
@@ -30,3 +30,3 @@ "request-light": "^0.7.0",
 	},
-	"gitHead": "4f6488605e22e0f76ea877460848a443fd3e8762"
+	"gitHead": "51742317a2950abd97e1a1a266b2c137bede4ad3"
 }

protocol.d.ts

 import type { CodeMapping } from '@volar/language-core';
 import type { FileStat, FileType, DocumentDropEdit } from '@volar/language-service';
 import * as vscode from 'vscode-languageserver-protocol';
+export * from 'vscode-languageserver-protocol';
 /**
@@ -5,0 +6,0 @@ * Server request client

protocol.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadedTSFilesMetaRequest = exports.GetVirtualCodeRequest = exports.GetVirtualFileRequest = exports.GetServicePluginsRequest = exports.UpdateServicePluginStateNotification = exports.UpdateVirtualCodeStateNotification = exports.DocumentDrop_DataTransferItemFileDataRequest = exports.DocumentDrop_DataTransferItemAsStringRequest = exports.DocumentDropRequest = exports.ReloadProjectNotification = exports.WriteVirtualFilesNotification = exports.AutoInsertRequest = exports.GetMatchTsConfigRequest = exports.FindFileReferenceRequest = exports.FsStatRequest = exports.FsReadDirectoryRequest = exports.FsReadFileRequest = void 0;
 const vscode = require("vscode-languageserver-protocol");
+__exportStar(require("vscode-languageserver-protocol"), exports);
 /**
@@ -6,0 +21,0 @@ * Server request client

No alert changes

Improved metrics

Total package byte prevSize

107412

increased by0.87%

Lines of code

2247

increased by1.17%

Dependency changes

• + Added@volar/language-core@2.3.1(transitive)

• + Added@volar/language-service@2.3.1(transitive)

• + Added@volar/snapshot-document@2.3.1(transitive)

• + Added@volar/source-map@2.3.1(transitive)

• + Added@volar/typescript@2.3.1(transitive)

• + Addedvscode-uri@3.1.0(transitive)

• - Removed@volar/language-core@2.3.0(transitive)

• - Removed@volar/language-service@2.3.0(transitive)

• - Removed@volar/snapshot-document@2.3.0(transitive)

• - Removed@volar/source-map@2.3.0(transitive)

• - Removed@volar/typescript@2.3.0(transitive)

• - Removedmuggle-string@0.4.1(transitive)

• - Removedvscode-uri@3.0.8(transitive)

• Updated@volar/language-core@2.3.1

• Updated@volar/language-service@2.3.1

• Updated@volar/snapshot-document@2.3.1

• Updated@volar/typescript@2.3.1