@hyperjump/json-schema 1.2.0 → 1.2.1

package/lib/common.d.ts

@@ -1,5 +1,7 @@
 export type JsonType = "object" | "array" | "string" | "number" | "boolean" | "null";
 export type JsonSchemaType = JsonType | "integer";
 
-type PathRelative = (from: string, to: string) => string;
-export const pathRelative: PathRelative;
+export const pathRelative: (from: string, to: string) => string;
+
+export type Replacer = (key: string, value: unknown) => unknown;
+export const jsonStringify: (value: unknown, replacer?: Replacer, space?: string) => string;

package/lib/common.js

@@ -1,4 +1,5 @@
 import { resolveIri, toAbsoluteIri, parseIriReference } from "@hyperjump/uri";
+import * as JsonPointer from "@hyperjump/json-pointer";
 
 
 const isObject = (value) => typeof value === "object" && !Array.isArray(value) && value !== null;
@@ -86,3 +87,65 @@ export const pathRelative = (from, to) => {
 
   return to.slice(toStart, to.length);
 };
+
+const defaultReplacer = (key, value) => value;
+export const jsonStringify = (value, replacer = defaultReplacer, space = "") => {
+  return stringifyValue(value, replacer, space, "", JsonPointer.nil, 1);
+};
+
+const stringifyValue = (value, replacer, space, key, pointer, depth) => {
+  value = replacer(key, value, pointer);
+  let result;
+  if (Array.isArray(value)) {
+    result = stringifyArray(value, replacer, space, pointer, depth);
+  } else if (typeof value === "object" && value !== null) {
+    result = stringifyObject(value, replacer, space, pointer, depth);
+  } else {
+    result = JSON.stringify(value);
+  }
+
+  return result;
+};
+
+const stringifyArray = (value, replacer, space, pointer, depth) => {
+  if (value.length === 0) {
+    return "[]";
+  }
+
+  const padding = space ? `\n${space.repeat(depth - 1)}` : "";
+
+  let result = "[" + padding + space;
+  for (let index = 0; index < value.length; index++) {
+    const indexPointer = JsonPointer.append(index, pointer);
+    const stringifiedValue = stringifyValue(value[index], replacer, space, String(index), indexPointer, depth + 1);
+    result += stringifiedValue === undefined ? "null" : stringifiedValue;
+    if (index + 1 < value.length) {
+      result += `,${padding}${space}`;
+    }
+  }
+  return result + padding + "]";
+};
+
+const stringifyObject = (value, replacer, space, pointer, depth) => {
+  const entries = Object.entries(value);
+  if (entries.length === 0) {
+    return "{}";
+  }
+
+  const padding = space ? `\n${space.repeat(depth - 1)}` : "";
+  const colonSpacing = space ? " " : "";
+
+  let result = "{" + padding + space;
+  for (let index = 0; index < entries.length; index++) {
+    const [key, value] = entries[index];
+    const keyPointer = JsonPointer.append(key, pointer);
+    const stringifiedValue = stringifyValue(value, replacer, space, key, keyPointer, depth + 1);
+    if (stringifiedValue !== undefined) {
+      result += JSON.stringify(key) + ":" + colonSpacing + stringifiedValue;
+      if (entries[index + 1]) {
+        result += `,${padding}${space}`;
+      }
+    }
+  }
+  return result + padding + "}";
+};

package/lib/instance.js

@@ -1,4 +1,4 @@
-import * as JsonPointer from "@hyperjump/json-pointer";
+import { append as pointerAppend } from "@hyperjump/json-pointer";
 import curry from "just-curry-it";
 import { toAbsoluteUri, jsonTypeOf } from "./common.js";
 import * as Reference from "./reference.js";
@@ -27,7 +27,7 @@ export const typeOf = curry((doc, type) => jsonTypeOf(value(doc), type));
 
 export const step = (key, doc) => ({
   ...doc,
-  pointer: JsonPointer.append(key, doc.pointer),
+  pointer: pointerAppend(key, doc.pointer),
   value: value(doc)[key]
 });
 

