@hyperjump/json-schema 1.4.1 → 1.4.2

package/lib/common.js

@@ -22,7 +22,12 @@ export const resolveUri = (uri, baseUri) => {
   return resolved;
 };
 
-export const toAbsoluteUri = (uri) => toAbsoluteIri(uri);
+export const toAbsoluteUri = (uri) => {
+  const position = uri.indexOf("#");
+  const end = position === -1 ? uri.length : position;
+  return uri.slice(0, end);
+};
+
 export const uriFragment = (uri) => decodeURIComponent(parseIriReference(uri).fragment || "");
 
 const CHAR_BACKWARD_SLASH = 47;

package/lib/instance.js

@@ -1,13 +1,14 @@
 import { append as pointerAppend } from "@hyperjump/json-pointer";
+import { toAbsoluteIri } from "@hyperjump/uri";
 import curry from "just-curry-it";
-import { toAbsoluteUri, jsonTypeOf } from "./common.js";
+import { jsonTypeOf } from "./common.js";
 import * as Reference from "./reference.js";
 
 
 export const nil = { id: undefined, pointer: "", instance: undefined, value: undefined };
 export const cons = (instance, id = undefined) => ({
   ...nil,
-  id: id ? toAbsoluteUri(id) : "",
+  id: id ? toAbsoluteIri(id) : "",
   instance,
   value: instance
 });

package/lib/keywords.js

@@ -1,5 +1,8 @@
+import { toAbsoluteUri } from "./common.js";
+
+
 const _keywords = {};
