@hyperjump/json-schema 0.23.4 → 1.0.0

package/draft-06/schema.js

@@ -0,0 +1,154 @@
+export default {
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "http://json-schema.org/draft-06/schema#",
+  "title": "Core schema meta-schema",
+  "definitions": {
+    "schemaArray": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "$ref": "#" }
+    },
+    "nonNegativeInteger": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "nonNegativeIntegerDefault0": {
+      "allOf": [
+        { "$ref": "#/definitions/nonNegativeInteger" },
+        { "default": 0 }
+      ]
+    },
+    "simpleTypes": {
+      "enum": [
+        "array",
+        "boolean",
+        "integer",
+        "null",
+        "number",
+        "object",
+        "string"
+      ]
+    },
+    "stringArray": {
+      "type": "array",
+      "items": { "type": "string" },
+      "uniqueItems": true,
+      "default": []
+    }
+  },
+  "type": ["object", "boolean"],
+  "properties": {
+    "$id": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$schema": {
+      "type": "string",
+      "format": "uri"
+    },
+    "$ref": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "title": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "default": {},
+    "examples": {
+      "type": "array",
+      "items": {}
+    },
+    "multipleOf": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "maximum": {
+      "type": "number"
+    },
+    "exclusiveMaximum": {
+      "type": "number"
+    },
+    "minimum": {
+      "type": "number"
+    },
+    "exclusiveMinimum": {
+      "type": "number"
+    },
+    "maxLength": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minLength": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "pattern": {
+      "type": "string",
+      "format": "regex"
+    },
+    "additionalItems": { "$ref": "#" },
+    "items": {
+      "anyOf": [
+        { "$ref": "#" },
+        { "$ref": "#/definitions/schemaArray" }
+      ],
+      "default": {}
+    },
+    "maxItems": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minItems": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "uniqueItems": {
+      "type": "boolean",
+      "default": false
+    },
+    "contains": { "$ref": "#" },
+    "maxProperties": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minProperties": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "required": { "$ref": "#/definitions/stringArray" },
+    "additionalProperties": { "$ref": "#" },
+    "definitions": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "properties": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "patternProperties": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "dependencies": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [
+          { "$ref": "#" },
+          { "$ref": "#/definitions/stringArray" }
+        ]
+      }
+    },
+    "propertyNames": { "$ref": "#" },
+    "const": {},
+    "enum": {
+      "type": "array",
+      "minItems": 1,
+      "uniqueItems": true
+    },
+    "type": {
+      "anyOf": [
+        { "$ref": "#/definitions/simpleTypes" },
+        {
+          "type": "array",
+          "items": { "$ref": "#/definitions/simpleTypes" },
+          "minItems": 1,
+          "uniqueItems": true
+        }
+      ]
+    },
+    "format": { "type": "string" },
+    "allOf": { "$ref": "#/definitions/schemaArray" },
+    "anyOf": { "$ref": "#/definitions/schemaArray" },
+    "oneOf": { "$ref": "#/definitions/schemaArray" },
+    "not": { "$ref": "#" }
+  },
+  "default": {}
+};

package/{lib/draft-07.d.ts → draft-07/index.d.ts}

