resolved default dialect to upstream changes

language-server/src/jsonc-instance.js

@@ -1,4 +1,4 @@
-import { parseTree } from "jsonc-parser/lib/esm/main.js";
+import { parseTree } from "jsonc-parser";
 import * as JsonPointer from "@hyperjump/json-pointer";
 import { getKeywordId } from "@hyperjump/json-schema/experimental";
 import { drop, find, head, some } from "@hyperjump/pact";
@@ -29,7 +29,9 @@ export class JsoncInstance {
   }
 
   value() {
-    if (this.node.value === undefined) {
+    if (this.node === undefined) {
+      return undefined;
+    } else if (this.node.value === undefined) {
       const json = this.textDocument.getText().slice(this.node.offset, this.node.offset + this.node.length);
       return JSON.parse(json);
     } else {

language-server/src/server.js

@@ -46,6 +46,7 @@ connection.onInitialize(({ capabilities, workspaceFolders }) => {
   hasConfigurationCapability = !!(
     capabilities.workspace && !!capabilities.workspace.configuration
   );
+  connection.console.log(hasConfigurationCapability);
 
   if (workspaceFolders) {
     addWorkspaceFolders(workspaceFolders);
@@ -117,6 +118,8 @@ connection.onInitialized(async () => {
 
 const documentSettings = new Map(); // Consider a Map for cache
 let globalSettings = {
+  enableDetailedErrors: false,
+  schemaValidationSeverity: "error",
   defaultDialect: "http://json-schema.org/draft-07/schema#"
 }; // Sensible defaults
 
@@ -178,11 +181,10 @@ const validateSchema = async (document) => {
   const diagnostics = [];
   const settings = await getDocumentSettings(document.uri);
   connection.console.log(JSON.stringify(settings));
-  let instance;
   let contextDialectUri;
   let dialectUri;
+  const instance = JsoncInstance.fromTextDocument(document);
   try {
-    instance = JsoncInstance.fromTextDocument(document);
     const $schema = instance.get("#/$schema");
    // Determine the context dialect URI from the document
     contextDialectUri = $schema?.value();

language-server/src/workspace.js

@@ -43,10 +43,6 @@ export const workspaceSchemas = async function* () {
     const path = fileURLToPath(uri);
 
     for (const filename of await readdir(path, { recursive: true })) {
-      if (!filename.endsWith(".schema.json")) {
-        continue;
-      }
-
       const schemaPath = resolve(path, filename);
 
       yield pathToFileURL(schemaPath).toString();

vscode/package.json

@@ -8,7 +8,7 @@
     "vscode:prepublish": "npm run build-client -- --minify && npm run build-server -- --minify",
     "build": "npm run build-client -- --sourcemap && npm run build-server -- --sourcemap",
     "build-client": "esbuild ./src/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node",
-    "build-server": "esbuild ../language-server/src/server.js --bundle --outfile=out/server.js --external:vscode --format=cjs --platform=node",
+    "build-server": "esbuild ../language-server/src/server.js --bundle --main-fields=module,main --outfile=out/server.js --external:vscode --format=cjs --platform=node",
     "package": "vsce package --out=dist",
     "publish": "vsce publish"
   },