-export const getKeyword = (id) => _keywords[id];
+export const getKeyword = (id) => _keywords[toAbsoluteUri(id)];
 
 export const addKeyword = (keywordHandler) => {
   _keywords[keywordHandler.id] = keywordHandler;
@@ -13,7 +16,7 @@ export const defineVocabulary = (id, keywords) => {
 const _dialects = {};
 const _allowUnknownKeywords = {};
 export const getKeywordId = (dialectId, keyword) => _dialects[dialectId]?.[keyword]
-  || _allowUnknownKeywords[dialectId] && "https://json-schema.org/keyword/unknown";
+  || (_allowUnknownKeywords[dialectId] || keyword[0] === "@") && `https://json-schema.org/keyword/unknown#${keyword}`;
 export const getKeywordName = (dialectId, keywordId) => {
   for (const keyword in _dialects[dialectId]) {
     if (_dialects[dialectId][keyword] === keywordId) {
@@ -35,7 +38,7 @@ export const loadDialect = (dialectId, dialect, allowUnknownKeywords = false) =>
           .forEach(([keyword, keywordId]) => {
             if (!(keywordId in _keywords) && !isRequired) {
               // Allow keyword to be ignored
-              keywordId = "https://json-schema.org/keyword/unknown";
+              keywordId = `https://json-schema.org/keyword/unknown#${keyword}`;
             }
             _dialects[dialectId][keyword] = keywordId;
           });

package/lib/schema.js

@@ -1,7 +1,8 @@
 import curry from "just-curry-it";
 import * as Pact from "@hyperjump/pact";
 import { nil as nilPointer, append as pointerAppend, get as pointerGet } from "@hyperjump/json-pointer";
-import { jsonTypeOf, resolveUri, toAbsoluteUri, uriFragment, pathRelative, jsonStringify } from "./common.js";
+import { toAbsoluteIri } from "@hyperjump/uri";
+import { jsonTypeOf, resolveUri, uriFragment, pathRelative, jsonStringify } from "./common.js";
 import fetch from "./fetch.js";
 import { hasDialect, loadDialect, getKeywordName } from "./keywords.js";
 import { parseResponse, acceptableMediaTypes } from "./media-types.js";
@@ -18,7 +19,7 @@ export const add = (schema, retrievalUri = undefined, contextDialectId = undefin
   schema = JSON.parse(JSON.stringify(schema));
 
   // Dialect / JSON Schema Version
-  const dialectId = toAbsoluteUri(schema.$schema || contextDialectId || defaultDialectId);
+  const dialectId = toAbsoluteIri(schema.$schema || contextDialectId || defaultDialectId);
   delete schema.$schema;
 
   if (!hasDialect(dialectId)) {
@@ -32,10 +33,10 @@ export const add = (schema, retrievalUri = undefined, contextDialectId = undefin
     throw Error(`Unable to determine an identifier for the schema. Use the '${idToken}' keyword or pass a retrievalUri when loading the schema.`);
   }
   const internalUrl = resolveUri(schema[idToken] || retrievalUri, retrievalUri);
-  const id = toAbsoluteUri(internalUrl);
+  const id = toAbsoluteIri(internalUrl);
   delete schema[idToken];
   if (retrievalUri) {
-    const externalId = toAbsoluteUri(retrievalUri);
+    const externalId = toAbsoluteIri(retrievalUri);
     schemaStoreAlias[externalId] = id;
   }
 
@@ -74,8 +75,17 @@ export const add = (schema, retrievalUri = undefined, contextDialectId = undefin
 
 const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors) => {
   if (jsonTypeOf(subject, "object")) {
+    // Embedded Schema
+    const embeddedDialectId = typeof subject.$schema === "string" ? toAbsoluteIri(subject.$schema) : dialectId;
+    const idToken = getKeywordName(embeddedDialectId, "https://json-schema.org/keyword/id");
+    if (typeof subject[idToken] === "string") {
+      subject[idToken] = resolveUri(subject[idToken], id);
+      add(subject, undefined, dialectId);
+      return Reference.cons(subject[idToken], subject);
+    }
+
     // Legacy id
-    const legacyIdToken = getKeywordName(dialectId, "https://json-schema.org/keyword/draft-04/id");
+    const legacyIdToken = getKeywordName(embeddedDialectId, "https://json-schema.org/keyword/draft-04/id");
     if (typeof subject[legacyIdToken] === "string") {
       if (subject[legacyIdToken][0] === "#") {
         const anchor = decodeURIComponent(subject[legacyIdToken].slice(1));
@@ -89,13 +99,10 @@ const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors)
       delete subject[legacyIdToken];
     }
 
-    // Embedded Schema
-    const embeddedDialectId = typeof subject.$schema === "string" ? toAbsoluteUri(subject.$schema) : dialectId;
-    const idToken = getKeywordName(embeddedDialectId, "https://json-schema.org/keyword/id");
-    if (typeof subject[idToken] === "string") {
-      subject[idToken] = resolveUri(subject[idToken], id);
-      add(subject, undefined, dialectId);
-      return Reference.cons(subject[idToken], subject);
+    const dynamicAnchorToken = getKeywordName(dialectId, "https://json-schema.org/keyword/dynamicAnchor");
+    if (typeof subject[dynamicAnchorToken] === "string") {
+      dynamicAnchors[subject[dynamicAnchorToken]] = `${id}#${encodeURI(pointer)}`;
+      delete subject[dynamicAnchorToken];
     }
 
     // Legacy dynamic anchor
@@ -106,12 +113,6 @@ const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors)
       delete subject[legacyDynamicAnchorToken];
     }
 
-    const dynamicAnchorToken = getKeywordName(dialectId, "https://json-schema.org/keyword/dynamicAnchor");
-    if (typeof subject[dynamicAnchorToken] === "string") {
-      dynamicAnchors[subject[dynamicAnchorToken]] = `${id}#${encodeURI(pointer)}`;
-      delete subject[dynamicAnchorToken];
-    }
-
     const anchorToken = getKeywordName(dialectId, "https://json-schema.org/keyword/anchor");
     if (typeof subject[anchorToken] === "string") {
       anchors[subject[anchorToken]] = pointer;
@@ -157,7 +158,7 @@ const nil = {
 
 export const get = async (url, contextDoc = nil) => {
   const resolvedUrl = resolveUri(url, contextDoc.id);
-  const id = toAbsoluteUri(resolvedUrl);
+  const id = toAbsoluteIri(resolvedUrl);
   const fragment = uriFragment(resolvedUrl);
 
   if (!hasStoredSchema(id)) {
@@ -170,7 +171,7 @@ export const get = async (url, contextDoc = nil) => {
     const [schema, contextDialectId] = await parseResponse(response);
 
     // Try to determine the dialect from the meta-schema if it isn't already known
-    const dialectId = toAbsoluteUri(schema.$schema || contextDialectId || defaultDialectId);
+    const dialectId = toAbsoluteIri(schema.$schema || contextDialectId || defaultDialectId);
     if (!hasDialect(dialectId) && !hasStoredSchema(dialectId)) {
       await get(dialectId);
     }

package/package.json

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