@@ -1,8 +1,8 @@
-import type { Json } from "@hyperjump/json-schema-core";
-import type { JsonSchemaType } from "./common";
+import type { Json } from "@hyperjump/json-pointer";
+import type { JsonSchemaType } from "../lib/common.js";
 
 
-export type Draft07Schema = boolean | {
+export type JsonSchemaDraft07 = boolean | {
   $ref: string;
 } | {
   $schema?: "http://json-schema.org/draft-07/schema#";
@@ -22,32 +22,34 @@ export type Draft07Schema = boolean | {
   maxLength?: number;
   minLength?: number;
   pattern?: string;
-  additionalItems?: Draft07Schema;
-  items?: Draft07Schema | Draft07Schema[];
+  additionalItems?: JsonSchemaDraft07;
+  items?: JsonSchemaDraft07 | JsonSchemaDraft07[];
   maxItems?: number;
   minItems?: number;
   uniqueItems?: boolean;
-  contains?: Draft07Schema;
+  contains?: JsonSchemaDraft07;
   maxProperties?: number;
   minProperties?: number;
   required?: string[];
-  additionalProperties?: Draft07Schema;
-  definitions?: Record<string, Draft07Schema>;
-  properties?: Record<string, Draft07Schema>;
-  patternProperties?: Record<string, Draft07Schema>;
-  dependencies?: Record<string, Draft07Schema | string[]>;
-  propertyNames?: Draft07Schema;
+  additionalProperties?: JsonSchemaDraft07;
+  definitions?: Record<string, JsonSchemaDraft07>;
+  properties?: Record<string, JsonSchemaDraft07>;
+  patternProperties?: Record<string, JsonSchemaDraft07>;
+  dependencies?: Record<string, JsonSchemaDraft07 | string[]>;
+  propertyNames?: JsonSchemaDraft07;
   const?: Json;
   enum?: Json[];
   type?: JsonSchemaType | JsonSchemaType[];
   format?: "date-time" | "date" | "time" | "email" | "idn-email" | "hostname" | "idn-hostname" | "ipv4" | "ipv6" | "uri" | "uri-reference" | "iri" | "iri-reference" | "uri-template" | "json-pointer" | "relative-json-pointer" | "regex";
   contentMediaType?: string;
   contentEncoding?: string;
-  if?: Draft07Schema;
-  then?: Draft07Schema;
-  else?: Draft07Schema;
-  allOf?: Draft07Schema[];
-  anyOf?: Draft07Schema[];
-  oneOf?: Draft07Schema[];
-  not?: Draft07Schema;
+  if?: JsonSchemaDraft07;
+  then?: JsonSchemaDraft07;
+  else?: JsonSchemaDraft07;
+  allOf?: JsonSchemaDraft07[];
+  anyOf?: JsonSchemaDraft07[];
+  oneOf?: JsonSchemaDraft07[];
+  not?: JsonSchemaDraft07;
 };
+
+export * from "../lib/index.js";

package/draft-07/index.js

@@ -0,0 +1,72 @@
+import { addKeyword, defineVocabulary, loadDialect } from "../lib/keywords.js";
+import { addSchema } from "../lib/core.js";
+import metaSchema from "./schema.js";
+import additionalItems from "../draft-04/additionalItems.js";
+import contains from "../draft-06/contains.js";
+import dependencies from "../draft-04/dependencies.js";
+import items from "../draft-04/items.js";
+import id from "../draft-04/id.js";
+import ref from "../draft-04/ref.js";
+
+
+addKeyword(additionalItems);
+addKeyword(contains);
+addKeyword(dependencies);
+addKeyword(id);
+addKeyword(items);
+addKeyword(ref);
+
+const jsonSchemaVersion = "http://json-schema.org/draft-07/schema";
+
+defineVocabulary(jsonSchemaVersion, {
+  "$id": "https://json-schema.org/keyword/draft-04/id",
+  "$ref": "https://json-schema.org/keyword/draft-04/ref",
+  "$comment": "https://json-schema.org/keyword/comment",
+  "additionalItems": "https://json-schema.org/keyword/draft-04/additionalItems",
+  "additionalProperties": "https://json-schema.org/keyword/additionalProperties",
+  "allOf": "https://json-schema.org/keyword/allOf",
+  "anyOf": "https://json-schema.org/keyword/anyOf",
+  "const": "https://json-schema.org/keyword/const",
+  "contains": "https://json-schema.org/keyword/draft-06/contains",
+  "default": "https://json-schema.org/keyword/default",
+  "definitions": "https://json-schema.org/keyword/definitions",
+  "dependencies": "https://json-schema.org/keyword/draft-04/dependencies",
+  "description": "https://json-schema.org/keyword/description",
+  "enum": "https://json-schema.org/keyword/enum",
+  "exclusiveMaximum": "https://json-schema.org/keyword/exclusiveMaximum",
+  "exclusiveMinimum": "https://json-schema.org/keyword/exclusiveMinimum",
+  "format": "https://json-schema.org/keyword/format",
+  "if": "https://json-schema.org/keyword/if",
+  "then": "https://json-schema.org/keyword/then",
+  "else": "https://json-schema.org/keyword/else",
+  "items": "https://json-schema.org/keyword/draft-04/items",
+  "maxItems": "https://json-schema.org/keyword/maxItems",
+  "maxLength": "https://json-schema.org/keyword/maxLength",
+  "maxProperties": "https://json-schema.org/keyword/maxProperties",
+  "maximum": "https://json-schema.org/keyword/maximum",
+  "minItems": "https://json-schema.org/keyword/minItems",
+  "minLength": "https://json-schema.org/keyword/minLength",
+  "minProperties": "https://json-schema.org/keyword/minProperties",
+  "minimum": "https://json-schema.org/keyword/minimum",
+  "multipleOf": "https://json-schema.org/keyword/multipleOf",
+  "not": "https://json-schema.org/keyword/not",
+  "oneOf": "https://json-schema.org/keyword/oneOf",
+  "pattern": "https://json-schema.org/keyword/pattern",
+  "patternProperties": "https://json-schema.org/keyword/patternProperties",
+  "properties": "https://json-schema.org/keyword/properties",
+  "propertyNames": "https://json-schema.org/keyword/propertyNames",
+  "readOnly": "https://json-schema.org/keyword/readOnly",
+  "required": "https://json-schema.org/keyword/required",
+  "title": "https://json-schema.org/keyword/title",
+  "type": "https://json-schema.org/keyword/type",
+  "uniqueItems": "https://json-schema.org/keyword/uniqueItems",
+  "writeOnly": "https://json-schema.org/keyword/writeOnly"
+});
+
+loadDialect(jsonSchemaVersion, {
+  [jsonSchemaVersion]: true
+}, true);
+
+addSchema(metaSchema);
+
+export * from "../lib/index.js";

package/draft-07/schema.js

@@ -0,0 +1,172 @@
+export default {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://json-schema.org/draft-07/schema#",
+  "title": "Core schema meta-schema",
+  "definitions": {
+    "schemaArray": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "$ref": "#" }
+    },
+    "nonNegativeInteger": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "nonNegativeIntegerDefault0": {
+      "allOf": [
+        { "$ref": "#/definitions/nonNegativeInteger" },
+        { "default": 0 }
+      ]
+    },
+    "simpleTypes": {
+      "enum": [
+        "array",
+        "boolean",
+        "integer",
+        "null",
+        "number",
+        "object",
+        "string"
+      ]
+    },
+    "stringArray": {
+      "type": "array",
+      "items": { "type": "string" },
+      "uniqueItems": true,
+      "default": []
+    }
+  },
+  "type": ["object", "boolean"],
+  "properties": {
+    "$id": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$schema": {
+      "type": "string",
+      "format": "uri"
+    },
+    "$ref": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$comment": {
+      "type": "string"
+    },
+    "title": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "default": true,
+    "readOnly": {
+      "type": "boolean",
+      "default": false
+    },
+    "writeOnly": {
+      "type": "boolean",
+      "default": false
+    },
+    "examples": {
+      "type": "array",
+      "items": true
+    },
+    "multipleOf": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "maximum": {
+      "type": "number"
+    },
+    "exclusiveMaximum": {
+      "type": "number"
+    },
+    "minimum": {
+      "type": "number"
+    },
+    "exclusiveMinimum": {
+      "type": "number"
+    },
+    "maxLength": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minLength": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "pattern": {
+      "type": "string",
+      "format": "regex"
+    },
+    "additionalItems": { "$ref": "#" },
+    "items": {
+      "anyOf": [
+        { "$ref": "#" },
+        { "$ref": "#/definitions/schemaArray" }
+      ],
+      "default": true
+    },
+    "maxItems": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minItems": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "uniqueItems": {
+      "type": "boolean",
+      "default": false
+    },
+    "contains": { "$ref": "#" },
+    "maxProperties": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minProperties": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "required": { "$ref": "#/definitions/stringArray" },
+    "additionalProperties": { "$ref": "#" },
+    "definitions": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "properties": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "patternProperties": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "propertyNames": { "format": "regex" },
+      "default": {}
+    },
+    "dependencies": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [
+          { "$ref": "#" },
+          { "$ref": "#/definitions/stringArray" }
+        ]
+      }
+    },
+    "propertyNames": { "$ref": "#" },
+    "const": true,
+    "enum": {
+      "type": "array",
+      "items": true,
+      "minItems": 1,
+      "uniqueItems": true
+    },
+    "type": {
+      "anyOf": [
+        { "$ref": "#/definitions/simpleTypes" },
+        {
+          "type": "array",
+          "items": { "$ref": "#/definitions/simpleTypes" },
+          "minItems": 1,
+          "uniqueItems": true
+        }
+      ]
+    },
+    "format": { "type": "string" },
+    "contentMediaType": { "type": "string" },
+    "contentEncoding": { "type": "string" },
+    "if": { "$ref": "#" },
+    "then": { "$ref": "#" },
+    "else": { "$ref": "#" },
+    "allOf": { "$ref": "#/definitions/schemaArray" },
+    "anyOf": { "$ref": "#/definitions/schemaArray" },
+    "oneOf": { "$ref": "#/definitions/schemaArray" },
+    "not": { "$ref": "#" }
+  },
+  "default": true
+};

