json_schemer 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed0173ca9146797b3576cf21870b4d7163ea05354912d0d0be21d6e89d54d16c
-  data.tar.gz: 1913f580bebb4d874be1a8d196a7b197156613b4240407855b9145fe03acf38b
+  metadata.gz: 1981782f2342c7123beb0374680037bc11f3be72a8e4be0a213cfb7691643415
+  data.tar.gz: e8b6c605ba1ce2a2751ac90167f53c27fad975140ab9a0e8328c2b04ce8fe732
 SHA512:
-  metadata.gz: 8ae6cbd519a54752d739192b3438c61abd81db1f11af409a48fe77b37205c395ca577f7fadbf2819134e942d5708d4a80a59f9d39c5e0e3d42a0144b78b70426
-  data.tar.gz: 216ac23667163998671a455298cc699a170452095acd0ef661b69a63a879f54d6c12f2676e5ab919472bd66794c6b7ab68687153f2c45ee7898e12be4ff7368c
+  metadata.gz: 4d4c6e6c3660560a602b5610559efe37b5839f1142af6486e350bd207cad49e37a00f397d555878957b14951da95745092240bd14417e2ffd02826f053099952
+  data.tar.gz: 8dc561414463ceeacf7bbd0be95be9c441a50919cdb839ff8366fa0268d96d91e4947985bd7bab406f3c163e913bf7ca923a38e22d777d2549af3329f91c14f2

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
             ruby: truffleruby-head
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Changelog
 
-## [2.0.0] - XXXX-XX-XX
+## [2.1.1] - 2023-11-28
+
+### Bug Fixes
+
+- Fix refs to/through keyword objects: https://github.com/davishmcclurg/json_schemer/pull/160
+- Temporary fix for incorrect `uri-reference` format in OpenAPI 3.x: https://github.com/davishmcclurg/json_schemer/pull/161
+
+[2.1.1]: https://github.com/davishmcclurg/json_schemer/releases/tag/v2.1.1
+
+## [2.1.0] - 2023-11-17
+
+### Bug Fixes
+
+- Limit anyOf/oneOf discriminator to listed refs: https://github.com/davishmcclurg/json_schemer/pull/145
+- Require discriminator `propertyName` property: https://github.com/davishmcclurg/json_schemer/pull/145
+- Support `Schema#ref` in subschemas: https://github.com/davishmcclurg/json_schemer/pull/145
+- Resolve JSON pointer refs using correct base URI: https://github.com/davishmcclurg/json_schemer/pull/147
+- `date` format in OpenAPI 3.0: https://github.com/davishmcclurg/json_schemer/commit/69fe7a815ecf0cfb1c40ac402bf46a789c05e972
+
+### Features
+
+- Custom error messages with `x-error` keyword and I18n: https://github.com/davishmcclurg/json_schemer/pull/149
+- Custom content encodings and media types: https://github.com/davishmcclurg/json_schemer/pull/148
+
+[2.1.0]: https://github.com/davishmcclurg/json_schemer/releases/tag/v2.1.0
+
+## [2.0.0] - 2023-08-20
 
 For 2.0.0, much of the codebase was rewritten to simplify support for the two new JSON Schema draft versions (2019-09 and 2020-12). The major change is moving each keyword into its own class and organizing them into vocabularies. [Output formats](https://json-schema.org/draft/2020-12/json-schema-core.html#section-12) and [annotations](https://json-schema.org/draft/2020-12/json-schema-core.html#section-7.7) from the new drafts are also supported. The known breaking changes are listed below, but there may be others that haven't been identified.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (2.0.0)
+    json_schemer (2.1.1)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -9,11 +9,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.2.2)
     docile (1.4.0)
     hana (1.3.7)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    i18n-debug (1.2.0)
+      i18n (< 2)
     minitest (5.15.0)
     rake (13.0.6)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -25,7 +30,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf (0.1.4-java)
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
 
 PLATFORMS
   java
