Rename json-node.js

Author: jdesrosiers

language-server/src/annotations.test.js

@@ -5,7 +5,7 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 
 import { registerSchema, unregisterSchema } from "@hyperjump/json-schema/draft-2020-12";
 import { getSchema, compile, interpret } from "@hyperjump/json-schema/experimental";
-import * as Instance from "./json-instance.js";
+import * as JsonNode from "./json-node.js";
 import { toAbsoluteUri } from "./util.js";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { parseTree } from "jsonc-parser";
@@ -55,15 +55,15 @@ describe("Annotations", () => {
                   allowTrailingComma: true,
                   allowEmptyContent: true
                 });
-                instance = Instance.fromJsonc(root);
+                instance = JsonNode.fromJsonc(root);
                 interpret(compiled, instance);
               });
 
               subject.assertions.forEach((assertion) => {
                 it(`${assertion.keyword} annotations at '${assertion.location}' should be ${JSON.stringify(assertion.expected)}`, () => {
                   const dialect = suite.schema.$schema ? toAbsoluteUri(suite.schema.$schema) : dialectId;
-                  const subject = Instance.get(assertion.location, instance);
-                  const annotations = subject ? Instance.annotation(subject, assertion.keyword, dialect) : [];
+                  const subject = JsonNode.get(assertion.location, instance);
+                  const annotations = subject ? JsonNode.annotation(subject, assertion.keyword, dialect) : [];
                   expect(annotations).to.eql(assertion.expected);
                 });
               });

language-server/src/features/deprecated.js

@@ -1,5 +1,5 @@
 import { DiagnosticSeverity, DiagnosticTag } from "vscode-languageserver";
-import * as Instance from "../json-instance.js";
+import * as JsonNode from "../json-node.js";
 import { subscribe } from "../pubsub.js";
 
 
