vscode-json-languageservice 5.7.2 → 6.0.0-next.2

package/lib/esm/services/configuration.js

@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import draft201909Flat from './schemas/draft-2019-09-flat';
-import draft202012Flat from './schemas/draft-2020-12-flat';
+import draft201909Flat from './schemas/draft-2019-09-flat.js';
+import draft202012Flat from './schemas/draft-2020-12-flat.js';
 import * as l10n from '@vscode/l10n';
 export const schemaContributions = {
     schemaAssociations: [],

package/lib/esm/services/jsonCompletion.js

@@ -2,12 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as Parser from '../parser/jsonParser';
+import * as Parser from '../parser/jsonParser.js';
 import * as Json from 'jsonc-parser';
-import { stringifyObject } from '../utils/json';
-import { endsWith, extendedRegExp } from '../utils/strings';
-import { isDefined } from '../utils/objects';
-import { CompletionItem, CompletionItemKind, Range, TextEdit, InsertTextFormat, MarkupKind } from '../jsonLanguageTypes';
+import { stringifyObject } from '../utils/json.js';
+import { endsWith, extendedRegExp } from '../utils/strings.js';
+import { isDefined } from '../utils/objects.js';
+import { CompletionItem, CompletionItemKind, Range, TextEdit, InsertTextFormat, MarkupKind } from '../jsonLanguageTypes.js';
 import * as l10n from '@vscode/l10n';
 const valueCommitCharacters = [',', '}', ']'];
 const propertyCommitCharacters = [':'];

package/lib/esm/services/jsonDocumentSymbols.js

@@ -2,11 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as Parser from '../parser/jsonParser';
-import * as Strings from '../utils/strings';
-import { colorFromHex } from '../utils/colors';
+import * as Parser from '../parser/jsonParser.js';
+import * as Strings from '../utils/strings.js';
+import { colorFromHex } from '../utils/colors.js';
 import * as l10n from '@vscode/l10n';
-import { Range, TextEdit, SymbolKind, Location } from "../jsonLanguageTypes";
+import { Range, TextEdit, SymbolKind, Location } from "../jsonLanguageTypes.js";
 export class JSONDocumentSymbols {
     constructor(schemaService) {
         this.schemaService = schemaService;

package/lib/esm/services/jsonFolding.js

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { createScanner } from 'jsonc-parser';
-import { FoldingRangeKind, Position } from '../jsonLanguageTypes';
+import { FoldingRangeKind, Position } from '../jsonLanguageTypes.js';
 export function getFoldingRanges(document, context) {
     const ranges = [];
     const nestingLevels = [];

package/lib/esm/services/jsonHover.js

@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as Parser from '../parser/jsonParser';
-import { Range } from '../jsonLanguageTypes';
+import * as Parser from '../parser/jsonParser.js';
+import { Range } from '../jsonLanguageTypes.js';
 export class JSONHover {
     constructor(schemaService, contributions = [], promiseConstructor) {
         this.schemaService = schemaService;

package/lib/esm/services/jsonLinks.js

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Range } from '../jsonLanguageTypes';
+import { Range } from '../jsonLanguageTypes.js';
 export function findLinks(document, doc) {
     const links = [];
     doc.visit(node => {
@@ -26,10 +26,37 @@ function createRange(document, node) {
 }
 function findTargetNode(doc, path) {
     const tokens = parseJSONPointer(path);
-    if (!tokens) {
+    if (tokens) {
+        return findNode(tokens, doc.root);
+    }
+    if (path.charAt(0) === '#') {
+        // Plain-name fragment: anchor reference (e.g. #foo)
+        const anchor = path.substring(1);
+        if (anchor.length > 0) {
+            return findAnchorNode(doc, anchor);
+        }
         return null;
     }
-    return findNode(tokens, doc.root);
+    // Check for references to embedded schemas by $id (e.g. "https://example.com/embedded")
+    const hashIndex = path.indexOf('#');
+    const uri = hashIndex >= 0 ? path.substring(0, hashIndex) : path;
+    const fragment = hashIndex >= 0 ? path.substring(hashIndex + 1) : undefined;
+    if (uri.length > 0) {
+        const embeddedNode = findEmbeddedSchemaNode(doc, uri);
+        if (embeddedNode) {
+            if (!fragment || fragment.length === 0) {
+                return embeddedNode;
+            }
+            if (fragment.charAt(0) === '/') {
+                // JSON Pointer within the embedded schema
+                const pointerTokens = fragment.substring(1).split(/\//).map(unescape);
+                return findNode(pointerTokens, embeddedNode);
+            }
+            // Anchor within the embedded schema
+            return findAnchorInSubtree(embeddedNode, fragment);
+        }
+    }
+    return null;
 }
 function findNode(pointer, node) {
     if (!node) {
@@ -58,6 +85,70 @@ function findNode(pointer, node) {
     }
     return null;
 }
+function findAnchorNode(doc, anchor) {
+    return findAnchorInSubtree(doc.root, anchor);
+}
+function findAnchorInSubtree(root, anchor) {
+    if (!root) {
+        return null;
+    }
+    let result = null;
+    const visit = (node) => {
+        if (node.type === 'object') {
+            for (const prop of node.properties) {
+                // $anchor: "foo" (2019-09+)
+                if (prop.keyNode.value === '$anchor' && prop.valueNode?.type === 'string' && prop.valueNode.value === anchor) {
+                    result = node;
+                    return false;
+                }
+                // $id: "#foo" (draft-06/07 legacy anchors)
+                if (prop.keyNode.value === '$id' && prop.valueNode?.type === 'string' && prop.valueNode.value === '#' + anchor) {
+                    result = node;
+                    return false;
+                }
+            }
+        }
+        const children = node.children;
+        if (children) {
+            for (const child of children) {
+                if (!visit(child)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+    visit(root);
+    return result;
+}
+function findEmbeddedSchemaNode(doc, uri) {
+    if (!doc.root) {
+        return null;
+    }
+    let result = null;
+    const visit = (node, isRoot) => {
+        if (node.type === 'object' && !isRoot) {
+            for (const prop of node.properties) {
+                if ((prop.keyNode.value === '$id' || prop.keyNode.value === 'id') &&
+                    prop.valueNode?.type === 'string' && prop.valueNode.value === uri) {
+                    result = node;
+                    return false;
+                }
+            }
+        }
+        const children = node.children;
+        if (children) {
+            for (const child of children) {
+                if (!visit(child, false)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+    visit(doc.root, true);
+    return result;
+}
 function parseJSONPointer(path) {
     if (path === "#") {
         return [];