Merge pull request #139 from microsoft/aeschli/updateversions

update to 5.0.0

CHANGELOG.md

@@ -1,6 +1,12 @@
+5.0.0 / 2022-05-17
+================
+ * Update to `vscode-languageserver-types@3.16`
+ * Add more schema support 
+   * Schema 2019-09: unevaluatedProperties, unevaluatedItems, minContains, maxContains, deprecated, dependentRequired, dependentSchemas, $defs, $anchor
+   * Schema 2020-12: prefixItem
 
 
-4.2.0 / 
+4.2.0 / 2022-01-25
 ================
  * new API `LanguageService.getLanguageStatus`
  * support for $ref with $id

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "4.2.1",
+  "version": "5.0.0",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -15,20 +15,20 @@
     "url": "https://github.com/Microsoft/vscode-json-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^10.12.21",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
-    "eslint": "^8.11.0",
-    "mocha": "^9.2.2",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "16.x",
+    "@typescript-eslint/eslint-plugin": "^5.24.0",
+    "@typescript-eslint/parser": "^5.24.0",
+    "eslint": "^8.15.0",
+    "mocha": "^10.0.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
   "dependencies": {
     "jsonc-parser": "^3.0.0",
-    "vscode-languageserver-textdocument": "^1.0.3",
-    "vscode-languageserver-types": "^3.16.0",
-    "vscode-nls": "^5.0.0",
+    "vscode-languageserver-textdocument": "^1.0.4",
+    "vscode-languageserver-types": "^3.17.1",
+    "vscode-nls": "^5.0.1",
     "vscode-uri": "^3.0.3"
   },
   "scripts": {

src/test/schema.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as SchemaService from '../services/jsonSchemaService';
 import * as Parser from '../parser/jsonParser';
-import * as fs from 'fs';
+import { promises as fs } from 'fs';
 import * as url from 'url';
 import * as path from 'path';
 import { getLanguageService, JSONSchema, SchemaRequestService, TextDocument, MatchingSchema } from '../jsonLanguageService';
@@ -34,7 +34,7 @@ suite('JSON Schema', () => {
 
 	function newMockRequestService(schemas: { [uri: string]: JSONSchema } = {}, accesses: string[] = []): SchemaRequestService {
 
-		return (uri: string): Promise<string> => {
+		return async (uri: string): Promise<string> => {
 			if (uri.length && uri[uri.length - 1] === '#') {
 				uri = uri.substr(0, uri.length - 1);
 			}
@@ -48,14 +48,10 @@ suite('JSON Schema', () => {
 
 			const fileName = fixureDocuments[uri];
 			if (fileName) {
-				return new Promise<string>((c, e) => {
-					const fixturePath = path.join(__dirname, '../../../src/test/fixtures', fileName);
-					fs.readFile(fixturePath, 'UTF-8', (err, result) => {
-						err ? e("Resource not found") : c(result.toString());
-					});
-				});
+				const fixturePath = path.join(__dirname, '../../../src/test/fixtures', fileName);
+				return (await fs.readFile(fixturePath)).toString();
 			}
-			return Promise.reject<string>("Resource not found");
+			throw new Error("Resource not found");
 		};
 	}