vscode-json-languageservice 5.5.0 → 5.6.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+5.6.0 / 2025-05-28
+================
+ * added `Schema.enumSortTexts`and  `Schema.enumDetails` to control the sort order and presentation of suggestions for enaums
+
 5.5.0 / 2025-03-25
 ================
  * `newJSONDocument` API now also accepts undefined as ASTRoots an optionally comment ranges.

package/lib/esm/jsonSchema.d.ts

@@ -77,6 +77,8 @@ export interface JSONSchema {
     patternErrorMessage?: string;
     deprecationMessage?: string;
     enumDescriptions?: string[];
+    enumSortTexts?: string[];
+    enumDetails?: string[];
     markdownEnumDescriptions?: string[];
     markdownDescription?: string;
     doNotSuggest?: boolean;

package/lib/esm/parser/jsonParser.js

@@ -6,6 +6,7 @@ import * as Json from 'jsonc-parser';
 import { isNumber, equals, isBoolean, isString, isDefined, isObject } from '../utils/objects';
 import { extendedRegExp, stringLength } from '../utils/strings';
 import { ErrorCode, Diagnostic, DiagnosticSeverity, Range, SchemaDraft } from '../jsonLanguageTypes';
+import { URI } from 'vscode-uri';
 import * as l10n from '@vscode/l10n';
 const formats = {
     'color-hex': { errorMessage: l10n.t('Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.'), pattern: /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/ },
@@ -101,11 +102,30 @@ export var EnumMatch;
     EnumMatch[EnumMatch["Key"] = 0] = "Key";
     EnumMatch[EnumMatch["Enum"] = 1] = "Enum";
 })(EnumMatch || (EnumMatch = {}));
+const httpPrefix = `http://json-schema.org/`;
+const httpsPrefix = `https://json-schema.org/`;
+export function normalizeId(id) {
+    // use the https prefix for the old json-schema.org meta schemas
+    // See https://github.com/microsoft/vscode/issues/195189
+    if (id.startsWith(httpPrefix)) {
+        id = httpsPrefix + id.substring(httpPrefix.length);
+    }
+    // remove trailing '#', normalize drive capitalization
+    try {
+        return URI.parse(id).toString(true);
+    }
+    catch (e) {
+        return id;
+    }
+}
+export function getSchemaDraftFromId(schemaId) {
+    return schemaDraftFromId[normalizeId(schemaId)] ?? undefined;
+}
 const schemaDraftFromId = {
-    'http://json-schema.org/draft-03/schema#': SchemaDraft.v3,
-    'http://json-schema.org/draft-04/schema#': SchemaDraft.v4,
-    'http://json-schema.org/draft-06/schema#': SchemaDraft.v6,
-    'http://json-schema.org/draft-07/schema#': SchemaDraft.v7,
+    'https://json-schema.org/draft-03/schema': SchemaDraft.v3,
+    'https://json-schema.org/draft-04/schema': SchemaDraft.v4,
+    'https://json-schema.org/draft-06/schema': SchemaDraft.v6,
+    'https://json-schema.org/draft-07/schema': SchemaDraft.v7,
     'https://json-schema.org/draft/2019-09/schema': SchemaDraft.v2019_09,
     'https://json-schema.org/draft/2020-12/schema': SchemaDraft.v2020_12
 };