package/{lib/keywords/contains-minContains-maxContains.js → draft-2019-09/contains.js}

@@ -1,13 +1,20 @@
-const { Core, Schema, Instance } = require("@hyperjump/json-schema-core");
+import * as Instance from "../lib/instance.js";
+import * as Schema from "../lib/schema.js";
+import { getKeywordName } from "../lib/keywords.js";
+import Validation from "../lib/keywords/validation.js";
 
 
+const id = "https://json-schema.org/keyword/draft-2019-09/contains";
+
 const compile = async (schema, ast, parentSchema) => {
-  const contains = await Core.compileSchema(schema, ast);
+  const contains = await Validation.compile(schema, ast);
 
-  const minContainsSchema = await Schema.step("minContains", parentSchema);
+  const minContainsKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/minContains");
+  const minContainsSchema = await Schema.step(minContainsKeyword, parentSchema);
   const minContains = Schema.typeOf(minContainsSchema, "number") ? Schema.value(minContainsSchema) : 1;
 
-  const maxContainsSchema = await Schema.step("maxContains", parentSchema);
+  const maxContainsKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/maxContains");
+  const maxContainsSchema = await Schema.step(maxContainsKeyword, parentSchema);
   const maxContains = Schema.typeOf(maxContainsSchema, "number") ? Schema.value(maxContainsSchema) : Number.MAX_SAFE_INTEGER;
 
   return { contains, minContains, maxContains };
@@ -19,15 +26,15 @@ const interpret = ({ contains, minContains, maxContains }, instance, ast, dynami
   }
 
   const matches = Instance.reduce((matches, item) => {
-    return Core.interpretSchema(contains, item, ast, dynamicAnchors) ? matches + 1 : matches;
+    return Validation.interpret(contains, item, ast, dynamicAnchors) ? matches + 1 : matches;
   }, 0, instance);
   return matches >= minContains && matches <= maxContains;
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
   return interpret(keywordValue, instance, ast, dynamicAnchors) && Instance.reduce((matchedIndexes, item, itemIndex) => {
-    return Core.interpretSchema(keywordValue.contains, item, ast, dynamicAnchors) ? matchedIndexes.add(itemIndex) : matchedIndexes;
+    return Validation.interpret(keywordValue.contains, item, ast, dynamicAnchors) ? matchedIndexes.add(itemIndex) : matchedIndexes;
   }, new Set(), instance);
 };
 
