@hyperjump/json-schema 1.9.1 → 1.9.3

package/README.md

@@ -592,8 +592,6 @@ These are available from the `@hyperjump/json-schema/experimental` export.
         * includeDialect: "auto" | "always" | "never" (default: "auto") -- If
           "auto", `$schema` will only be included if it differs from
           `contextDialectId`.
-        * selfIdentify: boolean (default: false) -- If true, `$id` will be
-          included.
         * contextUri: string (default: "") -- `$id`s will be relative to this
           URI.
         * includeEmbedded: boolean (default: true) -- If false, embedded schemas
@@ -631,6 +629,10 @@ working with generators and async generators.
 * **fromJs**: (value: any, uri?: string) => JsonNode
 
     Construct a JsonNode from a JavaScript value.
+* **cons**: (baseUri: string, pointer: string, value: any, type: string, children: JsonNode[], parent?: JsonNode) => JsonNode
+
+    Construct a JsonNode. This is used internally. You probably want `fromJs`
+    instead.
 * **get**: (url: string, instance: JsonNode) => JsonNode
 
     Apply a same-resource reference to a JsonNode.

package/annotations/annotated-instance.js

@@ -18,7 +18,7 @@ export const annotation = (node, keyword, dialect = defaultDialectId) => {
   let currentNode = node.root;
   const errors = Object.keys(node.root.errors);
   for (let segment of JsonPointer.pointerSegments(node.pointer)) {
-    segment = segment === "-" && currentNode.typeOf() === "array" ? currentNode.length() : segment;
+    segment = segment === "-" && Instance.typeOf(currentNode) === "array" ? Instance.length(currentNode) : segment;
     currentNode = Instance.step(segment, currentNode);
     errors.push(...Object.keys(currentNode.errors));
   }

package/bundle/index.js

@@ -3,7 +3,6 @@ import { v4 as uuid } from "uuid";
 import * as Browser from "@hyperjump/browser";
 import * as JsonPointer from "@hyperjump/json-pointer";
 import { asyncCollectSet, asyncFilter, asyncFlatten, asyncMap, pipe } from "@hyperjump/pact";
-import { resolveUri } from "@hyperjump/uri";
 import {
   Validation,
   canonicalUri, getSchema, toSchema,
@@ -37,10 +36,13 @@ export const bundle = async (url, options = {}) => {
   }
 
   for (const uri of externalIds) {
+    if (fullOptions.externalSchemas.includes(uri)) {
+      continue;
+    }
+
     const externalSchema = await getSchema(uri);
     const embeddedSchema = toSchema(externalSchema, {
-      selfIdentify: true,
-      contextUri: contextUri,
+      contextUri: externalSchema.document.baseUri.startsWith("file:") ? contextUri : undefined,
       includeDialect: fullOptions.alwaysIncludeDialect ? "always" : "auto",
       contextDialectId: contextDialectId
     });
@@ -49,9 +51,6 @@ export const bundle = async (url, options = {}) => {
       const idToken = getKeywordName(externalSchema.document.dialectId, "https://json-schema.org/keyword/id")
         || getKeywordName(externalSchema.document.dialectId, "https://json-schema.org/keyword/draft-04/id");
       id = embeddedSchema[idToken];
-      if (id in JsonPointer.get(bundlingLocation, bundled)) {
-        id = resolveUri(id, contextUri);
-      }
     } else if (fullOptions.definitionNamingStrategy === UUID) {
       id = uuid();
     } else {

package/lib/instance.d.ts

@@ -3,6 +3,14 @@ import type { Json } from "@hyperjump/json-pointer";
 
 export const fromJs: (value: Json, uri?: string) => JsonNode;
 
+export const cons: (
+  baseUri: string,
+  pointer: string,
+  value: Json,
+  type: JsonNodeType,
+  children: JsonNode[],
+  parent?: JsonNode
+) => JsonNode;
 export const get: (url: string, context: JsonNode) => JsonNode | undefined;
 export const uri: (node: JsonNode) => string;
 export const value: <A>(node: JsonNode) => A;
@@ -25,6 +33,8 @@ export type JsonNode = {
   parent: JsonNode;
   root: JsonNode;
   valid: boolean;
+  errors: Record<string, string>;
+  annotations: Record<string, Record<string, unknown>>;
 };
 
 type JsonNodeType = "object" | "array" | "string" | "number" | "boolean" | "null" | "property";

package/lib/instance.js

@@ -40,7 +40,7 @@ export const fromJs = (value, uri = "", pointer = "", parent = undefined) => {
   }
 };
 
-const cons = (baseUri, pointer, value, type, children, parent) => {
+export const cons = (baseUri, pointer, value, type, children, parent) => {
   const node = {
     baseUri: baseUri ? toAbsoluteIri(baseUri) : "",
     pointer: pointer,

package/lib/schema.js

@@ -206,6 +206,10 @@ const processSchema = (json, id, dialectId, cursor, embedded, anchors, dynamicAn
 export const canonicalUri = (browser) => `${browser.document.baseUri}#${encodeURI(browser.cursor)}`;
 
 export const toSchema = (browser, options = {}) => {
+  if (!options.contextUri && browser.document.baseUri.startsWith("file:")) {
+    options.contextUri = browser.document.baseUri;
+  }
+
   const anchors = {};
   for (const anchor in browser.document.anchors) {
     if (anchor !== "" && !browser.document.dynamicAnchors[anchor]) {
@@ -237,9 +241,7 @@ export const toSchema = (browser, options = {}) => {
         if (JSON.stringify(value.toJSON()) === "{}") {
           return toSchema({ document: browser.document.embedded[toAbsoluteIri(value.href)] }, {
             ...options,
-            contextDialectId: browser.document.dialectId,
-            selfIdentify: true,
-            contextUri: browser.document.baseUri
+            contextDialectId: browser.document.dialectId
           });
         } else {
           return { [legacyRefToken]: value.href };
@@ -247,9 +249,7 @@ export const toSchema = (browser, options = {}) => {
       } else if (options.includeEmbedded ?? true) {
         return toSchema({ document: browser.document.embedded[toAbsoluteIri(value.href)] }, {
           ...options,
-          contextDialectId: browser.document.dialectId,
-          selfIdentify: true,
-          contextUri: browser.document.baseUri
+          contextDialectId: browser.document.dialectId
         });
       } else {
         return;
@@ -295,18 +295,25 @@ export const toSchema = (browser, options = {}) => {
   }
 
   // Self-identification
-  if (options.selfIdentify ?? false) {
-    if (options.contextUri) {
-      schema = {
-        [idToken]: toRelativeIri(normalizeIri(options.contextUri), browser.document.baseUri),
-        ...schema
-      };
-    } else {
+  if (options.contextUri) {
+    const relativeUri = toRelativeIri(normalizeIri(options.contextUri), browser.document.baseUri);
+    if (relativeUri !== "") {
+      const id = schema[idToken] ? `${relativeUri}${schema[idToken]}` : relativeUri;
+      delete schema[idToken];
+
       schema = {
-        [idToken]: browser.document.baseUri,
+        [idToken]: id,
         ...schema
       };
     }
+  } else if (!browser.document.baseUri.startsWith("file:")) {
+    const id = schema[idToken] ? `${browser.document.baseUri}${schema[idToken]}` : browser.document.baseUri;
+    delete schema[idToken];
+
+    schema = {
+      [idToken]: id,
+      ...schema
+    };
   }
 
   // $schema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",