resolve uri-ref relative to document

Author: twelvelabs

src/services/jsonLinks.ts

@@ -9,7 +9,7 @@ import { JSONDocument } from '../parser/jsonParser';
 import { IJSONSchemaService } from './jsonSchemaService';
 import { URI } from 'vscode-uri';
 import { existsSync as fileExistsSync } from 'fs';
-import { resolve as resolvePath } from 'path';
+import * as path from 'path';
 
 export class JSONLinks {
 	private schemaService: IJSONSchemaService;
@@ -48,13 +48,14 @@ export function findLinks(document: TextDocument, doc: JSONDocument, schemaServi
 					matchingSchemas.forEach((s) => {
 						if (s.node === pathNode && !s.inverted && s.schema) {
 							if (s.schema.format === 'uri-reference') {
-								const path = resolvePath(pathNode.value);
-								const uri = URI.file(path);
-								if (fileExistsSync(path)) {
-									pathLinks.push({
-										target: uri.toString(),
-										range: createRange(document, pathNode)
-									});
+								const pathURI = resolveURIRef(pathNode.value, document);
+								if (pathURI) {
+									if (fileExistsSync(pathURI.fsPath)) {
+										pathLinks.push({
+											target: pathURI.toString(),
+											range: createRange(document, pathNode)
+										});
+									}
 								}
 							}
 						}
@@ -128,3 +129,25 @@ function parseJSONPointer(path: string): string[] | null {
 function unescape(str: string): string {
 	return str.replace(/~1/g, '/').replace(/~0/g, '~');
 }
+
+function resolveURIRef(ref: string, document: TextDocument): URI | null {
+	if (ref.indexOf('://') > 0) {
+		// Already a fully qualified URI.
+		// The language service should already create a document link
+		// for these, so no need to created a duplicate.
+		return null;
+	}
+
+	if (ref.startsWith('/')) {
+		// Already an absolute path, no need to resolve.
+		return URI.file(ref);
+	}
+
+	// Resolve ref relative to the document.
+	const docURI = URI.parse(document.uri);
+	const docDir = path.dirname(docURI.path);
+	const refPath = path.join(docDir, ref);
+	return docURI.with({
+		path: refPath
+	});
+}

src/test/links.test.ts

@@ -13,7 +13,8 @@ import {
 	Range,
 	TextDocument,
 } from '../jsonLanguageService';
-import { resolve as resolvePath } from 'path';
+import * as path from 'path';
+import { URI } from 'vscode-uri';
 
 suite('JSON Find Links', () => {
 	const testFindLinksFor = function (value: string, expected: {offset: number, length: number, target: number} | null): PromiseLike<void> {
@@ -72,9 +73,13 @@ suite('JSON Find Links', () => {
 	});
 
 	test('URI reference link', async function () {
-		const relativePath = './src/test/fixtures/uri-reference.txt';
-		const content = `{"stringProp": "string-value", "uriProp": "${relativePath}", "uriPropNotFound": "./does/not/exist.txt"}`;
-		const document = TextDocument.create('test://test.json', 'json', 0, content);
+		// This test file runs in `./lib/umd/test`, but the fixtures are in `./src`.
+		const refRelPath = '../../../src/test/fixtures/uri-reference.txt';
+		const refAbsPath = path.join(__dirname, refRelPath);
+		const docAbsPath = path.join(__dirname, 'test.json');
+
+		const content = `{"stringProp": "string-value", "uriProp": "${refRelPath}", "uriPropNotFound": "./does/not/exist.txt"}`;
+		const document = TextDocument.create(URI.file(docAbsPath).toString(), 'json', 0, content);
 		const schema: JSONSchema = {
 			type: 'object',
 			properties: {
@@ -94,11 +99,10 @@ suite('JSON Find Links', () => {
 		await testFindLinksWithSchema(document, schema).then((links) => {
 			assert.notDeepEqual(links, []);
 
-			const absPath = resolvePath(relativePath);
-			assert.equal(links[0].target, `file://${absPath}`);
+			assert.equal(links[0].target, URI.file(refAbsPath).toString());
 
-			const startOffset = content.indexOf(relativePath);
-			const endOffset = startOffset + relativePath.length;
+			const startOffset = content.indexOf(refRelPath);
+			const endOffset = startOffset + refRelPath.length;
 			const range = Range.create(document.positionAt(startOffset), document.positionAt(endOffset));
 			assert.deepEqual(links[0].range, range);
 		});