vscode-json-languageservice 5.3.9 → 5.3.11

package/lib/esm/parser/jsonParser.js

@@ -455,10 +455,11 @@ function validate(n, schema, validationResult, matchingSchemas, context) {
             validationResult.enumValues = [schema.const];
         }
         let deprecationMessage = schema.deprecationMessage;
-        if ((deprecationMessage || schema.deprecated) && node.parent) {
+        if (deprecationMessage || schema.deprecated) {
             deprecationMessage = deprecationMessage || l10n.t('Value is deprecated');
+            let targetNode = node.parent?.type === 'property' ? node.parent : node;
             validationResult.problems.push({
-                location: { offset: node.parent.offset, length: node.parent.length },
+                location: { offset: targetNode.offset, length: targetNode.length },
                 severity: DiagnosticSeverity.Warning,
                 message: deprecationMessage,
                 code: ErrorCode.Deprecated
@@ -683,13 +684,13 @@ function validate(n, schema, validationResult, matchingSchemas, context) {
             if (isNumber(schema.minContains) && containsCount < schema.minContains) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    message: l10n.t('Array has too few items that match the contains contraint. Expected {0} or more.', schema.minContains)
+                    message: schema.errorMessage || l10n.t('Array has too few items that match the contains contraint. Expected {0} or more.', schema.minContains)
                 });
             }
             if (isNumber(schema.maxContains) && containsCount > schema.maxContains) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    message: l10n.t('Array has too many items that match the contains contraint. Expected {0} or less.', schema.maxContains)
+                    message: schema.errorMessage || l10n.t('Array has too many items that match the contains contraint. Expected {0} or less.', schema.maxContains)
                 });
             }
         }

package/lib/esm/utils/sort.js

@@ -190,15 +190,17 @@ function findJsoncPropertyTree(formattedDocument) {
             case 2 /* SyntaxKind.CloseBraceToken */: {
                 endLineNumber = scanner.getTokenStartLine();
                 currentContainerStack.pop();
-                // If we are not inside of an empty object and current property end line number has not yet been defined, define it
-                if (lastNonTriviaNonCommentToken !== 1 /* SyntaxKind.OpenBraceToken */
-                    && currentProperty.endLineNumber === undefined) {
-                    currentProperty.endLineNumber = endLineNumber - 1;
-                    // The current property is also the last property
-                    currentProperty.lastProperty = true;
-                    // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
-                    currentProperty.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
-                    currentProperty.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                // If we are not inside of an empty object
+                if (lastNonTriviaNonCommentToken !== 1 /* SyntaxKind.OpenBraceToken */) {
+                    // If current property end line number has not yet been defined, define it
+                    if (currentProperty.endLineNumber === undefined) {
+                        currentProperty.endLineNumber = endLineNumber - 1;
+                        // The current property is also the last property
+                        currentProperty.lastProperty = true;
+                        // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
+                        currentProperty.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
+                        currentProperty.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                    }
                     lastProperty = currentProperty;
                     currentProperty = currentProperty ? currentProperty.parent : undefined;
                     currentTree = currentProperty;

package/lib/umd/parser/jsonParser.js

@@ -482,10 +482,11 @@
                 validationResult.enumValues = [schema.const];
             }
             let deprecationMessage = schema.deprecationMessage;
-            if ((deprecationMessage || schema.deprecated) && node.parent) {
+            if (deprecationMessage || schema.deprecated) {
                 deprecationMessage = deprecationMessage || l10n.t('Value is deprecated');
+                let targetNode = node.parent?.type === 'property' ? node.parent : node;
                 validationResult.problems.push({
-                    location: { offset: node.parent.offset, length: node.parent.length },
+                    location: { offset: targetNode.offset, length: targetNode.length },
                     severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: deprecationMessage,
                     code: jsonLanguageTypes_1.ErrorCode.Deprecated
@@ -710,13 +711,13 @@
                 if ((0, objects_1.isNumber)(schema.minContains) && containsCount < schema.minContains) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        message: l10n.t('Array has too few items that match the contains contraint. Expected {0} or more.', schema.minContains)
+                        message: schema.errorMessage || l10n.t('Array has too few items that match the contains contraint. Expected {0} or more.', schema.minContains)
                     });
                 }
                 if ((0, objects_1.isNumber)(schema.maxContains) && containsCount > schema.maxContains) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        message: l10n.t('Array has too many items that match the contains contraint. Expected {0} or less.', schema.maxContains)
+                        message: schema.errorMessage || l10n.t('Array has too many items that match the contains contraint. Expected {0} or less.', schema.maxContains)
                     });
                 }
             }

package/lib/umd/utils/sort.js

@@ -203,15 +203,17 @@
                 case 2 /* SyntaxKind.CloseBraceToken */: {
                     endLineNumber = scanner.getTokenStartLine();
                     currentContainerStack.pop();
-                    // If we are not inside of an empty object and current property end line number has not yet been defined, define it
-                    if (lastNonTriviaNonCommentToken !== 1 /* SyntaxKind.OpenBraceToken */
-                        && currentProperty.endLineNumber === undefined) {
-                        currentProperty.endLineNumber = endLineNumber - 1;
-                        // The current property is also the last property
-                        currentProperty.lastProperty = true;
-                        // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
-                        currentProperty.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
-                        currentProperty.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                    // If we are not inside of an empty object
+                    if (lastNonTriviaNonCommentToken !== 1 /* SyntaxKind.OpenBraceToken */) {
+                        // If current property end line number has not yet been defined, define it
+                        if (currentProperty.endLineNumber === undefined) {
+                            currentProperty.endLineNumber = endLineNumber - 1;
+                            // The current property is also the last property
+                            currentProperty.lastProperty = true;
+                            // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
+                            currentProperty.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
+                            currentProperty.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                        }
                         lastProperty = currentProperty;
                         currentProperty = currentProperty ? currentProperty.parent : undefined;
                         currentTree = currentProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.3.9",
+  "version": "5.3.11",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -17,13 +17,13 @@
   "devDependencies": {
     "@types/mocha": "^10.0.6",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
-    "eslint": "^8.56.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
+    "eslint": "^8.57.0",
     "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876",
-    "mocha": "^10.2.0",
+    "mocha": "^10.4.0",
     "rimraf": "^5.0.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "jsonc-parser": "^3.2.1",