Move dialect registry to schema-document

Author: jdesrosiers

language-server/src/features/schema-registry.js

@@ -1,9 +1,7 @@
 import { getDocumentSettings } from "./document-settings.js";
 import * as SchemaDocument from "../schema-document.js";
-import { registerSchema, unregisterSchema } from "@hyperjump/json-schema/draft-2020-12";
-import * as SchemaNode from "../schema-node.js";
+import { unregisterSchema } from "@hyperjump/json-schema/draft-2020-12";
 import { publishAsync } from "../pubsub.js";
-import { keywordNameFor } from "../util.js";
 
 /**
  * @import { Connection } from "vscode-languageserver"
@@ -56,13 +54,6 @@ export const getSchemaDocument = async (connection, textDocument) => {
 
     schemaDocuments.set(textDocument.uri, { version: textDocument.version, schemaDocument });
   }
-  for (const schemaResource of schemaDocument.schemaResources) {
-    const vocabToken = keywordNameFor("https://json-schema.org/keyword/vocabulary", schemaResource.dialectUri);
-    const vocabularyNode = vocabToken && await SchemaNode.step(vocabToken, schemaResource);
-    if (vocabularyNode) {
-      registerSchema(SchemaNode.value(schemaResource), textDocument.uri);
-    }
-  }
 
   return schemaDocument;
 };

language-server/src/schema-document.js

@@ -4,6 +4,7 @@ import { reduce } from "@hyperjump/pact";
 import { getNodeValue, parseTree } from "jsonc-parser";
 import * as SchemaNode from "./schema-node.js";
 import { keywordNameFor, toAbsoluteUri, uriFragment, resolveIri, normalizeUri } from "./util.js";
+import { addSchema } from "@hyperjump/json-schema/draft-2020-12";
 
 /**
  * @import { TextDocument } from "vscode-languageserver-textdocument"
@@ -57,6 +58,12 @@ export const fromTextDocument = async (textDocument, contextDialectUri) => {
     buildSchemaResources(document, root, textDocument.uri, contextDialectUri);
 
     for (const schemaResource of document.schemaResources) {
+      const vocabToken = keywordNameFor("https://json-schema.org/keyword/vocabulary", schemaResource.dialectUri);
+      const vocabularyNode = vocabToken && await SchemaNode.step(vocabToken, schemaResource);
+      if (vocabularyNode) {
+        addSchema(SchemaNode.value(schemaResource), schemaResource.baseUri);
+      }
+
       if (!schemaResource.dialectUri || !hasDialect(schemaResource.dialectUri)) {
         const $schema = SchemaNode.get("#/$schema", schemaResource);
         if ($schema && SchemaNode.typeOf($schema) === "string") {