volar-service-json 0.0.51 → 0.0.53

package/index.d.ts

@@ -1,6 +1,7 @@
 import type { LanguageServicePlugin, DocumentSelector, LanguageServiceContext, Disposable, ProviderResult, FormattingOptions } from '@volar/language-service';
 import * as json from 'vscode-json-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
+import { URI } from 'vscode-uri';
 export interface Provide {
     'json/jsonDocument': (document: TextDocument) => json.JSONDocument | undefined;
     'json/languageService': () => json.LanguageService;
@@ -11,6 +12,7 @@ export interface JSONSchemaSettings {
     schema?: json.JSONSchema;
     folderUri?: string;
 }
+export declare function resolveReference(ref: string, baseUri: URI, workspaceFolders: URI[]): string;
 export declare function create({ documentSelector, getWorkspaceContextService, isFormattingEnabled, getFormattingOptions, getLanguageSettings, getDocumentLanguageSettings, onDidChangeLanguageSettings, }?: {
     documentSelector?: DocumentSelector;
     getWorkspaceContextService?(context: LanguageServiceContext): json.WorkspaceContextService;

package/index.js

@@ -1,18 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.resolveReference = resolveReference;
+exports.create = create;
 const json = require("vscode-json-languageservice");
 const vscode_uri_1 = require("vscode-uri");
+function resolveReference(ref, baseUri, workspaceFolders) {
+    if (ref.match(/^\w[\w\d+.-]*:/)) {
+        // starts with a schema
+        return ref;
+    }
+    if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+        const folderUri = getRootFolder();
+        if (folderUri) {
+            return folderUri + ref.substr(1);
+        }
+    }
+    const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
+    return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+    function getRootFolder() {
+        for (const folder of workspaceFolders) {
+            let folderURI = folder.toString();
+            if (!folderURI.endsWith('/')) {
+                folderURI = folderURI + '/';
+            }
+            if (baseUri.toString().startsWith(folderURI)) {
+                return folderURI;
+            }
+        }
+    }
+}
 function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextService = context => {
     return {
-        resolveRelativePath(relativePath, resource) {
+        resolveRelativePath(ref, resource) {
             const base = resource.substring(0, resource.lastIndexOf('/') + 1);
             let baseUri = vscode_uri_1.URI.parse(base);
             const decoded = context.decodeEmbeddedDocumentUri(baseUri);
             if (decoded) {
                 baseUri = decoded[0];
             }
-            return vscode_uri_1.Utils.resolvePath(baseUri, relativePath).toString();
+            return resolveReference(ref, baseUri, context.env.workspaceFolders);
         },
     };
 }, isFormattingEnabled = async (_document, context) => {
@@ -179,7 +205,6 @@ function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextServi
         },
     };
 }
-exports.create = create;
 function matchDocument(selector, document) {
     for (const sel of selector) {
         if (sel === document.languageId || (typeof sel === 'object' && sel.language === document.languageId)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-json",
-	"version": "0.0.51",
+	"version": "0.0.53",
 	"description": "Integrate vscode-json-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/json",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -31,12 +31,12 @@
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.3.0"
+		"@volar/language-service": "~2.3.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "7af242537b552e0fb4391a38fdeb8115580085dc"
+	"gitHead": "8c61d6a8acc354e68c726727f72be7d318c583da"
 }