package/lib/schema.js

@@ -1,8 +1,7 @@
 import curry from "just-curry-it";
 import * as Pact from "@hyperjump/pact";
-import * as Json from "@hyperjump/json";
-import * as JsonPointer from "@hyperjump/json-pointer";
-import { jsonTypeOf, resolveUri, toAbsoluteUri, uriFragment, pathRelative } from "./common.js";
+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 fetch from "./fetch.js";
 import { hasDialect, loadDialect, getKeywordName } from "./keywords.js";
 import { parseResponse } from "./media-types.js";
@@ -64,7 +63,7 @@ export const add = (schema, retrievalUri = undefined, contextDialectId = undefin
   schemaStore[id] = {
     id: id,
     dialectId: dialectId,
-    schema: processSchema(schema, id, dialectId, JsonPointer.nil, anchors, dynamicAnchors),
+    schema: processSchema(schema, id, dialectId, nilPointer, anchors, dynamicAnchors),
     anchors: anchors,
     dynamicAnchors: dynamicAnchors,
     validated: false
@@ -126,11 +125,11 @@ const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors)
     }
 
     for (const key in subject) {
-      subject[key] = processSchema(subject[key], id, dialectId, JsonPointer.append(key, pointer), anchors, dynamicAnchors);
+      subject[key] = processSchema(subject[key], id, dialectId, pointerAppend(key, pointer), anchors, dynamicAnchors);
     }
   } else if (Array.isArray(subject)) {
     for (let index = 0; index < subject.length; index++) {
-      subject[index] = processSchema(subject[index], id, dialectId, JsonPointer.append(index, pointer), anchors, dynamicAnchors);
+      subject[index] = processSchema(subject[index], id, dialectId, pointerAppend(index, pointer), anchors, dynamicAnchors);
     }
   }
 
@@ -148,7 +147,7 @@ export const markValidated = (id) => {
 const nil = {
   id: undefined,
   dialectId: undefined,
-  pointer: JsonPointer.nil,
+  pointer: nilPointer,
   schema: undefined,
   value: undefined,
   anchors: {},
@@ -184,7 +183,7 @@ export const get = async (url, contextDoc = nil) => {
   const doc = {
     ...storedSchema,
     pointer: pointer,
-    value: JsonPointer.get(pointer, storedSchema.schema)
+    value: pointerGet(pointer, storedSchema.schema)
   };
 
   return followReferences(doc);
@@ -210,7 +209,7 @@ export const step = (key, doc) => {
   const storedSchema = getStoredSchema(doc.id);
   return followReferences({
     ...doc,
-    pointer: JsonPointer.append(`${key}`, doc.pointer),
+    pointer: pointerAppend(`${key}`, doc.pointer),
     value: value(doc)[key],
     validated: storedSchema.validated
   });
@@ -261,7 +260,7 @@ export const toSchema = (schemaDoc, options = {}) => {
     dynamicAnchors[pointer] = anchor;
   }
 
-  const schema = JSON.parse(Json.stringify(schemaDoc.schema, (key, value, pointer) => {
+  const schema = JSON.parse(jsonStringify(schemaDoc.schema, (key, value, pointer) => {
     if (Reference.isReference(value)) {
       const refValue = Reference.value(value);
       if (fullOptions.includeEmbedded || !(idToken in refValue)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -62,8 +62,7 @@
     "yaml": "*"
   },
   "dependencies": {
-    "@hyperjump/json": "^0.1.0",
-    "@hyperjump/json-pointer": "^0.9.5",
+    "@hyperjump/json-pointer": "^1.0.0",
     "@hyperjump/pact": "^0.2.4",
     "@hyperjump/uri": "^1.0.0",
     "content-type": "^1.0.4",