-module.exports = { compile, interpret, collectEvaluatedItems };
+export default { id, compile, interpret, collectEvaluatedItems };

package/{lib/draft-2019-09.d.ts → draft-2019-09/index.d.ts}

@@ -1,8 +1,8 @@
-import type { Json } from "@hyperjump/json-schema-core";
-import type { JsonSchemaType } from "./common";
+import type { Json } from "@hyperjump/json-pointer";
+import type { JsonSchemaType } from "../lib/common.js";
 
 
-export type Draft201909Schema = boolean | {
+export type JsonSchemaDraft201909 = boolean | {
   $schema?: "https://json-schema.org/draft/2019-09/schema";
   $id?: string;
   $anchor?: string;
@@ -11,24 +11,24 @@ export type Draft201909Schema = boolean | {
   $recursiveAnchor?: boolean;
   $vocabulary?: Record<string, boolean>;
   $comment?: string;
-  $defs?: Record<string, Draft201909Schema>;
-  additionalItems?: Draft201909Schema;
-  unevaluatedItems?: Draft201909Schema;
-  items?: Draft201909Schema | Draft201909Schema[];
-  contains?: Draft201909Schema;
-  additionalProperties?: Draft201909Schema;
-  unevaluatedProperties?: Draft201909Schema;
-  properties?: Record<string, Draft201909Schema>;
-  patternProperties?: Record<string, Draft201909Schema>;
-  dependentSchemas?: Record<string, Draft201909Schema>;
-  propertyNames?: Draft201909Schema;
-  if?: Draft201909Schema;
-  then?: Draft201909Schema;
-  else?: Draft201909Schema;
-  allOf?: Draft201909Schema[];
-  anyOf?: Draft201909Schema[];
-  oneOf?: Draft201909Schema[];
-  not?: Draft201909Schema;
+  $defs?: Record<string, JsonSchemaDraft201909>;
+  additionalItems?: JsonSchemaDraft201909;
+  unevaluatedItems?: JsonSchemaDraft201909;
+  items?: JsonSchemaDraft201909 | JsonSchemaDraft201909[];
+  contains?: JsonSchemaDraft201909;
+  additionalProperties?: JsonSchemaDraft201909;
+  unevaluatedProperties?: JsonSchemaDraft201909;
+  properties?: Record<string, JsonSchemaDraft201909>;
+  patternProperties?: Record<string, JsonSchemaDraft201909>;
+  dependentSchemas?: Record<string, JsonSchemaDraft201909>;
+  propertyNames?: JsonSchemaDraft201909;
+  if?: JsonSchemaDraft201909;
+  then?: JsonSchemaDraft201909;
+  else?: JsonSchemaDraft201909;
+  allOf?: JsonSchemaDraft201909[];
+  anyOf?: JsonSchemaDraft201909[];
+  oneOf?: JsonSchemaDraft201909[];
+  not?: JsonSchemaDraft201909;
   multipleOf?: number;
   maximum?: number;
   exclusiveMaximum?: number;
@@ -59,5 +59,7 @@ export type Draft201909Schema = boolean | {
   format?: "date-time" | "date" | "time" | "duration" | "email" | "idn-email" | "hostname" | "idn-hostname" | "ipv4" | "ipv6" | "uri" | "uri-reference" | "iri" | "iri-reference" | "uuid" | "uri-template" | "json-pointer" | "relative-json-pointer" | "regex";
   contentMediaType?: string;
   contentEncoding?: string;
-  contentSchema?: Draft201909Schema;
+  contentSchema?: JsonSchemaDraft201909;
 };
+
+export * from "../lib/index.js";