@@ -269,7 +289,7 @@ export class JSONDocument {
 function getSchemaDraft(schema, fallBack = SchemaDraft.v2020_12) {
     let schemaId = schema.$schema;
     if (schemaId) {
-        return schemaDraftFromId[schemaId] ?? fallBack;
+        return getSchemaDraftFromId(schemaId) ?? fallBack;
     }
     return fallBack;
 }

package/lib/esm/services/configuration.js

@@ -7,8 +7,7 @@ export const schemaContributions = {
     schemaAssociations: [],
     schemas: {
         // bundle the schema-schema to include (localized) descriptions
-        'http://json-schema.org/draft-04/schema#': {
-            '$schema': 'http://json-schema.org/draft-04/schema#',
+        'https://json-schema.org/draft-04/schema': {
             'definitions': {
                 'schemaArray': {
                     'type': 'array',
@@ -290,7 +289,7 @@ export const schemaContributions = {
             },
             'default': {}
         },
-        'http://json-schema.org/draft-07/schema#': {
+        'https://json-schema.org/draft-07/schema': {
             'definitions': {
                 'schemaArray': {
                     'type': 'array',

package/lib/esm/services/jsonCompletion.js

@@ -225,21 +225,17 @@ export class JSONCompletion {
                 }
                 const schemaPropertyNames = s.schema.propertyNames;
                 if (typeof schemaPropertyNames === 'object' && !schemaPropertyNames.deprecationMessage && !schemaPropertyNames.doNotSuggest) {
-                    const propertyNameCompletionItem = (name, enumDescription = undefined) => {
+                    const propertyNameCompletionItem = (name, documentation, detail, sortText) => {
                         const proposal = {
                             kind: CompletionItemKind.Property,
                             label: name,
                             insertText: this.getInsertTextForProperty(name, undefined, addValue, separatorAfter),
                             insertTextFormat: InsertTextFormat.Snippet,
                             filterText: this.getFilterTextForValue(name),
-                            documentation: enumDescription || this.fromMarkup(schemaPropertyNames.markdownDescription) || schemaPropertyNames.description || ''
+                            documentation: documentation || this.fromMarkup(schemaPropertyNames.markdownDescription) || schemaPropertyNames.description || '',
+                            sortText,
+                            detail
                         };
-                        if (schemaPropertyNames.completionDetail !== undefined) {
-                            proposal.detail = schemaPropertyNames.completionDetail;
-                        }
-                        if (schemaPropertyNames.suggestSortText !== undefined) {
-                            proposal.sortText = schemaPropertyNames.suggestSortText;
-                        }
                         if (proposal.insertText && endsWith(proposal.insertText, `$1${separatorAfter}`)) {
                             proposal.command = {
                                 title: 'Suggest',
@@ -257,11 +253,13 @@ export class JSONCompletion {
                             else if (schemaPropertyNames.enumDescriptions && i < schemaPropertyNames.enumDescriptions.length) {
                                 enumDescription = schemaPropertyNames.enumDescriptions[i];
                             }
-                            propertyNameCompletionItem(schemaPropertyNames.enum[i], enumDescription);
+                            const enumSortText = schemaPropertyNames.enumSortTexts?.[i];
+                            const enumDetails = schemaPropertyNames.enumDetails?.[i];
+                            propertyNameCompletionItem(schemaPropertyNames.enum[i], enumDescription, enumDetails, enumSortText);
                         }
                     }
                     if (schemaPropertyNames.const) {
-                        propertyNameCompletionItem(schemaPropertyNames.const);
+                        propertyNameCompletionItem(schemaPropertyNames.const, undefined, schemaPropertyNames.completionDetail, schemaPropertyNames.suggestSortText);
                     }
                 }
             }
@@ -633,6 +631,8 @@ export class JSONCompletion {
                     label: this.getLabelForValue(enm),
                     insertText: this.getInsertTextForValue(enm, separatorAfter),
                     insertTextFormat: InsertTextFormat.Snippet,
+                    sortText: schema.enumSortTexts?.[i],
+                    detail: schema.enumDetails?.[i],
                     documentation
                 });
             }
@@ -693,7 +693,7 @@ export class JSONCompletion {
     addDollarSchemaCompletions(separatorAfter, collector) {
         const schemaIds = this.schemaService.getRegisteredSchemaIds(schema => schema === 'http' || schema === 'https');
         schemaIds.forEach(schemaId => {
-            if (schemaId.startsWith('http://json-schema.org/draft-')) {
+            if (schemaId.startsWith('https://json-schema.org/draft-')) {
                 schemaId = schemaId + '#';
             }
             collector.add({

package/lib/esm/services/jsonSchemaService.js

@@ -5,7 +5,8 @@
 import * as Json from 'jsonc-parser';
 import { URI } from 'vscode-uri';
 import * as Strings from '../utils/strings';
-import * as Parser from '../parser/jsonParser';
+import { asSchema, getSchemaDraftFromId, normalizeId } from '../parser/jsonParser';
+import { SchemaDraft } from '../jsonLanguageTypes';
 import * as l10n from '@vscode/l10n';
 import { createRegex } from '../utils/glob';
 import { isObject, isString } from '../utils/objects';
@@ -111,7 +112,7 @@ export class ResolvedSchema {
     getSection(path) {
         const schemaRef = this.getSectionRecursive(path, this.schema);
         if (schemaRef) {
-            return Parser.asSchema(schemaRef);
+            return asSchema(schemaRef);
         }
         return undefined;
     }
@@ -263,9 +264,6 @@ export class JSONSchemaService {
             const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
             return this.promise.resolve(new UnresolvedSchema({}, [errorMessage]));
         }
-        if (url.startsWith('http://json-schema.org/')) {
-            url = 'https' + url.substring(4); // always access json-schema.org with https. See https://github.com/microsoft/vscode/issues/195189
-        }
         return this.requestService(url).then(content => {
             if (!content) {
                 const errorMessage = l10n.t('Unable to load schema from \'{0}\': No content.', toDisplayString(url));
@@ -299,8 +297,8 @@ export class JSONSchemaService {
     resolveSchemaContent(schemaToResolve, handle) {
         const resolveErrors = schemaToResolve.errors.slice(0);
         const schema = schemaToResolve.schema;
-        let schemaDraft = schema.$schema ? normalizeId(schema.$schema) : undefined;
-        if (schemaDraft === 'http://json-schema.org/draft-03/schema') {
+        const schemaDraft = schema.$schema ? getSchemaDraftFromId(schema.$schema) : undefined;
+        if (schemaDraft === SchemaDraft.v3) {
             return this.promise.resolve(new ResolvedSchema({}, [l10n.t("Draft-03 schemas are not supported.")], [], schemaDraft));
         }
         let usesUnsupportedFeatures = new Set();
@@ -574,15 +572,6 @@ export class JSONSchemaService {
     }
 }
 let idCounter = 0;
-function normalizeId(id) {
-    // remove trailing '#', normalize drive capitalization
-    try {
-        return URI.parse(id).toString(true);
-    }
-    catch (e) {
-        return id;
-    }
-}
 function normalizeResourceForMatching(resource) {
     // remove queries and fragments, normalize drive capitalization
     try {

package/lib/umd/jsonSchema.d.ts

@@ -77,6 +77,8 @@ export interface JSONSchema {
     patternErrorMessage?: string;
     deprecationMessage?: string;
     enumDescriptions?: string[];
+    enumSortTexts?: string[];
+    enumDetails?: string[];
     markdownEnumDescriptions?: string[];
     markdownDescription?: string;
     doNotSuggest?: boolean;

package/lib/umd/parser/jsonParser.js

@@ -8,13 +8,15 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "jsonc-parser", "../utils/objects", "../utils/strings", "../jsonLanguageTypes", "@vscode/l10n"], factory);
+        define(["require", "exports", "jsonc-parser", "../utils/objects", "../utils/strings", "../jsonLanguageTypes", "vscode-uri", "@vscode/l10n"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JSONDocument = exports.ValidationResult = exports.EnumMatch = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = void 0;
     exports.asSchema = asSchema;
+    exports.normalizeId = normalizeId;
+    exports.getSchemaDraftFromId = getSchemaDraftFromId;
     exports.newJSONDocument = newJSONDocument;
     exports.getNodeValue = getNodeValue;
     exports.getNodePath = getNodePath;
@@ -24,6 +26,7 @@
     const objects_1 = require("../utils/objects");
     const strings_1 = require("../utils/strings");
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
+    const vscode_uri_1 = require("vscode-uri");
     const l10n = require("@vscode/l10n");
     const formats = {
         'color-hex': { errorMessage: l10n.t('Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.'), pattern: /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/ },
@@ -127,11 +130,30 @@
         EnumMatch[EnumMatch["Key"] = 0] = "Key";
         EnumMatch[EnumMatch["Enum"] = 1] = "Enum";
     })(EnumMatch || (exports.EnumMatch = EnumMatch = {}));
+    const httpPrefix = `http://json-schema.org/`;
+    const httpsPrefix = `https://json-schema.org/`;
+    function normalizeId(id) {
+        // use the https prefix for the old json-schema.org meta schemas
+        // See https://github.com/microsoft/vscode/issues/195189
+        if (id.startsWith(httpPrefix)) {
+            id = httpsPrefix + id.substring(httpPrefix.length);
+        }
+        // remove trailing '#', normalize drive capitalization
+        try {
+            return vscode_uri_1.URI.parse(id).toString(true);
+        }
+        catch (e) {
+            return id;
+        }
+    }
+    function getSchemaDraftFromId(schemaId) {
+        return schemaDraftFromId[normalizeId(schemaId)] ?? undefined;
+    }
     const schemaDraftFromId = {
-        'http://json-schema.org/draft-03/schema#': jsonLanguageTypes_1.SchemaDraft.v3,
-        'http://json-schema.org/draft-04/schema#': jsonLanguageTypes_1.SchemaDraft.v4,
-        'http://json-schema.org/draft-06/schema#': jsonLanguageTypes_1.SchemaDraft.v6,
-        'http://json-schema.org/draft-07/schema#': jsonLanguageTypes_1.SchemaDraft.v7,
+        'https://json-schema.org/draft-03/schema': jsonLanguageTypes_1.SchemaDraft.v3,
+        'https://json-schema.org/draft-04/schema': jsonLanguageTypes_1.SchemaDraft.v4,
+        'https://json-schema.org/draft-06/schema': jsonLanguageTypes_1.SchemaDraft.v6,
+        'https://json-schema.org/draft-07/schema': jsonLanguageTypes_1.SchemaDraft.v7,
         'https://json-schema.org/draft/2019-09/schema': jsonLanguageTypes_1.SchemaDraft.v2019_09,
         'https://json-schema.org/draft/2020-12/schema': jsonLanguageTypes_1.SchemaDraft.v2020_12
     };
@@ -297,7 +319,7 @@
     function getSchemaDraft(schema, fallBack = jsonLanguageTypes_1.SchemaDraft.v2020_12) {
         let schemaId = schema.$schema;
         if (schemaId) {
-            return schemaDraftFromId[schemaId] ?? fallBack;
+            return getSchemaDraftFromId(schemaId) ?? fallBack;
         }
         return fallBack;
     }

package/lib/umd/services/configuration.js

@@ -19,8 +19,7 @@
         schemaAssociations: [],
         schemas: {
             // bundle the schema-schema to include (localized) descriptions
-            'http://json-schema.org/draft-04/schema#': {
-                '$schema': 'http://json-schema.org/draft-04/schema#',
+            'https://json-schema.org/draft-04/schema': {
                 'definitions': {
                     'schemaArray': {
                         'type': 'array',
@@ -302,7 +301,7 @@
                 },
                 'default': {}
             },
-            'http://json-schema.org/draft-07/schema#': {
+            'https://json-schema.org/draft-07/schema': {
                 'definitions': {
                     'schemaArray': {
                         'type': 'array',

package/lib/umd/services/jsonCompletion.js

@@ -237,21 +237,17 @@
                     }
                     const schemaPropertyNames = s.schema.propertyNames;
                     if (typeof schemaPropertyNames === 'object' && !schemaPropertyNames.deprecationMessage && !schemaPropertyNames.doNotSuggest) {
-                        const propertyNameCompletionItem = (name, enumDescription = undefined) => {
+                        const propertyNameCompletionItem = (name, documentation, detail, sortText) => {
                             const proposal = {
                                 kind: jsonLanguageTypes_1.CompletionItemKind.Property,
                                 label: name,
                                 insertText: this.getInsertTextForProperty(name, undefined, addValue, separatorAfter),
                                 insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet,
                                 filterText: this.getFilterTextForValue(name),
-                                documentation: enumDescription || this.fromMarkup(schemaPropertyNames.markdownDescription) || schemaPropertyNames.description || ''
+                                documentation: documentation || this.fromMarkup(schemaPropertyNames.markdownDescription) || schemaPropertyNames.description || '',
+                                sortText,
+                                detail
                             };
-                            if (schemaPropertyNames.completionDetail !== undefined) {
-                                proposal.detail = schemaPropertyNames.completionDetail;
-                            }
-                            if (schemaPropertyNames.suggestSortText !== undefined) {
-                                proposal.sortText = schemaPropertyNames.suggestSortText;
-                            }
                             if (proposal.insertText && (0, strings_1.endsWith)(proposal.insertText, `$1${separatorAfter}`)) {
                                 proposal.command = {
                                     title: 'Suggest',
@@ -269,11 +265,13 @@
                                 else if (schemaPropertyNames.enumDescriptions && i < schemaPropertyNames.enumDescriptions.length) {
                                     enumDescription = schemaPropertyNames.enumDescriptions[i];
                                 }
-                                propertyNameCompletionItem(schemaPropertyNames.enum[i], enumDescription);
+                                const enumSortText = schemaPropertyNames.enumSortTexts?.[i];
+                                const enumDetails = schemaPropertyNames.enumDetails?.[i];
+                                propertyNameCompletionItem(schemaPropertyNames.enum[i], enumDescription, enumDetails, enumSortText);
                             }
                         }
                         if (schemaPropertyNames.const) {
-                            propertyNameCompletionItem(schemaPropertyNames.const);
+                            propertyNameCompletionItem(schemaPropertyNames.const, undefined, schemaPropertyNames.completionDetail, schemaPropertyNames.suggestSortText);
                         }
                     }
                 }
@@ -645,6 +643,8 @@
                         label: this.getLabelForValue(enm),
                         insertText: this.getInsertTextForValue(enm, separatorAfter),
                         insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet,
+                        sortText: schema.enumSortTexts?.[i],
+                        detail: schema.enumDetails?.[i],
                         documentation
                     });
                 }
@@ -705,7 +705,7 @@
         addDollarSchemaCompletions(separatorAfter, collector) {
             const schemaIds = this.schemaService.getRegisteredSchemaIds(schema => schema === 'http' || schema === 'https');
             schemaIds.forEach(schemaId => {
-                if (schemaId.startsWith('http://json-schema.org/draft-')) {
+                if (schemaId.startsWith('https://json-schema.org/draft-')) {
                     schemaId = schemaId + '#';
                 }
                 collector.add({

package/lib/umd/services/jsonSchemaService.js

@@ -8,7 +8,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "jsonc-parser", "vscode-uri", "../utils/strings", "../parser/jsonParser", "@vscode/l10n", "../utils/glob", "../utils/objects"], factory);
+        define(["require", "exports", "jsonc-parser", "vscode-uri", "../utils/strings", "../parser/jsonParser", "../jsonLanguageTypes", "@vscode/l10n", "../utils/glob", "../utils/objects"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -17,7 +17,8 @@
     const Json = require("jsonc-parser");
     const vscode_uri_1 = require("vscode-uri");
     const Strings = require("../utils/strings");
-    const Parser = require("../parser/jsonParser");
+    const jsonParser_1 = require("../parser/jsonParser");
+    const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     const l10n = require("@vscode/l10n");
     const glob_1 = require("../utils/glob");
     const objects_1 = require("../utils/objects");
@@ -124,7 +125,7 @@
         getSection(path) {
             const schemaRef = this.getSectionRecursive(path, this.schema);
             if (schemaRef) {
-                return Parser.asSchema(schemaRef);
+                return (0, jsonParser_1.asSchema)(schemaRef);
             }
             return undefined;
         }
@@ -192,7 +193,7 @@
             // always clear this local cache when a resource changes
             this.cachedSchemaForResource = undefined;
             let hasChanges = false;
-            uri = normalizeId(uri);
+            uri = (0, jsonParser_1.normalizeId)(uri);
             const toWalk = [uri];
             const all = Object.keys(this.schemasById).map(key => this.schemasById[key]);
             while (toWalk.length) {
@@ -216,14 +217,14 @@
             if (schemaContributions.schemas) {
                 const schemas = schemaContributions.schemas;
                 for (const id in schemas) {
-                    const normalizedId = normalizeId(id);
+                    const normalizedId = (0, jsonParser_1.normalizeId)(id);
                     this.contributionSchemas[normalizedId] = this.addSchemaHandle(normalizedId, schemas[id]);
                 }
             }
             if (Array.isArray(schemaContributions.schemaAssociations)) {
                 const schemaAssociations = schemaContributions.schemaAssociations;
                 for (let schemaAssociation of schemaAssociations) {
-                    const uris = schemaAssociation.uris.map(normalizeId);
+                    const uris = schemaAssociation.uris.map(jsonParser_1.normalizeId);
                     const association = this.addFilePatternAssociation(schemaAssociation.pattern, schemaAssociation.folderUri, uris);
                     this.contributionAssociations.push(association);
                 }
@@ -243,7 +244,7 @@
             return fpa;
         }
         registerExternalSchema(config) {
-            const id = normalizeId(config.uri);
+            const id = (0, jsonParser_1.normalizeId)(config.uri);
             this.registeredSchemasIds[id] = true;
             this.cachedSchemaForResource = undefined;
             if (config.fileMatch && config.fileMatch.length) {
@@ -265,7 +266,7 @@
             }
         }
         getResolvedSchema(schemaId) {
-            const id = normalizeId(schemaId);
+            const id = (0, jsonParser_1.normalizeId)(schemaId);
             const schemaHandle = this.schemasById[id];
             if (schemaHandle) {
                 return schemaHandle.getResolvedSchema();
@@ -277,9 +278,6 @@
                 const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
                 return this.promise.resolve(new UnresolvedSchema({}, [errorMessage]));
             }
-            if (url.startsWith('http://json-schema.org/')) {
-                url = 'https' + url.substring(4); // always access json-schema.org with https. See https://github.com/microsoft/vscode/issues/195189
-            }
             return this.requestService(url).then(content => {
                 if (!content) {
                     const errorMessage = l10n.t('Unable to load schema from \'{0}\': No content.', toDisplayString(url));
@@ -313,8 +311,8 @@
         resolveSchemaContent(schemaToResolve, handle) {
             const resolveErrors = schemaToResolve.errors.slice(0);
             const schema = schemaToResolve.schema;
-            let schemaDraft = schema.$schema ? normalizeId(schema.$schema) : undefined;
-            if (schemaDraft === 'http://json-schema.org/draft-03/schema') {
+            const schemaDraft = schema.$schema ? (0, jsonParser_1.getSchemaDraftFromId)(schema.$schema) : undefined;
+            if (schemaDraft === jsonLanguageTypes_1.SchemaDraft.v3) {
                 return this.promise.resolve(new ResolvedSchema({}, [l10n.t("Draft-03 schemas are not supported.")], [], schemaDraft));
             }
             let usesUnsupportedFeatures = new Set();
@@ -369,7 +367,7 @@
                 if (contextService && !/^[A-Za-z][A-Za-z0-9+\-.+]*:\/.*/.test(uri)) {
                     uri = contextService.resolveRelativePath(uri, parentHandle.uri);
                 }
-                uri = normalizeId(uri);
+                uri = (0, jsonParser_1.normalizeId)(uri);
                 const referencedHandle = this.getOrAddSchemaHandle(uri);
                 return referencedHandle.getUnresolvedSchema().then(unresolvedSchema => {
                     parentHandle.dependencies.add(uri);
@@ -547,7 +545,7 @@
                 // first use $schema if present
                 let schemeId = this.getSchemaFromProperty(resource, document);
                 if (schemeId) {
-                    const id = normalizeId(schemeId);
+                    const id = (0, jsonParser_1.normalizeId)(schemeId);
                     return this.getOrAddSchemaHandle(id).getResolvedSchema();
                 }
             }
@@ -589,15 +587,6 @@
     }
     exports.JSONSchemaService = JSONSchemaService;
     let idCounter = 0;
-    function normalizeId(id) {
-        // remove trailing '#', normalize drive capitalization
-        try {
-            return vscode_uri_1.URI.parse(id).toString(true);
-        }
-        catch (e) {
-            return id;
-        }
-    }
     function normalizeResourceForMatching(resource) {
         // remove queries and fragments, normalize drive capitalization
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -17,9 +17,9 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/node": "18.x",
-    "@typescript-eslint/eslint-plugin": "^8.31.0",
-    "@typescript-eslint/parser": "^8.31.0",
-    "eslint": "^9.25.1",
+    "@typescript-eslint/eslint-plugin": "^8.33.0",
+    "@typescript-eslint/parser": "^8.33.0",
+    "eslint": "^9.27.0",
     "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876",
     "mocha": "^11.1.0",
     "rimraf": "^6.0.1",