@@ -11,10 +11,10 @@ export default {
   onInitialized() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
       for (const deprecated of schemaDocument.annotatedWith("deprecated")) {
-        if (Instance.annotation(deprecated, "deprecated").some((deprecated) => deprecated)) {
+        if (JsonNode.annotation(deprecated, "deprecated").some((deprecated) => deprecated)) {
           diagnostics.push({
             instance: deprecated.parent,
-            message: Instance.annotation(deprecated, "x-deprecationMessage").join("\n") || "deprecated",
+            message: JsonNode.annotation(deprecated, "x-deprecationMessage").join("\n") || "deprecated",
             severity: DiagnosticSeverity.Warning,
             tags: [DiagnosticTag.Deprecated]
           });

language-server/src/features/hover.js

@@ -1,5 +1,5 @@
 import { MarkupKind } from "vscode-languageserver";
-import * as Instance from "../json-instance.js";
+import * as JsonNode from "../json-node.js";
 import { getSchemaDocument } from "./schema-registry.js";
 
 
@@ -19,11 +19,11 @@ export default {
 
       // This is a little wierd because we want the hover to be on the keyword, but
       // the annotation is actually on the value not the keyword.
-      if (keyword.parent && Instance.typeOf(keyword.parent) === "property" && keyword.parent.children[0] === keyword) {
+      if (keyword.parent && JsonNode.typeOf(keyword.parent) === "property" && keyword.parent.children[0] === keyword) {
         return {
           contents: {
             kind: MarkupKind.Markdown,
-            value: Instance.annotation(keyword.parent.children[1], "description").join("\n")
+            value: JsonNode.annotation(keyword.parent.children[1], "description").join("\n")
           },
           range: {
             start: document.positionAt(keyword.offset),

language-server/src/features/semantic-tokens.js

@@ -1,6 +1,6 @@
 import { SemanticTokensBuilder } from "vscode-languageserver";
 import { getKeywordId } from "@hyperjump/json-schema/experimental";
-import * as Instance from "../json-instance.js";
+import * as JsonNode from "../json-node.js";
 import { getSchemaDocument } from "./schema-registry.js";
 import { toAbsoluteUri } from "../util.js";
 import { isMatchedFile } from "./workspace.js";
@@ -133,8 +133,8 @@ const getSemanticTokens = function* (schemaDocument) {
 };
 
 const schemaHandler = function* (schemaResource, dialectUri) {
-  for (const [keyNode, valueNode] of Instance.entries(schemaResource)) {
-    const keywordName = Instance.value(keyNode);
+  for (const [keyNode, valueNode] of JsonNode.entries(schemaResource)) {
+    const keywordName = JsonNode.value(keyNode);
     const keywordId = keywordIdFor(keywordName, dialectUri);
 
     if (keywordId) {
@@ -159,13 +159,13 @@ const keywordIdFor = (keywordName, dialectUri) => {
 };
 
 const schemaMapHandler = function* (schemaResource, dialectUri) {
-  for (const schemaNode of Instance.values(schemaResource)) {
+  for (const schemaNode of JsonNode.values(schemaResource)) {
     yield* schemaHandler(schemaNode, dialectUri);
   }
 };
 
 const schemaArrayHandler = function* (schemaResource, dialectUri) {
-  for (const schemaNode of Instance.iter(schemaResource)) {
+  for (const schemaNode of JsonNode.iter(schemaResource)) {
     yield* schemaHandler(schemaNode, dialectUri);
   }
 };

language-server/src/json-instance.js renamed to language-server/src/json-node.js

@@ -2,7 +2,7 @@ import { getSchema, compile, interpret, getKeywordName, hasDialect, BASIC } from
 import * as JsonPointer from "@hyperjump/json-pointer";
 import { resolveIri, toAbsoluteIri } from "@hyperjump/uri";
 import { getNodeValue, parseTree } from "jsonc-parser";
-import * as Instance from "./json-instance.js";
+import * as JsonNode from "./json-node.js";
 import { uriFragment } from "./util.js";
 
 
@@ -28,8 +28,8 @@ export class JsonSchemaDocument {
 
       for (const { dialectUri, schemaResource } of document.schemaResources) {
         if (!hasDialect(dialectUri)) {
-          const $schema = Instance.get("#/$schema", schemaResource);
-          if ($schema && Instance.typeOf($schema) === "string") {
+          const $schema = JsonNode.get("#/$schema", schemaResource);
+          if ($schema && JsonNode.typeOf($schema) === "string") {
             document.errors.push({
               keyword: "https://json-schema.org/keyword/schema",
               instanceNode: $schema,
@@ -60,7 +60,7 @@ export class JsonSchemaDocument {
             document.errors.push({
               keyword: error.keyword,
               keywordNode: await getSchema(error.absoluteKeywordLocation),
-              instanceNode: Instance.get(error.instanceLocation, schemaResource)
+              instanceNode: JsonNode.get(error.instanceLocation, schemaResource)
             });
           }
         }
@@ -71,7 +71,7 @@ export class JsonSchemaDocument {
   }
 
   #buildSchemaResources(node, uri = "", dialectUri = "", pointer = "", parent = undefined, anchors = {}) {
-    const jsonNode = Instance.cons(uri, pointer, getNodeValue(node), node.type, [], parent, node.offset, node.length);
+    const jsonNode = JsonNode.cons(uri, pointer, getNodeValue(node), node.type, [], parent, node.offset, node.length);
 
     switch (node.type) {
       case "array":
@@ -115,7 +115,7 @@ export class JsonSchemaDocument {
           if (embeddedDialectUri) {
             this.#buildSchemaResources(node, uri, embeddedDialectUri);
 
-            return Instance.cons(uri, pointer, true, "boolean", [], parent, node.offset, node.length);
+            return JsonNode.cons(uri, pointer, true, "boolean", [], parent, node.offset, node.length);
           }
         }
 
@@ -170,8 +170,8 @@ export class JsonSchemaDocument {
 
   * annotatedWith(keyword, dialectId = "https://json-schema.org/draft/2020-12/schema") {
     for (const { schemaResource } of this.schemaResources) {
-      for (const node of Instance.allNodes(schemaResource)) {
-        if (Instance.annotation(node, keyword, dialectId).length > 0) {
+      for (const node of JsonNode.allNodes(schemaResource)) {
+        if (JsonNode.annotation(node, keyword, dialectId).length > 0) {
           yield node;
         }
       }
@@ -180,7 +180,7 @@ export class JsonSchemaDocument {
 
   findNodeAtOffset(offset) {
     for (const { schemaResource } of this.schemaResources) {
-      const node = Instance.findNodeAtOffset(schemaResource, offset);
+      const node = JsonNode.findNodeAtOffset(schemaResource, offset);
       if (node) {
         return node;
       }

language-server/src/json-schema-document.js

@@ -5,7 +5,7 @@ import { registerSchema, unregisterSchema } from "@hyperjump/json-schema";
 import { getSchema, compile, interpret } from "@hyperjump/json-schema/experimental";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { parseTree } from "jsonc-parser";
-import * as Instance from "./json-instance.js";
+import * as JsonNode from "./json-node.js";
 
 
 const shouldSkip = (skip, path) => {
@@ -83,7 +83,7 @@ export const runTestSuite = (draft, dialectId, skip) => {
                       allowTrailingComma: true,
                       allowEmptyContent: true
                     });
-                    const instance = Instance.fromJsonc(root);
+                    const instance = JsonNode.fromJsonc(root);
                     const output = interpret(compiled, instance);
                     expect(output.valid).to.equal(test.valid);
                   });