@@ -33,6 +38,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  i18n
+  i18n-debug
   json_schemer!
   minitest (~> 5.0)
   rake (~> 13.0)

data/README.md

@@ -126,7 +126,7 @@ schemer.ref('#/$defs/foo').validate(1).to_a
 #      "schema_pointer"=>"/$defs/foo",
 #      "root_schema"=>{"type"=>"integer", "$defs"=>{"foo"=>{"type"=>"string"}}},
 #      "type"=>"string",
-#      "error"=>"instance at root is not a string"}]
+#      "error"=>"value at root is not a string"}]
 
 # schema bundling (https://json-schema.org/draft/2020-12/json-schema-core.html#section-9.3)
 
@@ -180,6 +180,37 @@ JSONSchemer.schema(
   # default: true
   format: true,
 
+  # custom formats
+  formats: {
+    'int32' => proc do |instance, _format|
+      instance.is_a?(Integer) && instance.bit_length <= 32
+    end,
+    # disable specific format
+    'email' => false
+  },
+
+  # custom content encodings
+  # only `base64` is available by default
+  content_encodings: {
+    # return [success, annotation] tuple
+    'urlsafe_base64' => proc do |instance|
+      [true, Base64.urlsafe_decode64(instance)]
+    rescue
+      [false, nil]
+    end
+  },
+
+  # custom content media types
+  # only `application/json` is available by default
+  content_media_types: {
+    # return [success, annotation] tuple
+    'text/csv' => proc do |instance|
+      [true, CSV.parse(instance)]
+    rescue
+      [false, nil]
+    end
+  },
+
   # insert default property values during validation
   # true/false
   # default: false
@@ -225,6 +256,166 @@ JSONSchemer.schema(
 )
 ```
 
+## Custom Error Messages
+
+Error messages can be customized using the `x-error` keyword and/or [I18n](https://github.com/ruby-i18n/i18n) translations. `x-error` takes precedence if both are defined.
+
+### `x-error` Keyword
+
+```ruby
+# override all errors for a schema
+schemer = JSONSchemer.schema({
+  'type' => 'string',
+  'x-error' => 'custom error for schema and all keywords'
+})
+
+schemer.validate(1).first
+# => {"data"=>1,
+#     "data_pointer"=>"",
+#     "schema"=>{"type"=>"string", "x-error"=>"custom error for schema and all keywords"},
+#     "schema_pointer"=>"",
+#     "root_schema"=>{"type"=>"string", "x-error"=>"custom error for schema and all keywords"},
+#     "type"=>"string",
+#     "error"=>"custom error for schema and all keywords",
+#     "x-error"=>true}
+
+schemer.validate(1, :output_format => 'basic')
+# => {"valid"=>false,
+#     "keywordLocation"=>"",
+#     "absoluteKeywordLocation"=>"json-schemer://schema#",
+#     "instanceLocation"=>"",
+#     "error"=>"custom error for schema and all keywords",
+#     "x-error"=>true,
+#     "errors"=>#<Enumerator: ...>}
+
+# keyword-specific errors
+schemer = JSONSchemer.schema({
+  'type' => 'string',
+  'minLength' => 10,
+  'x-error' => {
+    'type' => 'custom error for `type` keyword',
+    # special `^` keyword for schema-level error
+    '^' => 'custom error for schema',
+    # same behavior as when `x-error` is a string
+    '*' => 'fallback error for schema and all keywords'
+  }
+})
+
+schemer.validate(1).map { _1.fetch('error') }
+# => ["custom error for `type` keyword"]
+
+schemer.validate('1').map { _1.fetch('error') }
+# => ["custom error for schema and all keywords"]
+
+schemer.validate(1, :output_format => 'basic').fetch('error')
+# => "custom error for schema"
+
+# variable interpolation (instance/instanceLocation/keywordLocation/absoluteKeywordLocation)
+schemer = JSONSchemer.schema({
+  '$id' => 'https://example.com/schema',
+  'properties' => {
+    'abc' => {
+      'type' => 'string',
+      'x-error' => <<~ERROR
+        instance: %{instance}
+        instance location: %{instanceLocation}
+        keyword location: %{keywordLocation}
+        absolute keyword location: %{absoluteKeywordLocation}
+      ERROR
+    }
+  }
+})
+
+puts schemer.validate({ 'abc' => 1 }).first.fetch('error')
+# instance: 1
+# instance location: /abc
+# keyword location: /properties/abc/type
+# absolute keyword location: https://example.com/schema#/properties/abc/type
+```
+
+### I18n
+
+When the [I18n gem](https://github.com/ruby-i18n/i18n) is loaded, custom error messages are looked up under the `json_schemer` key. It may be necessary to restart your application after adding the root key because the existence check is cached for performance reasons.
+
+Translation keys are looked up in this order:
+
+1. `$LOCALE.json_schemer.errors.$ABSOLUTE_KEYWORD_LOCATION`
+2. `$LOCALE.json_schemer.errors.$SCHEMA_ID.$KEYWORD_LOCATION`
+3. `$LOCALE.json_schemer.errors.$KEYWORD_LOCATION`
+4. `$LOCALE.json_schemer.errors.$SCHEMA_ID.$KEYWORD`
+5. `$LOCALE.json_schemer.errors.$SCHEMA_ID.*`
+6. `$LOCALE.json_schemer.errors.$META_SCHEMA_ID.$KEYWORD`
+7. `$LOCALE.json_schemer.errors.$META_SCHEMA_ID.*`
+8. `$LOCALE.json_schemer.errors.$KEYWORD`
+9. `$LOCALE.json_schemer.errors.*`
+
+Example translations file:
+
+```yaml
+en:
+  json_schemer:
+    errors:
+      'https://example.com/schema#/properties/abc/type': custom error for absolute keyword location
+      'https://example.com/schema':
+        '#/properties/abc/type': custom error for keyword location, nested under schema $id
+        'type': custom error for `type` keyword, nested under schema $id
+        '^': custom error for schema, nested under schema $id
+        '*': fallback error for schema and all keywords, nested under schema $id
+      '#/properties/abc/type': custom error for keyword location
+      'http://json-schema.org/draft-07/schema#':
+        'type': custom error for `type` keyword, nested under meta-schema $id ($schema)
+        '^': custom error for schema, nested under meta-schema $id
+        '*': fallback error for schema and all keywords, nested under meta-schema $id ($schema)
+      'type': custom error for `type` keyword
+      '^': custom error for schema
+      # variable interpolation (instance/instanceLocation/keywordLocation/absoluteKeywordLocation)
+      '*': |
+        fallback error for schema and all keywords
+        instance: %{instance}
+        instance location: %{instanceLocation}
+        keyword location: %{keywordLocation}
+        absolute keyword location: %{absoluteKeywordLocation}
+```
+
+And output:
+
+```ruby
+require 'i18n'
+I18n.locale = :en                                         # $LOCALE=en
+
+schemer = JSONSchemer.schema({
+  '$id' => 'https://example.com/schema',                  # $SCHEMA_ID=https://example.com/schema
+  '$schema' => 'http://json-schema.org/draft-07/schema#', # $META_SCHEMA_ID=http://json-schema.org/draft-07/schema#
+  'properties' => {
+    'abc' => {
+      'type' => 'integer'                                 # $KEYWORD=type
+    }                                                     # $KEYWORD_LOCATION=#/properties/abc/type
+  }                                                       # $ABSOLUTE_KEYWORD_LOCATION=https://example.com/schema#/properties/abc/type
+})
+
+schemer.validate({ 'abc' => 'not-an-integer' }).first
+# => {"data"=>"not-an-integer",
+#     "data_pointer"=>"/abc",
+#     "schema"=>{"type"=>"integer"},
+#     "schema_pointer"=>"/properties/abc",
+#     "root_schema"=>{"$id"=>"https://example.com/schema", "$schema"=>"http://json-schema.org/draft-07/schema#", "properties"=>{"abc"=>{"type"=>"integer"}}},
+#     "type"=>"integer",
+#     "error"=>"custom error for absolute keyword location",
+#     "i18n"=>true
+```
+
+In the example above, custom error messsages are looked up using the following keys (in order until one is found):
+
+1. `en.json_schemer.errors.'https://example.com/schema#/properties/abc/type'`
+2. `en.json_schemer.errors.'https://example.com/schema'.'#/properties/abc/type'`
+3. `en.json_schemer.errors.'#/properties/abc/type'`
+4. `en.json_schemer.errors.'https://example.com/schema'.type`
+5. `en.json_schemer.errors.'https://example.com/schema'.*`
+6. `en.json_schemer.errors.'http://json-schema.org/draft-07/schema#'.type`
+7. `en.json_schemer.errors.'http://json-schema.org/draft-07/schema#'.*`
+8. `en.json_schemer.errors.type`
+9. `en.json_schemer.errors.*`
+
 ## OpenAPI
 
 ```ruby

data/json_schemer.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "simplecov", "~> 0.22"
+  spec.add_development_dependency "i18n"
+  spec.add_development_dependency "i18n-debug"
 
   spec.add_runtime_dependency "hana", "~> 1.3"
   spec.add_runtime_dependency "regexp_parser", "~> 2.0"

data/lib/json_schemer/content.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module JSONSchemer
+  module ContentEncoding
+    BASE64 = proc do |instance|
+      [true, Base64.strict_decode64(instance)]
+    rescue
+      [false, nil]
+    end
+  end
+
+  module ContentMediaType
+    JSON = proc do |instance|
+      [true, ::JSON.parse(instance)]
+    rescue
+      [false, nil]
+    end
+  end
+end

data/lib/json_schemer/draft201909/meta.rb

@@ -2,6 +2,9 @@
 module JSONSchemer
   module Draft201909
     BASE_URI = URI('https://json-schema.org/draft/2019-09/schema')
+    FORMATS = Draft202012::FORMATS
+    CONTENT_ENCODINGS = Draft202012::CONTENT_ENCODINGS
+    CONTENT_MEDIA_TYPES = Draft202012::CONTENT_MEDIA_TYPES
     SCHEMA = {
       '$schema' => 'https://json-schema.org/draft/2019-09/schema',
       '$id' => 'https://json-schema.org/draft/2019-09/schema',
@@ -48,9 +51,6 @@ module JSONSchemer
       CORE = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/core',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/core' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Core vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -105,9 +105,6 @@ module JSONSchemer
       APPLICATOR = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/applicator',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/applicator' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Applicator vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -161,9 +158,6 @@ module JSONSchemer
       VALIDATION = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/validation',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/validation' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Validation vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -259,9 +253,6 @@ module JSONSchemer
       META_DATA = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/meta-data',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/meta-data' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Meta-data vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -295,9 +286,6 @@ module JSONSchemer
       FORMAT = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/format',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/format' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Format vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -309,9 +297,6 @@ module JSONSchemer
       CONTENT = {
         '$schema' => 'https://json-schema.org/draft/2019-09/schema',
         '$id' => 'https://json-schema.org/draft/2019-09/meta/content',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2019-09/vocab/content' => true
-        },
         '$recursiveAnchor' => true,
         'title' => 'Content vocabulary meta-schema',
         'type' => ['object', 'boolean'],

data/lib/json_schemer/draft202012/meta.rb

@@ -2,6 +2,33 @@
 module JSONSchemer
   module Draft202012
     BASE_URI = URI('https://json-schema.org/draft/2020-12/schema')
+    FORMATS = {
+      'date-time' => Format::DATE_TIME,
+      'date' => Format::DATE,
+      'time' => Format::TIME,
+      'duration' => Format::DURATION,
+      'email' => Format::EMAIL,
+      'idn-email' => Format::IDN_EMAIL,
+      'hostname' => Format::HOSTNAME,
+      'idn-hostname' => Format::IDN_HOSTNAME,
+      'ipv4' => Format::IPV4,
+      'ipv6' => Format::IPV6,
+      'uri' => Format::URI,
+      'uri-reference' => Format::URI_REFERENCE,
+      'iri' => Format::IRI,
+      'iri-reference' => Format::IRI_REFERENCE,
+      'uuid' => Format::UUID,
+      'uri-template' => Format::URI_TEMPLATE,
+      'json-pointer' => Format::JSON_POINTER,
+      'relative-json-pointer' => Format::RELATIVE_JSON_POINTER,
+      'regex' => Format::REGEX
+    }
+    CONTENT_ENCODINGS = {
+      'base64' => ContentEncoding::BASE64
+    }
+    CONTENT_MEDIA_TYPES = {
+      'application/json' => ContentMediaType::JSON
+    }
     SCHEMA = {
       '$schema' => 'https://json-schema.org/draft/2020-12/schema',
       '$id' => 'https://json-schema.org/draft/2020-12/schema',
@@ -64,9 +91,6 @@ module JSONSchemer
       CORE = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/core',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/core' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Core vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -114,9 +138,6 @@ module JSONSchemer
       APPLICATOR = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/applicator',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/applicator' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Applicator vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -161,9 +182,6 @@ module JSONSchemer
       UNEVALUATED = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/unevaluated',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/unevaluated' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Unevaluated applicator vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -175,9 +193,6 @@ module JSONSchemer
       VALIDATION = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/validation',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/validation' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Validation vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -272,9 +287,6 @@ module JSONSchemer
       META_DATA = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/meta-data',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/meta-data' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Meta-data vocabulary meta-schema',
         'type' => ['object', 'boolean'],
@@ -307,9 +319,6 @@ module JSONSchemer
       FORMAT_ANNOTATION = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/format-annotation',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/format-annotation' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Format vocabulary meta-schema for annotation results',
         'type' => ['object', 'boolean'],
@@ -320,9 +329,6 @@ module JSONSchemer
       FORMAT_ASSERTION = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/format-assertion',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/format-assertion' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Format vocabulary meta-schema for assertion results',
         'type' => ['object', 'boolean'],
@@ -333,9 +339,6 @@ module JSONSchemer
       CONTENT = {
         '$schema' => 'https://json-schema.org/draft/2020-12/schema',
         '$id' => 'https://json-schema.org/draft/2020-12/meta/content',
-        '$vocabulary' => {
-          'https://json-schema.org/draft/2020-12/vocab/content' => true
-        },
         '$dynamicAnchor' => 'meta',
         'title' => 'Content vocabulary meta-schema',
         'type' => ['object', 'boolean'],

data/lib/json_schemer/draft202012/vocab/content.rb

@@ -4,21 +4,29 @@ module JSONSchemer
     module Vocab
       module Content
         class ContentEncoding < Keyword
+          def parse
+            root.fetch_content_encoding(value) { raise UnknownContentEncoding, value }
+          end
+
           def validate(instance, instance_location, keyword_location, _context)
             return result(instance, instance_location, keyword_location, true) unless instance.is_a?(String)
 
-            _valid, annotation = Format.decode_content_encoding(instance, value)
+            _valid, annotation = parsed.call(instance)
 
             result(instance, instance_location, keyword_location, true, :annotation => annotation)
           end
         end
 
         class ContentMediaType < Keyword
+          def parse
+            root.fetch_content_media_type(value) { raise UnknownContentMediaType, value }
+          end
+
           def validate(instance, instance_location, keyword_location, context)
             return result(instance, instance_location, keyword_location, true) unless instance.is_a?(String)
 
             decoded_instance = context.adjacent_results[ContentEncoding]&.annotation || instance
-            _valid, annotation = Format.parse_content_media_type(decoded_instance, value)
+            _valid, annotation = parsed.call(decoded_instance)
 
             result(instance, instance_location, keyword_location, true, :annotation => annotation)
           end

data/lib/json_schemer/draft202012/vocab/core.rb

@@ -119,6 +119,12 @@ module JSONSchemer
 
         class Comment < Keyword; end
 
+        class XError < Keyword
+          def message(error_key)
+            value.is_a?(Hash) ? (value[error_key] || value[CATCHALL]) : value
+          end
+        end
+
         class UnknownKeyword < Keyword
           def parse
             if value.is_a?(Hash)
@@ -130,7 +136,7 @@ module JSONSchemer
             end
           end
 
-          def fetch_unknown!(token)
+          def fetch(token)
             if value.is_a?(Hash)
               parsed[token] ||= JSONSchemer::Schema::UNKNOWN_KEYWORD_CLASS.new(value.fetch(token), self, token, schema)
             elsif value.is_a?(Array)
@@ -140,8 +146,8 @@ module JSONSchemer
             end
           end
 
-          def unknown_schema!
-            @unknown_schema ||= subschema(value)
+          def parsed_schema
+            @parsed_schema ||= subschema(value)
           end
 
           def validate(instance, instance_location, keyword_location, _context)

data/lib/json_schemer/draft202012/vocab/format_annotation.rb

@@ -4,20 +4,12 @@ module JSONSchemer
     module Vocab
       module FormatAnnotation
         class Format < Keyword
-          extend JSONSchemer::Format
-
-          DEFAULT_FORMAT = proc do |instance, value|
-            !instance.is_a?(String) || valid_spec_format?(instance, value)
-          rescue UnknownFormat
-            true
-          end
-
           def error(formatted_instance_location:, **)
             "value at #{formatted_instance_location} does not match format: #{value}"
           end
 
           def parse
-            root.format && root.formats.fetch(value) { root.meta_schema.formats.fetch(value, DEFAULT_FORMAT) }
+            root.format && root.fetch_format(value, false)
           end
 
           def validate(instance, instance_location, keyword_location, _context)

data/lib/json_schemer/draft202012/vocab/format_assertion.rb

@@ -4,18 +4,12 @@ module JSONSchemer
     module Vocab
       module FormatAssertion
         class Format < Keyword
-          extend JSONSchemer::Format
-
-          DEFAULT_FORMAT = proc do |instance, value|
-            !instance.is_a?(String) || valid_spec_format?(instance, value)
-          end
-
           def error(formatted_instance_location:, **)
             "value at #{formatted_instance_location} does not match format: #{value}"
           end
 
           def parse
-            root.format && root.formats.fetch(value) { root.meta_schema.formats.fetch(value, DEFAULT_FORMAT) }
+            root.format && root.fetch_format(value) { raise UnknownFormat, value }
           end
 
           def validate(instance, instance_location, keyword_location, _context)

data/lib/json_schemer/draft202012/vocab.rb

@@ -16,7 +16,9 @@ module JSONSchemer
         '$defs' => Core::Defs,
         'definitions' => Core::Defs,
         # https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-01#section-8.3
-        '$comment' => Core::Comment
+        '$comment' => Core::Comment,
+        # https://github.com/orgs/json-schema-org/discussions/329
+        'x-error' => Core::XError
       }
       # https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-01#section-10
       APPLICATOR = {

data/lib/json_schemer/draft4/meta.rb

@@ -2,6 +2,12 @@
 module JSONSchemer
   module Draft4
     BASE_URI = URI('http://json-schema.org/draft-04/schema#')
+    FORMATS = Draft6::FORMATS.dup
+    FORMATS.delete('uri-reference')
+    FORMATS.delete('uri-template')
+    FORMATS.delete('json-pointer')
+    CONTENT_ENCODINGS = Draft6::CONTENT_ENCODINGS
+    CONTENT_MEDIA_TYPES = Draft6::CONTENT_MEDIA_TYPES
     SCHEMA = {
       'id' => 'http://json-schema.org/draft-04/schema#',
       '$schema' => 'http://json-schema.org/draft-04/schema#',